X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fbin%2FCommandLineOperations.java;h=0486744cadcfecbd2e8b4a01f91c7d3670f580e9;hb=35d4141c06ba40f0b426dcd3887ec96e46356747;hp=432369921adfaaf3d5168b10aef13097c8442bc6;hpb=1c721468246c2aafd86fc52d954512374f576b11;p=jalview.git diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java index 4323699..0486744 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; @@ -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 = 10500; // 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; @@ -167,8 +163,8 @@ public class CommandLineOperations // 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 "; @@ -216,17 +212,17 @@ 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 { - 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); @@ -242,22 +238,57 @@ public class CommandLineOperations } } - @BeforeTest(alwaysRun = true) + @BeforeClass(alwaysRun = true) 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 > 50) + @Override + public void run() + { + String ln = null; + int count = 0; + try + { + while ((ln = worker.getOutputReader().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(); @@ -308,9 +339,9 @@ public class CommandLineOperations { return new Object[][] { // headless mode input operations - { "CMD [-color zappo] executed successfully!", - "Failed command : -color zappo" }, - { "CMD [-props test/jalview/io/testProps.jvprops] executed successfully!", + { "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!", "Failed command : -sortbytree" }, @@ -341,30 +372,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 }, @@ -388,6 +421,8 @@ public class CommandLineOperations TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -jalview", workingDir + "test_uniref50_out.jvp", true, MINFILESIZE_SMALL, - TEST_TIMEOUT }, }; + TEST_TIMEOUT }, + // + }; } }