JAL-629 Change --open to --append and --opennew to --open. Make --open(new) part...

[jalview.git] / test / jalview / bin / CommandsTest.java

diff --git a/test/jalview/bin/CommandsTest.java b/test/jalview/bin/CommandsTest.java
index fda047c..2d3724b 100644 (file)
--- a/test/jalview/bin/CommandsTest.java
+++ b/test/jalview/bin/CommandsTest.java
@@ -83,7 +83,8 @@ public class CommandsTest
     Assert.assertEquals(cmds.argsWereParsed(), cmdArgs,
             "Overall command parse and operation is false");
 
-    Assert.assertEquals(Desktop.getAlignFrames().length, numFrames);
+    Assert.assertEquals(Desktop.getAlignFrames().length, numFrames,
+            "Wrong number of AlignFrames");
 
     if (sequences != null)
     {
@@ -147,11 +148,11 @@ public class CommandsTest
         { testfiles + "/dir1/test1.png", testfiles + "/dir2/test1.png" } },
         { "--argfile=" + testfiles + "/dir*/argfile.txt", new String[]
         { testfiles + "/dir1/test1.png", testfiles + "/dir2/test1.png" } },
-        { "--initsubstitutions --open examples/uniref50.fa --image "
+        { "--initsubstitutions --append examples/uniref50.fa --image "
                 + testfiles + "/{basename}.png",
             new String[]
             { testfiles + "/uniref50.png" } },
-        { "--open examples/uniref50.fa --image " + testfiles
+        { "--append examples/uniref50.fa --image " + testfiles
                 + "/{basename}.png",
             new String[]
             { testfiles + "/{basename}.png" } } };
@@ -166,24 +167,28 @@ public class CommandsTest
     String[] t2 = new String[] { "TEST2" };
     String[] t3 = new String[] { "TEST3" };
     return new Object[][] {
-        { "--open=examples/uniref50.fa", true, 1, someUniref50Seqs },
-        { "--open examples/uniref50.fa", true, 1, someUniref50Seqs },
-        { "--open=examples/uniref50*.fa", true, 1, someUniref50Seqs },
+        /*
+        */
+        { "--append=examples/uniref50.fa", true, 1, someUniref50Seqs },
+        { "--append examples/uniref50.fa", true, 1, someUniref50Seqs },
+        { "--append=examples/uniref50*.fa", true, 1, someUniref50Seqs },
         // NOTE we cannot use shell expansion in tests, so list all files!
-        { "--open examples/uniref50.fa examples/uniref50_mz.fa", true, 1,
+        { "--append examples/uniref50.fa examples/uniref50_mz.fa", true, 1,
             someUniref50Seqs },
-        { "--open=[new]examples/uniref50*.fa", true, 2, someUniref50Seqs },
-        { "--opennew=examples/uniref50*.fa", true, 2, someUniref50Seqs },
+        { "--append=[new]examples/uniref50*.fa", true, 2,
+            someUniref50Seqs },
+        { "--open=examples/uniref50*.fa", true, 2, someUniref50Seqs },
         { "examples/uniref50.fa", true, 1, someUniref50Seqs },
         { "examples/uniref50.fa " + testfiles + "/test1.fa", true, 2,
             ArrayUtils.concatArrays(someUniref50Seqs, t1) },
         { "examples/uniref50.fa " + testfiles + "/test1.fa", true, 2, t1 },
         { "--argfile=" + testfiles + "/argfile0.txt", true, 1,
             ArrayUtils.concatArrays(t1, t3) },
-        { "--argfile=" + testfiles + "/argfile*.txt", true, 4,
+        { "--argfile=" + testfiles + "/argfile*.txt", true, 5,
             ArrayUtils.concatArrays(t1, t2, t3) },
         { "--argfile=" + testfiles + "/argfile.autocounter", true, 3,
             ArrayUtils.concatArrays(t1, t2) } };
+
   }
 
   public static boolean lookForSequenceName(String sequenceName)