JAL-629 changed args in tests

diff --git a/test/jalview/bin/argparser/ArgParserTest.java b/test/jalview/bin/argparser/ArgParserTest.java
index efd6cb8..568791d 100644 (file)
--- a/test/jalview/bin/argparser/ArgParserTest.java
+++ b/test/jalview/bin/argparser/ArgParserTest.java
@@ -63,7 +63,7 @@ public class ArgParserTest
   public void parseAutoIndexAndSubstitutionsTest(String commandLineArgs,
           String linkedId, Arg a, String filename)
   {
-    // { "--append=filename0 --increment --append=filename1", "JALVIEW:1",
+    // { "--append=filename0 --newframe --append=filename1", "JALVIEW:1",
     // Arg.OPEN, "filename1" },
     String[] args = commandLineArgs.split("\\s+");
     ArgParser argparser = new ArgParser(args);
@@ -201,11 +201,11 @@ public class ArgParserTest
          */
         { "--append=filename0 --append=filename1", "JALVIEW:0", Arg.APPEND,
             "filename0" },
-        { "--append=filename0 --increment --append=filename1", "JALVIEW:1",
+        { "--append=filename0 --newframe --append=filename1", "JALVIEW:1",
             Arg.APPEND, "filename1" },
-        { "--append=filename0 --increment --increment --append=filename2",
+        { "--append=filename0 --newframe --newframe --append=filename2",
             "JALVIEW:0", Arg.APPEND, "filename0" },
-        { "--append=filename0 --increment --increment --append=filename2",
+        { "--append=filename0 --newframe --newframe --append=filename2",
             "JALVIEW:2", Arg.APPEND, "filename2" },
         { "--append[linkA-{n}]=filenameA0 --append[linkA-{++n}]=filenameA1",
             "linkA-0", Arg.APPEND, "filenameA0" },
@@ -225,11 +225,11 @@ public class ArgParserTest
             "linkH-0", Arg.IMAGE, "output-H0.txt" },
         { "--open=filename0 --append=filename1", "JALVIEW:1", Arg.OPEN,
             "filename0" },
-        { "--open=filename0 --increment --append=filename1", "JALVIEW:2",
+        { "--open=filename0 --newframe --append=filename1", "JALVIEW:2",
             Arg.APPEND, "filename1" },
-        { "--open=filename0 --increment --increment --append=filename2",
+        { "--open=filename0 --newframe --newframe --append=filename2",
             "JALVIEW:1", Arg.OPEN, "filename0" },
-        { "--open=filename0 --increment --increment --append=filename2",
+        { "--open=filename0 --newframe --newframe --append=filename2",
             "JALVIEW:3", Arg.APPEND, "filename2" },
         { "--open[linkA-{n}]=filenameA0 --append[linkA-{++n}]=filenameA1",
             "linkA-0", Arg.OPEN, "filenameA0" },

diff --git a/test/jalview/bin/argparser/testfiles/dir1/argfile.txt b/test/jalview/bin/argparser/testfiles/dir1/argfile.txt
index ee9580d..16d7fad 100644 (file)
--- a/test/jalview/bin/argparser/testfiles/dir1/argfile.txt
+++ b/test/jalview/bin/argparser/testfiles/dir1/argfile.txt
@@ -1,5 +1,5 @@
 --substitutions
---increment
+--newframe
 --append={argfiledirname}/*.fa
 --colour=gecos:flower
 --image={argfiledirname}/{basename}.png

diff --git a/test/jalview/bin/argparser/testfiles/dir2/argfile.txt b/test/jalview/bin/argparser/testfiles/dir2/argfile.txt
index ee9580d..16d7fad 100644 (file)
--- a/test/jalview/bin/argparser/testfiles/dir2/argfile.txt
+++ b/test/jalview/bin/argparser/testfiles/dir2/argfile.txt
@@ -1,5 +1,5 @@
 --substitutions
---increment
+--newframe
 --append={argfiledirname}/*.fa
 --colour=gecos:flower
 --image={argfiledirname}/{basename}.png

diff --git a/test/jalview/bin/argparser/testfiles/dir3/subdir/subdirfile.txt b/test/jalview/bin/argparser/testfiles/dir3/subdir/subdirfile.txt
index ee9580d..16d7fad 100644 (file)
--- a/test/jalview/bin/argparser/testfiles/dir3/subdir/subdirfile.txt
+++ b/test/jalview/bin/argparser/testfiles/dir3/subdir/subdirfile.txt
@@ -1,5 +1,5 @@
 --substitutions
---increment
+--newframe
 --append={argfiledirname}/*.fa
 --colour=gecos:flower
 --image={argfiledirname}/{basename}.png