Merge branch 'develop' into task/JAL-3130_Java_11_investigations-getdown_src

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

diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java
index c7b1d53..ace1868 100644 (file)
--- a/test/jalview/bin/CommandLineOperations.java
+++ b/test/jalview/bin/CommandLineOperations.java
@@ -51,7 +51,8 @@ public class CommandLineOperations
     JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
   }
 
-  private static final int TEST_TIMEOUT = 9000; // Note longer timeout needed on
+  private static final int TEST_TIMEOUT = 9000; // Note longer timeout needed
+                                                // on
                                                 // full test run than on
                                                 // individual tests
 
@@ -150,8 +151,7 @@ public class CommandLineOperations
     // Note: JAL-3065 - don't include quotes for lib/* because the arguments are
     // not expanded by the shell
     String classpath = getClassPath();
-    String _cmd = "java "
-            + (withAwt ? "-Djava.awt.headless=true" : "")
+    String _cmd = "java " + (withAwt ? "-Djava.awt.headless=true" : "")
             + " -classpath " + classpath + " jalview.bin.Jalview ";
     Process ls2_proc = null;
     Worker worker = null;
@@ -241,7 +241,8 @@ public class CommandLineOperations
   }
 
   @Test(
-    groups = { "Functional" },
+    groups =
+    { "Functional", "testben" },
     dataProvider = "headlessModeOutputOperationsData")
   public void testHeadlessModeOutputOperations(String harg, String type,
           String fileName, boolean withAWT, int expectedMinFileSize,
@@ -262,11 +263,9 @@ public class CommandLineOperations
       worker.interrupt();
       Thread.currentThread().interrupt();
       worker.process.destroy();
-      Assert.fail("Jalview did not exit after "
-              + type
+      Assert.fail("Jalview did not exit after " + type
               + " generation (try running test again to verify - timeout at "
-              + SETUP_TIMEOUT + "ms). ["
-              + harg + "]");
+              + timeout + "ms). [" + harg + "]");
     }
     file.delete();
   }
@@ -304,10 +303,9 @@ public class CommandLineOperations
   @DataProvider(name = "headlessModeOutputOperationsData")
   public static Object[][] getHeadlessModeOutputParams()
   {
-    return new Object[][] {
-        { "nodisplay -open examples/uniref50.fa", " -eps",
-            "test/jalview/bin/test_uniref50_out.eps", true, MINFILESIZE_BIG,
-            TEST_TIMEOUT },
+    return new Object[][] { { "nodisplay -open examples/uniref50.fa",
+        " -eps", "test/jalview/bin/test_uniref50_out.eps", true,
+        MINFILESIZE_BIG, TEST_TIMEOUT },
         { "nodisplay -open examples/uniref50.fa", " -eps",
             "test/jalview/bin/test_uniref50_out.eps", false,
             MINFILESIZE_BIG, TEST_TIMEOUT },
@@ -330,28 +328,28 @@ public class CommandLineOperations
             "test/jalview/bin/test_uniref50_out.html", true,
             MINFILESIZE_BIG, TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -fasta",
-            "test/jalview/bin/test_uniref50_out.mfa", true,
-            MINFILESIZE_SMALL, TEST_TIMEOUT },
+            "test_uniref50_out.mfa", true, MINFILESIZE_SMALL,
+            TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -clustal",
-            "test/jalview/bin/test_uniref50_out.aln", true,
-            MINFILESIZE_SMALL, TEST_TIMEOUT },
+            "test_uniref50_out.aln", true, MINFILESIZE_SMALL,
+            TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -msf",
-            "test/jalview/bin/test_uniref50_out.msf", true,
-            MINFILESIZE_SMALL, TEST_TIMEOUT },
+            "test_uniref50_out.msf", true, MINFILESIZE_SMALL,
+            TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -pileup",
-            "test/jalview/bin/test_uniref50_out.aln", true,
-            MINFILESIZE_SMALL, TEST_TIMEOUT },
+            "test_uniref50_out.aln", true, MINFILESIZE_SMALL,
+            TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -pir",
-            "test/jalview/bin/test_uniref50_out.pir", true,
-            MINFILESIZE_SMALL, TEST_TIMEOUT },
+            "test_uniref50_out.pir", true, MINFILESIZE_SMALL,
+            TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -pfam",
-            "test/jalview/bin/test_uniref50_out.pfam", true,
-            MINFILESIZE_SMALL, TEST_TIMEOUT },
+            "test_uniref50_out.pfam", true, MINFILESIZE_SMALL,
+            TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -blc",
-            "test/jalview/bin/test_uniref50_out.blc", true,
-            MINFILESIZE_SMALL, TEST_TIMEOUT },
+            "test_uniref50_out.blc", true, MINFILESIZE_SMALL,
+            TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -jalview",
-            "test/jalview/bin/test_uniref50_out.jvp", true,
-            MINFILESIZE_SMALL, TEST_TIMEOUT }, };
+            "test_uniref50_out.jvp", true, MINFILESIZE_SMALL,
+            TEST_TIMEOUT }, };
   }
 }