Merge branch 'spike/relaunch_memsetingds' into spikes/jim

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

diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java
index 2b40a72..a017fcf 100644 (file)
--- a/test/jalview/bin/CommandLineOperations.java
+++ b/test/jalview/bin/CommandLineOperations.java
@@ -21,6 +21,7 @@
 package jalview.bin;
 
 import jalview.gui.JvOptionPane;
+import jalview.ws.utils.Worker;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -35,6 +36,9 @@ import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+import io.github.classgraph.ClassGraph;
+import io.github.classgraph.ScanResult;
+
 public class CommandLineOperations
 {
 
@@ -45,7 +49,7 @@ public class CommandLineOperations
     JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
   }
 
-  private static final int TEST_TIMEOUT = 4500; // Note longer timeout needed on
+  private static final int TEST_TIMEOUT = 9000; // Note longer timeout needed on
                                                 // full test run than on
                                                 // individual tests
 
@@ -57,69 +61,40 @@ public class CommandLineOperations
 
   private ArrayList<String> successfulCMDs = new ArrayList<>();
 
-  /***
-   * from
-   * http://stackoverflow.com/questions/808276/how-to-add-a-timeout-value-when
-   * -using-javas-runtime-exec
-   * 
-   * @author jimp
-   * 
-   */
-  private static class Worker extends Thread
-  {
-    private final Process process;
-
-    private BufferedReader outputReader;
 
-    private BufferedReader errorReader;
+  private static ClassGraph scanner = null;
 
-    private Integer exit;
+  private static String classpath = null;
 
-    private Worker(Process process)
+  public synchronized static String getClassPath()
+  {
+    if (scanner == null)
     {
-      this.process = process;
+      scanner = new ClassGraph();
+      ScanResult scan = scanner.scan();
+      classpath = scan.getClasspath();
     }
-
-    @Override
-    public void run()
+    while (classpath == null)
     {
       try
       {
-        exit = process.waitFor();
-      } catch (InterruptedException ignore)
+        Thread.sleep(10);
+      } catch (InterruptedException x)
       {
-        return;
-      }
-    }
-
-    public BufferedReader getOutputReader()
-    {
-      return outputReader;
-    }
 
-    public void setOutputReader(BufferedReader outputReader)
-    {
-      this.outputReader = outputReader;
-    }
-
-    public BufferedReader getErrorReader()
-    {
-      return errorReader;
-    }
-
-    public void setErrorReader(BufferedReader errorReader)
-    {
-      this.errorReader = errorReader;
+      }
     }
+    return classpath;
   }
-
   private Worker jalviewDesktopRunner(boolean withAwt, String cmd,
           int timeout)
   {
+    // 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" : "")
-            + " -classpath \"./lib/*:./classes\" jalview.bin.Jalview ";
-    System.out.println("CMD [" + cmd + "]");
+            + " -classpath " + classpath + " jalview.bin.Jalview ";
     Process ls2_proc = null;
     Worker worker = null;
     try
@@ -188,11 +163,10 @@ public class CommandLineOperations
         break;
       }
     }
-    if (worker != null && worker.exit == null)
+    if (worker != null && worker.getExitValue() == null)
     {
-      worker.interrupt();
-      Thread.currentThread().interrupt();
-      worker.process.destroy();
+      worker.destroyProcess();
+
     }
   }
 
@@ -218,11 +192,9 @@ public class CommandLineOperations
     FileAssert.assertFile(file, "Didn't create an output" + type
             + " file.[" + harg + "]");
     FileAssert.assertMinLength(new File(fileName), expectedMinFileSize);
-    if (worker != null && worker.exit == null)
+    if (worker != null && worker.getExitValue() == null)
     {
-      worker.interrupt();
-      Thread.currentThread().interrupt();
-      worker.process.destroy();
+      worker.destroyProcess();
       Assert.fail("Jalview did not exit after "
               + type
               + " generation (try running test again to verify - timeout at "