JAL-629 Changed --newframe and --allframes to --new and --all. More consistent -...

[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 314b0f0..17f19b7 100644 (file)
--- a/test/jalview/bin/argparser/ArgParserTest.java
+++ b/test/jalview/bin/argparser/ArgParserTest.java
@@ -72,7 +72,7 @@ public class ArgParserTest
   public void parseAutoIndexAndSubstitutionsTest(String commandLineArgs,
           String linkedId, Arg a, String filename)
   {
-    // { "--append=filename0 --newframe --append=filename1", "JALVIEW:1",
+    // { "--append=filename0 --new --append=filename1", "JALVIEW:1",
     // Arg.OPEN, "filename1" },
     String[] args = commandLineArgs.split("\\s+");
     ArgParser argparser = new ArgParser(args);
@@ -210,12 +210,12 @@ public class ArgParserTest
          */
         { "--append=filename0 --append=filename1", "JALVIEW:0", Arg.APPEND,
             "filename0" },
-        { "--append=filename0 --newframe --append=filename1", "JALVIEW:1",
+        { "--append=filename0 --new --append=filename1", "JALVIEW:1",
             Arg.APPEND, "filename1" },
-        { "--append=filename0 --newframe --newframe --append=filename2",
-            "JALVIEW:0", Arg.APPEND, "filename0" },
-        { "--append=filename0 --newframe --newframe --append=filename2",
-            "JALVIEW:2", Arg.APPEND, "filename2" },
+        { "--append=filename0 --new --new --append=filename2", "JALVIEW:0",
+            Arg.APPEND, "filename0" },
+        { "--append=filename0 --new --new --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",
@@ -232,14 +232,14 @@ public class ArgParserTest
             "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,
+        { "--open=filename0 --append=filename1", "JALVIEW:0", Arg.OPEN,
             "filename0" },
-        { "--open=filename0 --newframe --append=filename1", "JALVIEW:2",
+        { "--open=filename0 --new --append=filename1", "JALVIEW:1",
             Arg.APPEND, "filename1" },
-        { "--open=filename0 --newframe --newframe --append=filename2",
-            "JALVIEW:1", Arg.OPEN, "filename0" },
-        { "--open=filename0 --newframe --newframe --append=filename2",
-            "JALVIEW:3", Arg.APPEND, "filename2" },
+        { "--open=filename0 --new --new --append=filename2", "JALVIEW:0",
+            Arg.OPEN, "filename0" },
+        { "--open=filename0 --new --new --append=filename2", "JALVIEW:2",
+            Arg.APPEND, "filename2" },
         { "--open[linkA-{n}]=filenameA0 --append[linkA-{++n}]=filenameA1",
             "linkA-0", Arg.OPEN, "filenameA0" },
         { "--open[linkB-{n}]=filenameB0 --append[linkB-{++n}]=filenameB1",
@@ -256,6 +256,8 @@ public class ArgParserTest
             "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" },
+        /*
+         */
 
         //
     };
@@ -312,16 +314,16 @@ public class ArgParserTest
         //
         /*
         */
-        { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --allframes --image={dirname}/{basename}.png --close",
+        { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --all --image={dirname}/{basename}.png --close",
             Arg.CLOSE, new String[]
             { null, null,
                 null } },
-        { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --allframes --output={dirname}/{basename}.stk --close",
+        { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --all --output={dirname}/{basename}.stk --close",
             Arg.OUTPUT, new String[]
             { "test/jalview/bin/argparser/testfiles/test1.stk",
                 "test/jalview/bin/argparser/testfiles/test2.stk",
                 "test/jalview/bin/argparser/testfiles/test3.stk", } },
-        { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --allframes --image={dirname}/{basename}.png --close",
+        { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --all --image={dirname}/{basename}.png --close",
             Arg.IMAGE, new String[]
             { "test/jalview/bin/argparser/testfiles/test1.png",
                 "test/jalview/bin/argparser/testfiles/test2.png",