JAL-629 Commands more objecty, less classy. FileLoader with sync option (or rather...

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

diff --git a/test/jalview/bin/ArgParserTest.java b/test/jalview/bin/ArgParserTest.java
index 9d4a8be..b72fcb9 100644 (file)
--- a/test/jalview/bin/ArgParserTest.java
+++ b/test/jalview/bin/ArgParserTest.java
@@ -12,6 +12,7 @@ import org.testng.annotations.Test;
 import jalview.bin.ArgParser.Arg;
 import jalview.bin.ArgParser.BootstrapArgs;
 
+@Test(singleThreaded = true)
 public class ArgParserTest
 {
 
@@ -77,11 +78,12 @@ public class ArgParserTest
     }
   }
 
-  @DataProvider(name = "argLinesTest")
+  @DataProvider(name = "argLinesNotworking")
   public Object[][] argLinesTest()
   {
     return new Object[][] {
-        // can't use this one yet as it doesn't get shell expanded
+        // can't use this one yet as it doesn't get shell glob expanded by the
+        // test
         { "--argfile test/jalview/bin/argparser/argfile*.txt", Arg.ARGFILE,
             "test/jalview/bin/argparser/argfile0.txt" }, };
   }
@@ -96,12 +98,22 @@ public class ArgParserTest
             Arg.HEADLESS, null },
         { "--open=test/jalview/bin/argparser/test1.fa --props=test/jalview/bin/argparser/testProps.jvprops",
             Arg.PROPS, "true" },
+        { "--argfile test/jalview/bin/argparser/argfile0.txt", Arg.ARGFILE,
+            "test/jalview/bin/argparser/argfile0.txt" },
+        // these next three are what a shell glob expansion would look like
+        { "--argfile test/jalview/bin/argparser/argfile0.txt test/jalview/bin/argparser/argfile1.txt test/jalview/bin/argparser/argfile2.txt",
+            Arg.ARGFILE, "test/jalview/bin/argparser/argfile0.txt" },
+        { "--argfile test/jalview/bin/argparser/argfile0.txt test/jalview/bin/argparser/argfile1.txt test/jalview/bin/argparser/argfile2.txt",
+            Arg.ARGFILE, "test/jalview/bin/argparser/argfile1.txt" },
+        { "--argfile test/jalview/bin/argparser/argfile0.txt test/jalview/bin/argparser/argfile1.txt test/jalview/bin/argparser/argfile2.txt",
+            Arg.ARGFILE, "test/jalview/bin/argparser/argfile2.txt" },
         { "--argfile=test/jalview/bin/argparser/argfile*.txt", Arg.ARGFILE,
             "test/jalview/bin/argparser/argfile0.txt" },
         { "--argfile=test/jalview/bin/argparser/argfile*.txt", Arg.ARGFILE,
             "test/jalview/bin/argparser/argfile1.txt" },
         { "--argfile=test/jalview/bin/argparser/argfile*.txt", Arg.ARGFILE,
             "test/jalview/bin/argparser/argfile2.txt" } };
+
   }
 
   @DataProvider(name = "argFiles")