Skip to content

Commit d416ea6

Browse files
hansenmchansenmc
committed
Remove unnecessary fully qualified name for statically imported fields
1 parent 19d4552 commit d416ea6

1 file changed

Lines changed: 30 additions & 30 deletions

File tree

‎src/test/java/com/marklogic/developer/corb/ManagerIT.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public void testManagerUsingSysProps() {
170170
String exportFileName = "testManagerUsingSysProps2.txt";
171171
ManagerTest.setDefaultSystemProperties();
172172
System.setProperty(Options.URIS_MODULE, "src/test/resources/selector.xqy|ADHOC");
173-
System.setProperty(Options.EXPORT_FILE_NAME, exportFileName);
173+
System.setProperty(EXPORT_FILE_NAME, exportFileName);
174174
String[] args = null;
175175
File report = new File(ManagerTest.EXPORT_FILE_DIR + SLASH + exportFileName);
176176
report.deleteOnExit();
@@ -189,11 +189,11 @@ public void testManagerFailOnErrorFalseDefaultExitCode() {
189189
clearSystemProperties();
190190
ManagerTest.setDefaultSystemProperties();
191191
System.setProperty(Options.URIS_FILE, "src/test/resources/test-file-1.txt");
192-
System.setProperty(Options.PROCESS_MODULE, "INLINE-XQUERY|declare variable $URI external; if ($URI = ('a')) then fn:error(xs:QName('error'), 'boom') else $URI");
192+
System.setProperty(PROCESS_MODULE, "INLINE-XQUERY|declare variable $URI external; if ($URI = ('a')) then fn:error(xs:QName('error'), 'boom') else $URI");
193193
System.setProperty(Options.FAIL_ON_ERROR, "false");
194194
System.clearProperty(Options.PRE_BATCH_TASK);
195195
System.clearProperty(Options.POST_BATCH_TASK);
196-
System.clearProperty(Options.PROCESS_TASK);
196+
System.clearProperty(PROCESS_TASK);
197197
System.clearProperty(Options.EXPORT_FILE_DIR);
198198
System.clearProperty(Options.METRICS_LOG_LEVEL);
199199
String[] args = null;
@@ -208,7 +208,7 @@ public void testManagerFailOnErrorFalseCustomExitCode() {
208208
clearSystemProperties();
209209
ManagerTest.setDefaultSystemProperties();
210210
System.setProperty(Options.URIS_FILE, "src/test/resources/test-file-1.txt");
211-
System.setProperty(Options.PROCESS_MODULE, "INLINE-XQUERY|declare variable $URI external; if ($URI = ('a')) then fn:error(xs:QName('error'), 'boom') else $URI");
211+
System.setProperty(PROCESS_MODULE, "INLINE-XQUERY|declare variable $URI external; if ($URI = ('a')) then fn:error(xs:QName('error'), 'boom') else $URI");
212212
System.setProperty(Options.FAIL_ON_ERROR, "false");
213213
System.setProperty(Options.EXIT_CODE_IGNORED_ERRORS, customErrorCode);
214214
System.clearProperty(Options.PRE_BATCH_TASK);
@@ -227,7 +227,7 @@ public void testManagerFailOnErrorTrueDefaultExitCode() {
227227
clearSystemProperties();
228228
ManagerTest.setDefaultSystemProperties();
229229
System.setProperty(Options.URIS_FILE, "src/test/resources/test-file-1.txt");
230-
System.setProperty(Options.PROCESS_MODULE, "INLINE-XQUERY|declare variable $URI external; if ($URI = ('a')) then fn:error(xs:QName('error'), 'boom') else $URI");
230+
System.setProperty(PROCESS_MODULE, "INLINE-XQUERY|declare variable $URI external; if ($URI = ('a')) then fn:error(xs:QName('error'), 'boom') else $URI");
231231
System.setProperty(Options.FAIL_ON_ERROR, "true");
232232
System.clearProperty(Options.PRE_BATCH_TASK);
233233
System.clearProperty(Options.POST_BATCH_TASK);
@@ -250,7 +250,7 @@ public void testManagerUsingSysPropsLargeUrisList() {
250250
properties.setProperty(Options.URIS_MODULE, LARGE_URIS_MODULE);
251251
properties.setProperty(Options.URIS_MODULE + ".count", String.valueOf(uriCount));
252252
properties.setProperty(Options.BATCH_SIZE, String.valueOf(1));
253-
properties.setProperty(Options.EXPORT_FILE_NAME, exportFilename);
253+
properties.setProperty(EXPORT_FILE_NAME, exportFilename);
254254
properties.setProperty(Options.DISK_QUEUE, "true");
255255
properties.setProperty(Options.DISK_QUEUE_MAX_IN_MEMORY_SIZE, String.valueOf(10));
256256
properties.setProperty(Options.DISK_QUEUE_TEMP_DIR, "/var/tmp");
@@ -280,7 +280,7 @@ public void testManagerUsingSysPropsLargeUrisListAndBatchSize() {
280280
properties.setProperty(Options.URIS_MODULE, LARGE_URIS_MODULE);
281281
properties.setProperty(Options.URIS_MODULE + ".count", String.valueOf(uriCount));
282282
properties.setProperty(Options.BATCH_SIZE, String.valueOf(batchSize));
283-
properties.setProperty(Options.EXPORT_FILE_NAME, exportFilename);
283+
properties.setProperty(EXPORT_FILE_NAME, exportFilename);
284284
properties.setProperty(Options.DISK_QUEUE_MAX_IN_MEMORY_SIZE, String.valueOf(10));
285285

286286
Manager manager = new Manager();
@@ -302,7 +302,7 @@ public void testManagerUsingPropsFile() {
302302
String exportFileName = ManagerTest.EXPORT_FILE_DIR + SLASH + "testManagerUsingPropsFile.txt";
303303
clearSystemProperties();
304304
System.setProperty(Options.OPTIONS_FILE, "src/test/resources/helloWorld.properties");
305-
System.setProperty(Options.EXPORT_FILE_NAME, exportFileName);
305+
System.setProperty(EXPORT_FILE_NAME, exportFileName);
306306
String[] args = {};
307307
File report = new File(exportFileName);
308308
report.deleteOnExit();
@@ -321,7 +321,7 @@ public void testManagerUsingInputFile() {
321321
clearSystemProperties();
322322
String exportFileName = "testManagerUsingInputFile.txt";
323323
ManagerTest.setDefaultSystemProperties();
324-
System.setProperty(Options.EXPORT_FILE_NAME, exportFileName);
324+
System.setProperty(EXPORT_FILE_NAME, exportFileName);
325325
System.setProperty(Options.URIS_FILE, "src/test/resources/uriInputFile.txt");
326326
String[] args = {};
327327
String exportFilePath = ManagerTest.EXPORT_FILE_DIR + SLASH + exportFileName;
@@ -341,7 +341,7 @@ public void testManagersPreBatchTask() {
341341
clearSystemProperties();
342342
String exportFileName = "testManagersPreBatchTask.txt";
343343
ManagerTest.setDefaultSystemProperties();
344-
System.setProperty(Options.EXPORT_FILE_NAME, exportFileName);
344+
System.setProperty(EXPORT_FILE_NAME, exportFileName);
345345
System.setProperty(Options.PRE_BATCH_MODULE, "preBatchModule.xqy|ADHOC");
346346
System.setProperty(Options.PRE_BATCH_TASK, "com.marklogic.developer.corb.PreBatchUpdateFileTask");
347347
String[] args = {};
@@ -363,7 +363,7 @@ public void testManagersPostBatchTask() {
363363
clearSystemProperties();
364364
String exportFileName = "testManagersPostBatchTask.txt";
365365
ManagerTest.setDefaultSystemProperties();
366-
System.setProperty(Options.EXPORT_FILE_NAME, exportFileName);
366+
System.setProperty(EXPORT_FILE_NAME, exportFileName);
367367
System.setProperty(Options.POST_BATCH_MODULE, "postBatchModule.xqy|ADHOC");
368368
System.setProperty(Options.POST_BATCH_TASK, "com.marklogic.developer.corb.PostBatchUpdateFileTask");
369369
String[] args = {};
@@ -385,7 +385,7 @@ public void testManagersPostBatchTaskZip() {
385385
clearSystemProperties();
386386
String exportFileName = "testManagersPostBatchTaskZip.txt";
387387
ManagerTest.setDefaultSystemProperties();
388-
System.setProperty(Options.EXPORT_FILE_NAME, exportFileName);
388+
System.setProperty(EXPORT_FILE_NAME, exportFileName);
389389
System.setProperty(Options.EXPORT_FILE_AS_ZIP, Boolean.toString(true));
390390
String[] args = {};
391391
//First, verify the output using run()
@@ -412,9 +412,9 @@ public void testManagerJavaScriptTransform() {
412412
clearSystemProperties();
413413
String exportFileName = "testManagerJavaScriptTransform.txt";
414414
ManagerTest.setDefaultSystemProperties();
415-
System.setProperty(Options.PROCESS_MODULE, "src/test/resources/mod-print-uri.sjs|ADHOC");
415+
System.setProperty(PROCESS_MODULE, "src/test/resources/mod-print-uri.sjs|ADHOC");
416416
System.setProperty("XQUERY-MODULE.foo", "bar1");
417-
System.setProperty(Options.EXPORT_FILE_NAME, exportFileName);
417+
System.setProperty(EXPORT_FILE_NAME, exportFileName);
418418
String[] args = {};
419419

420420
String exportFilePath = ManagerTest.EXPORT_FILE_DIR + SLASH + exportFileName;
@@ -478,12 +478,12 @@ public void testCommandFilePause() {
478478
exportFile.deleteOnExit();
479479
File commandFile = new File(ManagerTest.EXPORT_FILE_DIR, Math.random() + EXT_TXT);
480480
commandFile.deleteOnExit();
481-
System.setProperty(Options.XCC_CONNECTION_URI, ManagerTest.XCC_CONNECTION_URI);
481+
System.setProperty(XCC_CONNECTION_URI, ManagerTest.XCC_CONNECTION_URI);
482482
System.setProperty(Options.URIS_FILE, ManagerTest.URIS_FILE);
483483
System.setProperty(Options.THREAD_COUNT, Integer.toString(1));
484-
System.setProperty(Options.PROCESS_MODULE, TRANSFORM_SLOW_MODULE);
485-
System.setProperty(Options.PROCESS_TASK, ManagerTest.PROCESS_TASK);
486-
System.setProperty(Options.EXPORT_FILE_NAME, ManagerTest.EXPORT_FILE_NAME);
484+
System.setProperty(PROCESS_MODULE, TRANSFORM_SLOW_MODULE);
485+
System.setProperty(PROCESS_TASK, ManagerTest.PROCESS_TASK);
486+
System.setProperty(EXPORT_FILE_NAME, ManagerTest.EXPORT_FILE_NAME);
487487
System.setProperty(Options.EXPORT_FILE_DIR, ManagerTest.EXPORT_FILE_DIR);
488488
System.setProperty(Options.COMMAND_FILE, commandFile.getAbsolutePath());
489489

@@ -538,12 +538,12 @@ public void testCommandFilePauseResumeWhenCommandFileChangedAndNoCommand() {
538538
exportFile.deleteOnExit();
539539
File commandFile = new File(ManagerTest.EXPORT_FILE_DIR, Math.random() + EXT_TXT);
540540
commandFile.deleteOnExit();
541-
System.setProperty(Options.XCC_CONNECTION_URI, ManagerTest.XCC_CONNECTION_URI);
541+
System.setProperty(XCC_CONNECTION_URI, ManagerTest.XCC_CONNECTION_URI);
542542
System.setProperty(Options.URIS_FILE, ManagerTest.URIS_FILE);
543543
System.setProperty(Options.THREAD_COUNT, Integer.toString(1));
544-
System.setProperty(Options.PROCESS_MODULE, TRANSFORM_SLOW_MODULE);
545-
System.setProperty(Options.PROCESS_TASK, ManagerTest.PROCESS_TASK);
546-
System.setProperty(Options.EXPORT_FILE_NAME, ManagerTest.EXPORT_FILE_NAME);
544+
System.setProperty(PROCESS_MODULE, TRANSFORM_SLOW_MODULE);
545+
System.setProperty(PROCESS_TASK, ManagerTest.PROCESS_TASK);
546+
System.setProperty(EXPORT_FILE_NAME, ManagerTest.EXPORT_FILE_NAME);
547547
System.setProperty(Options.EXPORT_FILE_DIR, ManagerTest.EXPORT_FILE_DIR);
548548
System.setProperty(Options.COMMAND_FILE, commandFile.getAbsolutePath());
549549
Runnable pause = () -> {
@@ -595,12 +595,12 @@ public void testCommandFileStop() {
595595
exportFile.deleteOnExit();
596596
File commandFile = new File(ManagerTest.EXPORT_FILE_DIR, Math.random() + EXT_TXT);
597597
commandFile.deleteOnExit();
598-
System.setProperty(Options.XCC_CONNECTION_URI, ManagerTest.XCC_CONNECTION_URI);
598+
System.setProperty(XCC_CONNECTION_URI, ManagerTest.XCC_CONNECTION_URI);
599599
System.setProperty(Options.URIS_FILE, ManagerTest.URIS_FILE);
600600
System.setProperty(Options.THREAD_COUNT, Integer.toString(1));
601-
System.setProperty(Options.PROCESS_MODULE, TRANSFORM_SLOW_MODULE);
602-
System.setProperty(Options.PROCESS_TASK, ManagerTest.PROCESS_TASK);
603-
System.setProperty(Options.EXPORT_FILE_NAME, ManagerTest.EXPORT_FILE_NAME);
601+
System.setProperty(PROCESS_MODULE, TRANSFORM_SLOW_MODULE);
602+
System.setProperty(PROCESS_TASK, ManagerTest.PROCESS_TASK);
603+
System.setProperty(EXPORT_FILE_NAME, ManagerTest.EXPORT_FILE_NAME);
604604
System.setProperty(Options.EXPORT_FILE_DIR, ManagerTest.EXPORT_FILE_DIR);
605605
System.setProperty(Options.COMMAND_FILE, commandFile.getAbsolutePath());
606606
Runnable stop = () -> {
@@ -639,12 +639,12 @@ public void testCommandFileLowerThreads() {
639639
exportFile.deleteOnExit();
640640
File commandFile = new File(ManagerTest.EXPORT_FILE_DIR, Math.random() + EXT_TXT);
641641
commandFile.deleteOnExit();
642-
System.setProperty(Options.XCC_CONNECTION_URI, ManagerTest.XCC_CONNECTION_URI);
642+
System.setProperty(XCC_CONNECTION_URI, ManagerTest.XCC_CONNECTION_URI);
643643
System.setProperty(Options.URIS_FILE, ManagerTest.URIS_FILE);
644644
System.setProperty(Options.THREAD_COUNT, Integer.toString(3));
645-
System.setProperty(Options.PROCESS_MODULE, TRANSFORM_SLOW_MODULE);
646-
System.setProperty(Options.PROCESS_TASK, ManagerTest.PROCESS_TASK);
647-
System.setProperty(Options.EXPORT_FILE_NAME, ManagerTest.EXPORT_FILE_NAME);
645+
System.setProperty(PROCESS_MODULE, TRANSFORM_SLOW_MODULE);
646+
System.setProperty(PROCESS_TASK, ManagerTest.PROCESS_TASK);
647+
System.setProperty(EXPORT_FILE_NAME, ManagerTest.EXPORT_FILE_NAME);
648648
System.setProperty(Options.EXPORT_FILE_DIR, ManagerTest.EXPORT_FILE_DIR);
649649
System.setProperty(Options.COMMAND_FILE, commandFile.getAbsolutePath());
650650

0 commit comments

Comments
 (0)