git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
JAL-4290 new CommandsTest.headlessOrGuiImageOutputTest - uses CommandLineOperations...
[jalview.git] / test / jalview / bin / CommandLineOperations.java
diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java
index ee03e77..3855dc7 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;
@@ -36,13 +34,13 @@ import java.util.ArrayList;
 import org.testng.Assert;
 import org.testng.FileAssert;
 import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
 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 +52,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 = 15000;
 
-  private static final int SETUP_TIMEOUT = 9000;
+  private static final int SETUP_TIMEOUT = 9500;
 
   private static final int MINFILESIZE_SMALL = 2096;
 
@@ -75,7 +71,7 @@ public class CommandLineOperations
    * @author jimp
    * 
    */
-  private static class Worker extends Thread
+  public static class Worker extends Thread
   {
     private final Process process;
 
@@ -160,15 +156,15 @@ public class CommandLineOperations
     return classpath;
   }
 
-  private Worker getJalviewDesktopRunner(boolean withAwt, String cmd,
+  public static Worker getJalviewDesktopRunner(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_exe + " "
-            + (withAwt ? "-Djava.awt.headless=true" : "")
-            + " -classpath " + classpath
+            + (withAwt ? "-Djava.awt.headless=true" : "") + " -classpath "
+            + classpath
             + (modules.length() > 2 ? "--add-modules=\"" + modules + "\""
                     : "")
             + " jalview.bin.Jalview ";
@@ -187,7 +183,7 @@ public class CommandLineOperations
               new InputStreamReader(ls2_proc.getInputStream()));
       BufferedReader errorReader = new BufferedReader(
               new InputStreamReader(ls2_proc.getErrorStream()));
-      worker = new Worker(ls2_proc);
+      worker = new CommandLineOperations.Worker(ls2_proc);
       worker.start();
       try
       {
@@ -216,13 +212,13 @@ public class CommandLineOperations
     }
   }
 
-  @BeforeTest(alwaysRun = true)
+  @BeforeClass(alwaysRun = true)
   public void initialize()
   {
     new CommandLineOperations();
   }
 
-  @BeforeTest(alwaysRun = true)
+  @BeforeClass(alwaysRun = true)
   public void setUpForHeadlessCommandLineInputOperations()
           throws IOException
   {
@@ -233,42 +229,54 @@ public class CommandLineOperations
     String ln = null;
     while ((ln = worker.getOutputReader().readLine()) != null)
     {
-      System.out.println(ln);
+      System.out.println("STDOUT: " + ln);
       successfulCMDs.add(ln);
     }
     while ((ln = worker.getErrorReader().readLine()) != null)
     {
-      System.err.println(ln);
+      System.err.println("STDERR: " + ln);
+      successfulCMDs.add(ln);
     }
   }
 
-  @BeforeTest(alwaysRun = true)
+  @BeforeClass(alwaysRun = true)
   public void setUpForCommandLineInputOperations() throws IOException
   {
     String cmds = "-open examples/uniref50.fa -noquestionnaire -nousagestats";
     final Worker worker = getJalviewDesktopRunner(false, cmds,
             SETUP_TIMEOUT);
-    
-    
+
     // 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 STDOUT_SETUPLINES = 50;
+    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;
-        int count = 0;
+        int stdoutcount = 0;
+        int stderrcount = 0;
         try
         {
-          while ((ln = worker.getErrorReader().readLine()) != null)
+          while ((ln = worker.getOutputReader().readLine()) != null)
           {
             System.out.println(ln);
             successfulCMDs.add(ln);
-            if (++count > STDERR_SETUPLINES)
+            if (++stdoutcount > STDOUT_SETUPLINES)
+            {
+              break;
+            }
+          }
+          while ((ln = worker.getErrorReader().readLine()) != null)
+          {
+            System.err.println(ln);
+            successfulCMDs.add(ln);
+            if (++stderrcount > STDERR_SETUPLINES)
             {
               break;
             }
@@ -343,8 +351,8 @@ public class CommandLineOperations
   {
     return new Object[][] {
         // headless mode input operations
-        { "CMD [-color zappo] executed successfully!",
-            "Failed command : -color zappo" },
+        { "CMD [-colour zappo] executed successfully!",
+            "Failed command : -colour zappo" },
         { "CMD [-props test/jalview/bin/testProps.jvprops] executed successfully!",
             "Failed command : -props File" },
         { "CMD [-sortbytree] executed successfully!",
@@ -376,30 +384,32 @@ public class CommandLineOperations
     // since it works.
     // https://issues.jalview.org/browse/JAL-1889?focusedCommentId=21609&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-21609
     String workingDir = "test/jalview/bin/";
-    return new Object[][] { { "nodisplay -open examples/uniref50.fa",
-        " -eps", workingDir + "test_uniref50_out.eps", true,
-        MINFILESIZE_BIG, TEST_TIMEOUT },
+    return new Object[][] {
+        //
         { "nodisplay -open examples/uniref50.fa", " -eps",
-            workingDir + "test_uniref50_out.eps", false,
-            MINFILESIZE_BIG, TEST_TIMEOUT },
+            workingDir + "test_uniref50_out.eps", true, MINFILESIZE_BIG,
+            TEST_TIMEOUT },
+        { "nodisplay -open examples/uniref50.fa", " -eps",
+            workingDir + "test_uniref50_out.eps", false, MINFILESIZE_BIG,
+            TEST_TIMEOUT },
         { "nogui -open examples/uniref50.fa", " -eps",
             workingDir + "test_uniref50_out.eps", true, MINFILESIZE_BIG,
             TEST_TIMEOUT },
         { "nogui -open examples/uniref50.fa", " -eps",
-            workingDir + "test_uniref50_out.eps", false,
-            MINFILESIZE_BIG, TEST_TIMEOUT },
+            workingDir + "test_uniref50_out.eps", false, MINFILESIZE_BIG,
+            TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -eps",
             workingDir + "test_uniref50_out.eps", true, MINFILESIZE_BIG,
             TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -svg",
-            workingDir + "test_uniref50_out.svg", false,
-            MINFILESIZE_BIG, TEST_TIMEOUT },
+            workingDir + "test_uniref50_out.svg", false, MINFILESIZE_BIG,
+            TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -png",
             workingDir + "test_uniref50_out.png", true, MINFILESIZE_BIG,
             TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -html",
-            workingDir + "test_uniref50_out.html", true,
-            MINFILESIZE_BIG, TEST_TIMEOUT },
+            workingDir + "test_uniref50_out.html", true, MINFILESIZE_BIG,
+            TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -fasta",
             workingDir + "test_uniref50_out.mfa", true, MINFILESIZE_SMALL,
             TEST_TIMEOUT },
@@ -423,6 +433,8 @@ public class CommandLineOperations
             TEST_TIMEOUT },
         { "headless -open examples/uniref50.fa", " -jalview",
             workingDir + "test_uniref50_out.jvp", true, MINFILESIZE_SMALL,
-            TEST_TIMEOUT }, };
+            TEST_TIMEOUT },
+        //
+    };
   }
 }