JAL-629 added eps and imagemap. Added --output and --format with test. Adjusted...

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

diff --git a/test/jalview/bin/CommandsTest.java b/test/jalview/bin/CommandsTest.java
index 28fef8f..fed1976 100644 (file)
--- a/test/jalview/bin/CommandsTest.java
+++ b/test/jalview/bin/CommandsTest.java
@@ -14,7 +14,6 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import jalview.bin.argparser.Arg;
 import jalview.gui.AlignFrame;
 import jalview.gui.Desktop;
 import jalview.gui.JvOptionPane;
@@ -154,8 +153,8 @@ public class CommandsTest
                 + testfiles + "/{basename}.png",
             new String[]
             { testfiles + "/uniref50.png" } },
-        { "--append examples/uniref50.fa --image " + testfiles
-                + "/{basename}.png",
+        { "--append examples/uniref50.fa --nosubstitutions --image "
+                + testfiles + "/{basename}.png",
             new String[]
             { testfiles + "/{basename}.png" } }
         //
@@ -225,7 +224,7 @@ public class CommandsTest
   }
 
   @Test(groups = "Functional", dataProvider = "allLinkedIdsData")
-  public void allLinkedIdsTest(String cmdLine, Arg a, String[] filenames)
+  public void allLinkedIdsTest(String cmdLine, String[] filenames)
   {
     String[] args = cmdLine.split("\\s+");
     Jalview.main(args);
@@ -252,10 +251,15 @@ public class CommandsTest
                 "test/jalview/bin/argparser/testfiles/test3.stk", } },
         */
         { "--open=test/jalview/bin/argparser/testfiles/*.fa --substitutions --all --image={dirname}/{basename}.png --close",
-            Arg.IMAGE, new String[]
+            new String[]
             { "test/jalview/bin/argparser/testfiles/test1.png",
                 "test/jalview/bin/argparser/testfiles/test2.png",
                 "test/jalview/bin/argparser/testfiles/test3.png", } },
+        { "--open=test/jalview/bin/argparser/testfiles/*.fa --all --output={dirname}/{basename}.stk --close",
+            new String[]
+            { "test/jalview/bin/argparser/testfiles/test1.stk",
+                "test/jalview/bin/argparser/testfiles/test2.stk",
+                "test/jalview/bin/argparser/testfiles/test3.stk", } },
         //
     };
   }