X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fbin%2FCommandLineOperations.java;fp=test%2Fjalview%2Fbin%2FCommandLineOperations.java;h=2d8ebce36636efca3ee0d9a1029d9b2881a1b952;hb=9c98d4bd666346f6ad3892c5394b7da3be82d93e;hp=ee03e7755a0df6445f864a12052c1249247099b3;hpb=c7b2143c9cf7c5e05ad63251f7d3910751b16d20;p=jalview.git diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java index ee03e77..2d8ebce 100644 --- a/test/jalview/bin/CommandLineOperations.java +++ b/test/jalview/bin/CommandLineOperations.java @@ -55,9 +55,9 @@ public class CommandLineOperations } private static final int TEST_TIMEOUT = 12500; // Note longer timeout needed - // on - // full test run than on - // individual tests + // on + // full test run than on + // individual tests private static final int SETUP_TIMEOUT = 9000; @@ -167,8 +167,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 "; @@ -248,12 +248,11 @@ public class CommandLineOperations 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 STDERR_SETUPLINES = 30; + // thread monitors stderr - bails after SETUP_TIMEOUT or when // STDERR_SETUPLINES have been read Thread runner = new Thread(new Runnable() @@ -380,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 },