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;
import io.github.classgraph.ClassGraph;
import io.github.classgraph.ModuleRef;
import io.github.classgraph.ScanResult;
+import jalview.gui.JvOptionPane;
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
+ 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;
// 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 ";
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()
{
+ @Override
public void run()
{
String ln = null;
" -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 },