JAL-629 Added --opennew --nonews --nosplash. Added java globbing for = e.g. --open...

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

diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java
index 2d8ebce..7509ec9 100644 (file)
--- a/test/jalview/bin/CommandLineOperations.java
+++ b/test/jalview/bin/CommandLineOperations.java
@@ -23,8 +23,6 @@ package jalview.bin;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
-import jalview.gui.JvOptionPane;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -43,6 +41,7 @@ import org.testng.annotations.Test;
 import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ModuleRef;
 import io.github.classgraph.ScanResult;
+import jalview.gui.JvOptionPane;
 
 public class CommandLineOperations
 {
@@ -54,12 +53,10 @@ public class CommandLineOperations
     JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
   }
 
-  private static final int TEST_TIMEOUT = 12500; // Note longer timeout needed
-                                                 // on
-                                                 // full test run than on
-                                                 // individual tests
+  // Note longer timeout needed on full test run than on individual tests
+  private static final int TEST_TIMEOUT = 13000;
 
-  private static final int SETUP_TIMEOUT = 9000;
+  private static final int SETUP_TIMEOUT = 9500;
 
   private static final int MINFILESIZE_SMALL = 2096;
 
@@ -226,7 +223,7 @@ public class CommandLineOperations
   public void setUpForHeadlessCommandLineInputOperations()
           throws IOException
   {
-    String cmds = "nodisplay -open examples/uniref50.fa -sortbytree -props test/jalview/bin/testProps.jvprops -colour zappo "
+    String cmds = "nodisplay -open examples/uniref50.fa -sortbytree --props=test/jalview/bin/testProps.jvprops -colour zappo "
             + "-jabaws http://www.compbio.dundee.ac.uk/jabaws -nosortbytree "
             + "-features examples/testdata/plantfdx.features -annotations examples/testdata/plantfdx.annotations -tree examples/testdata/uniref50_test_tree";
     Worker worker = getJalviewDesktopRunner(true, cmds, SETUP_TIMEOUT);
@@ -251,12 +248,13 @@ public class CommandLineOperations
 
     // number of lines expected on STDERR when Jalview starts up normally
     // may need to adjust this if Jalview is excessively noisy ?
-    final int STDERR_SETUPLINES = 30;
+    final int STDERR_SETUPLINES = 50;
 
     // thread monitors stderr - bails after SETUP_TIMEOUT or when
     // STDERR_SETUPLINES have been read
     Thread runner = new Thread(new Runnable()
     {
+      @Override
       public void run()
       {
         String ln = null;
@@ -342,10 +340,10 @@ public class CommandLineOperations
   {
     return new Object[][] {
         // headless mode input operations
-        { "CMD [-color zappo] executed successfully!",
+        { "CMD [-colour zappo] executed successfully!",
             "Failed command : -color zappo" },
         { "CMD [-props test/jalview/bin/testProps.jvprops] executed successfully!",
-            "Failed command : -props File" },
+            "Failed command : --props=File" },
         { "CMD [-sortbytree] executed successfully!",
             "Failed command : -sortbytree" },
         { "CMD [-jabaws http://www.compbio.dundee.ac.uk/jabaws] executed successfully!",