X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fbin%2FCommandLineOperations.java;h=7e775d856fb3fb842d2f451255ffad3d10bbda62;hb=dcb4c919fdf50dd481eb411c11a657611ab4f63b;hp=cb08563639e6331ae249452fd55f5a9a5cde9609;hpb=397492a5c6d3bf851eb1689af32af03df7790eb8;p=jalview.git diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java index cb08563..7e775d8 100644 --- 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,12 @@ public class CommandLineOperations JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); } - private static final int TEST_TIMEOUT = 9000; // Note longer timeout needed - // on - // full test run than on - // individual tests + private static final int TEST_TIMEOUT = 13000; // Note longer timeout needed + // on + // full test run than on + // individual tests - private static final int SETUP_TIMEOUT = 9000; + private static final int SETUP_TIMEOUT = 9500; private static final int MINFILESIZE_SMALL = 2096; @@ -129,6 +128,8 @@ public class CommandLineOperations private static String modules = null; + private static String java_exe = null; + public synchronized static String getClassPath() { if (scanner == null) @@ -141,6 +142,9 @@ public class CommandLineOperations { modules.concat(mr.getName()); } + java_exe = System.getProperty("java.home") + File.separator + "bin" + + File.separator + "java"; + } while (classpath == null) { @@ -161,8 +165,9 @@ 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" : "") - + " -classpath " + classpath + String _cmd = java_exe + " " + + (withAwt ? "-Djava.awt.headless=true" : "") + " -classpath " + + classpath + (modules.length() > 2 ? "--add-modules=\"" + modules + "\"" : "") + " jalview.bin.Jalview "; @@ -204,7 +209,6 @@ public class CommandLineOperations Path currentRelativePath = Paths.get(""); String s = currentRelativePath.toAbsolutePath().toString(); System.out.println("Test CWD is " + s); - System.err.println("Test CWD is " + s); } catch (Exception q) { q.printStackTrace(); @@ -221,7 +225,7 @@ public class CommandLineOperations public void setUpForHeadlessCommandLineInputOperations() throws IOException { - String cmds = "nodisplay -open examples/uniref50.fa -sortbytree -props test/jalview/io/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); @@ -241,18 +245,53 @@ public class CommandLineOperations public void setUpForCommandLineInputOperations() throws IOException { String cmds = "-open examples/uniref50.fa -noquestionnaire -nousagestats"; - Worker worker = getJalviewDesktopRunner(false, cmds, SETUP_TIMEOUT); - String ln = null; - int count = 0; - while ((ln = worker.getErrorReader().readLine()) != null) + 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 = 50; + + // thread monitors stderr - bails after SETUP_TIMEOUT or when + // STDERR_SETUPLINES have been read + Thread runner = new Thread(new Runnable() { - System.out.println(ln); - successfulCMDs.add(ln); - if (++count > 5) + @Override + public void run() + { + String ln = null; + int count = 0; + try + { + while ((ln = worker.getErrorReader().readLine()) != null) + { + System.out.println(ln); + successfulCMDs.add(ln); + if (++count > STDERR_SETUPLINES) + { + break; + } + } + } catch (Exception e) + { + System.err.println( + "Unexpected Exception reading stderr from the Jalview process"); + e.printStackTrace(); + } + } + }); + long t = System.currentTimeMillis() + SETUP_TIMEOUT; + runner.start(); + while (!runner.isInterrupted() && System.currentTimeMillis() < t) + { + try + { + Thread.sleep(500); + } catch (InterruptedException e) { - break; } } + runner.interrupt(); if (worker != null && worker.exit == null) { worker.interrupt(); @@ -270,7 +309,7 @@ public class CommandLineOperations @Test( groups = - { "Functional", "testben" }, + { "Functional" }, dataProvider = "headlessModeOutputOperationsData") public void testHeadlessModeOutputOperations(String harg, String type, String fileName, boolean withAWT, int expectedMinFileSize, @@ -305,7 +344,7 @@ public class CommandLineOperations // headless mode input operations { "CMD [-color zappo] executed successfully!", "Failed command : -color zappo" }, - { "CMD [-props test/jalview/io/testProps.jvprops] executed successfully!", + { "CMD [-props test/jalview/bin/testProps.jvprops] executed successfully!", "Failed command : -props File" }, { "CMD [-sortbytree] executed successfully!", "Failed command : -sortbytree" }, @@ -340,26 +379,26 @@ public class CommandLineOperations " -eps", 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 }, + 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 },