git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
JAL-629 Change --open to --append and --opennew to --open. Make --open(new) part...
[jalview.git] / test / jalview / bin / argparser / ArgParserTest.java
diff --git a/test/jalview/bin/argparser/ArgParserTest.java b/test/jalview/bin/argparser/ArgParserTest.java
index 6d7f88f..efd6cb8 100644 (file)
--- a/test/jalview/bin/argparser/ArgParserTest.java
+++ b/test/jalview/bin/argparser/ArgParserTest.java
@@ -63,8 +63,8 @@ public class ArgParserTest
   public void parseAutoIndexAndSubstitutionsTest(String commandLineArgs,
           String linkedId, Arg a, String filename)
   {
-    // { "--open=filename0 --increment --open=filename1", "JALVIEW:1", Arg.OPEN,
-    // "filename1" },
+    // { "--append=filename0 --increment --append=filename1", "JALVIEW:1",
+    // Arg.OPEN, "filename1" },
     String[] args = commandLineArgs.split("\\s+");
     ArgParser argparser = new ArgParser(args);
     ArgValuesMap avm = argparser.linkedArgs(linkedId);
@@ -118,7 +118,7 @@ public class ArgParserTest
     BootstrapArgs b = BootstrapArgs.getBootstrapArgs(args);
 
     Assert.assertTrue(b.contains(a));
-    Assert.assertFalse(b.contains(Arg.OPEN));
+    Assert.assertFalse(b.contains(Arg.APPEND));
     if (a == Arg.PROPS)
     {
       Properties bP = Cache.bootstrapProperties(b.get(Arg.PROPS));
@@ -141,11 +141,11 @@ public class ArgParserTest
   public Object[][] argLines()
   {
     return new Object[][] { {
-        "--open=test/jalview/bin/argparser/testfiles/test1.fa --props=test/jalview/bin/argparser/testfiles/testProps.jvprops",
+        "--append=test/jalview/bin/argparser/testfiles/test1.fa --props=test/jalview/bin/argparser/testfiles/testProps.jvprops",
         Arg.PROPS, "true" },
-        { "--debug --open=test/jalview/bin/argparser/testfiles/test1.fa",
+        { "--debug --append=test/jalview/bin/argparser/testfiles/test1.fa",
             Arg.DEBUG, null },
-        { "--open=test/jalview/bin/argparser/testfiles/test1.fa --headless",
+        { "--append=test/jalview/bin/argparser/testfiles/test1.fa --headless",
             Arg.HEADLESS, null },
 
         { "--argfile test/jalview/bin/argparser/testfiles/argfile0.txt",
@@ -176,37 +176,65 @@ public class ArgParserTest
   public Object[][] argSubValsAndLinkedIds()
   {
     return new Object[][] { {
-        "--debug --open=[hi]test/jalview/bin/argparser/testfiles/test1.fa",
-        "JALVIEW:0", Arg.OPEN, "hi", "true", true },
-        { "--open[linkedId1]=[new;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --headless",
-            "linkedId1", Arg.OPEN, "new", "true", true },
-        { "--open[linkedId2]=[new;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --headless",
-            "linkedId2", Arg.OPEN, "hello", "world", true },
-        { "--open[linkedId3]=[new;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --headless",
-            "linkedId3", Arg.OPEN, "GETINDEX", "1", true },
-        { "--open[linkedId4]=[new;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --open[linkedId5]=[notnew;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --headless",
-            "linkedId5", Arg.OPEN, "new", "true", false },
-        { "--open[linkedId5]=[new;hello=worlddomination;1]test/jalview/bin/argparser/testfiles/test1.fa --open[linkedId2]=[new;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --headless",
-            "linkedId5", Arg.OPEN, "hello", "world", false },
-        { "--open[linkedId6]=[new;hello=world;0]test/jalview/bin/argparser/testfiles/test1.fa --open[linkedId7]=[new;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --headless",
-            "linkedId7", Arg.OPEN, "GETINDEX", "0", false }, };
+        "--debug --append=[hi]test/jalview/bin/argparser/testfiles/test1.fa",
+        "JALVIEW:0", Arg.APPEND, "hi", "true", true },
+        { "--append[linkedId1]=[new;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --headless",
+            "linkedId1", Arg.APPEND, "new", "true", true },
+        { "--append[linkedId2]=[new;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --headless",
+            "linkedId2", Arg.APPEND, "hello", "world", true },
+        { "--append[linkedId3]=[new;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --headless",
+            "linkedId3", Arg.APPEND, "GETINDEX", "1", true },
+        { "--append[linkedId4]=[new;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --append[linkedId5]=[notnew;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --headless",
+            "linkedId5", Arg.APPEND, "new", "true", false },
+        { "--append[linkedId5]=[new;hello=worlddomination;1]test/jalview/bin/argparser/testfiles/test1.fa --append[linkedId2]=[new;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --headless",
+            "linkedId5", Arg.APPEND, "hello", "world", false },
+        { "--append[linkedId6]=[new;hello=world;0]test/jalview/bin/argparser/testfiles/test1.fa --append[linkedId7]=[new;hello=world;1]test/jalview/bin/argparser/testfiles/test1.fa --headless",
+            "linkedId7", Arg.APPEND, "GETINDEX", "0", false }, };
   }
 
   @DataProvider(name = "argAutoIndexAndSubstitutions")
   public Object[][] argAutoIndexAndSubstitutions()
   {
-    return new Object[][] { { "--open=filename0 --open=filename1",
-        "JALVIEW:0", Arg.OPEN, "filename0" },
-        { "--open=filename0 --increment --open=filename1", "JALVIEW:1",
-            Arg.OPEN, "filename1" },
-        { "--open=filename0 --increment --increment --open=filename2",
-            "JALVIEW:0", Arg.OPEN, "filename0" },
-        { "--open=filename0 --increment --increment --open=filename2",
-            "JALVIEW:2", Arg.OPEN, "filename2" },
-        { "--open[linkA-{n}]=filenameA0 --open[linkA-{++n}]=filenameA1",
+    return new Object[][] {
+        //
+        /*
+         */
+        { "--append=filename0 --append=filename1", "JALVIEW:0", Arg.APPEND,
+            "filename0" },
+        { "--append=filename0 --increment --append=filename1", "JALVIEW:1",
+            Arg.APPEND, "filename1" },
+        { "--append=filename0 --increment --increment --append=filename2",
+            "JALVIEW:0", Arg.APPEND, "filename0" },
+        { "--append=filename0 --increment --increment --append=filename2",
+            "JALVIEW:2", Arg.APPEND, "filename2" },
+        { "--append[linkA-{n}]=filenameA0 --append[linkA-{++n}]=filenameA1",
+            "linkA-0", Arg.APPEND, "filenameA0" },
+        { "--append[linkB-{n}]=filenameB0 --append[linkB-{++n}]=filenameB1",
+            "linkB-1", Arg.APPEND, "filenameB1" },
+        { "--append[linkC-{n}]=filenameC0 --image[linkC-{n}]=outputC{n}.txt",
+            "linkC-0", Arg.IMAGE, "outputC{n}.txt" },
+        { "--append[linkD-{n}]=filenameD0 --substitutions --image[linkD-{n}]=outputD{n}.txt",
+            "linkD-0", Arg.IMAGE, "outputD0.txt" },
+        { "--append[linkE-{n}]=filenameE0 --substitutions --image[linkE-{n}]=output-E{n}.txt --nil[{++n}] --image[linkE-{n}]=outputE{n}.txt",
+            "linkE-0", Arg.IMAGE, "output-E0.txt" },
+        { "--append[linkF-{n}]=filenameF0 --substitutions --image[linkF-{n}]=output-F{n}.txt --nil[{++n}] --image[linkF-{n}]=outputF{n}.txt",
+            "linkF-1", Arg.IMAGE, "outputF1.txt" },
+        { "--append[linkG-{n}]=filenameG0 --substitutions --image[linkG-{n}]=output-G{n}.txt --nil[{++n}] --nosubstitutions --image[linkG-{n}]=outputG{n}.txt",
+            "linkG-1", Arg.IMAGE, "outputG{n}.txt" },
+        { "--append[linkH-{n}]=filenameH0 --substitutions --image[linkH-{n}]=output-H{n}.txt --nil[{++n}] --nosubstitutions --image[linkH-{n}]=outputH{n}.txt",
+            "linkH-0", Arg.IMAGE, "output-H0.txt" },
+        { "--open=filename0 --append=filename1", "JALVIEW:1", Arg.OPEN,
+            "filename0" },
+        { "--open=filename0 --increment --append=filename1", "JALVIEW:2",
+            Arg.APPEND, "filename1" },
+        { "--open=filename0 --increment --increment --append=filename2",
+            "JALVIEW:1", Arg.OPEN, "filename0" },
+        { "--open=filename0 --increment --increment --append=filename2",
+            "JALVIEW:3", Arg.APPEND, "filename2" },
+        { "--open[linkA-{n}]=filenameA0 --append[linkA-{++n}]=filenameA1",
             "linkA-0", Arg.OPEN, "filenameA0" },
-        { "--open[linkB-{n}]=filenameB0 --open[linkB-{++n}]=filenameB1",
-            "linkB-1", Arg.OPEN, "filenameB1" },
+        { "--open[linkB-{n}]=filenameB0 --append[linkB-{++n}]=filenameB1",
+            "linkB-1", Arg.APPEND, "filenameB1" },
         { "--open[linkC-{n}]=filenameC0 --image[linkC-{n}]=outputC{n}.txt",
             "linkC-0", Arg.IMAGE, "outputC{n}.txt" },
         { "--open[linkD-{n}]=filenameD0 --substitutions --image[linkD-{n}]=outputD{n}.txt",
@@ -218,7 +246,10 @@ public class ArgParserTest
         { "--open[linkG-{n}]=filenameG0 --substitutions --image[linkG-{n}]=output-G{n}.txt --nil[{++n}] --nosubstitutions --image[linkG-{n}]=outputG{n}.txt",
             "linkG-1", Arg.IMAGE, "outputG{n}.txt" },
         { "--open[linkH-{n}]=filenameH0 --substitutions --image[linkH-{n}]=output-H{n}.txt --nil[{++n}] --nosubstitutions --image[linkH-{n}]=outputH{n}.txt",
-            "linkH-0", Arg.IMAGE, "output-H0.txt" }, };
+            "linkH-0", Arg.IMAGE, "output-H0.txt" },
+
+        //
+    };
   }
 
   @DataProvider(name = "argFiles")