JAL-629 better test fixes. --props=... instead of --debug

diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java
index cf21c3a..a9b7640 100644 (file)
--- a/test/jalview/bin/CommandLineOperations.java
+++ b/test/jalview/bin/CommandLineOperations.java
@@ -225,9 +225,9 @@ 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 --debug";
+            + "-features examples/testdata/plantfdx.features -annotations examples/testdata/plantfdx.annotations -tree examples/testdata/uniref50_test_tree";
     Worker worker = getJalviewDesktopRunner(true, cmds, SETUP_TIMEOUT);
     String ln = null;
     while ((ln = worker.getOutputReader().readLine()) != null)
@@ -244,7 +244,7 @@ public class CommandLineOperations
   @BeforeTest(alwaysRun = true)
   public void setUpForCommandLineInputOperations() throws IOException
   {
-    String cmds = "-open examples/uniref50.fa -noquestionnaire -nousagestats --debug";
+    String cmds = "-open examples/uniref50.fa -noquestionnaire -nousagestats";
     final Worker worker = getJalviewDesktopRunner(false, cmds,
             SETUP_TIMEOUT);
 
@@ -345,7 +345,7 @@ public class CommandLineOperations
         { "CMD [-color 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!",

diff --git a/test/jalview/bin/HiDPISettingTest2.java b/test/jalview/bin/HiDPISettingTest2.java
index f1630bb..87a26d1 100644 (file)
--- a/test/jalview/bin/HiDPISettingTest2.java
+++ b/test/jalview/bin/HiDPISettingTest2.java
@@ -129,7 +129,7 @@ public class HiDPISettingTest2
     String classpath = getClassPath();
     String cmd = java_exe + " " + " -classpath " + classpath + " " + jvmArgs
             + " jalview.bin.Jalview " + " "
-            + "-props test/jalview/bin/hidpiTestProps.jvprops " + appArgs;
+            + "--props=test/jalview/bin/hidpiTestProps.jvprops " + appArgs;
     Process proc = null;
     Worker worker = null;
     try
@@ -171,7 +171,7 @@ public class HiDPISettingTest2
 
     String jvmArgs = HiDPISetting.getScalePropertyArg(scale);
 
-    String appArgs = " -open examples/uniref50.fa -nosplash -nonews -noquestionnaire -nousagestats -nowebservicediscovery --debug";
+    String appArgs = " -open examples/uniref50.fa -nosplash -nonews -noquestionnaire -nousagestats -nowebservicediscovery";
 
     Worker worker = getJalviewDesktopRunner(jvmArgs, appArgs);
     assertNotNull(worker, "worker is null");

diff --git a/test/jalview/util/Log4jTest.java b/test/jalview/util/Log4jTest.java
index 8f23ae5..bdd1833 100644 (file)
--- a/test/jalview/util/Log4jTest.java
+++ b/test/jalview/util/Log4jTest.java
@@ -125,7 +125,7 @@ public class Log4jTest
     String classpath = getClassPath();
     String cmd = java_exe + " " + " -classpath " + classpath + " "
             + " jalview.bin.Jalview " + " "
-            + "-props test/jalview/util/log4jTestProps.jvprops " + appArgs;
+            + "--props=test/jalview/util/log4jTestProps.jvprops " + appArgs;
     Process proc = null;
     Worker worker = null;
     try
@@ -158,7 +158,7 @@ public class Log4jTest
   @Test(groups = { "Functional" })
   public void testLog4j()
   {
-    String appArgs = " -open examples/uniref50.fa -nosplash -nonews -noquestionnaire -nousagestats -nowebservicediscovery --debug";
+    String appArgs = " -open examples/uniref50.fa -nosplash -nonews -noquestionnaire -nousagestats -nowebservicediscovery";
 
     Worker worker = getJalviewDesktopRunner(appArgs);
     assertNotNull(worker, "worker is null");