X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fbin%2FCommandLineOperations.java;fp=test%2Fjalview%2Fbin%2FCommandLineOperations.java;h=9d8a99329a5a9219eb0cb2f9399887a549262ffe;hb=8946f41687f4c822ac8d15ee8551f23f156735c4;hp=c7b1d53c9c5225939abfcba19d738c5281a33dcf;hpb=f27f7be4c32780de615e2678f11a5e80702c5e25;p=jalview.git diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java index c7b1d53..9d8a993 100644 --- a/test/jalview/bin/CommandLineOperations.java +++ b/test/jalview/bin/CommandLineOperations.java @@ -29,6 +29,8 @@ import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import org.testng.Assert; @@ -39,6 +41,7 @@ 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; public class CommandLineOperations @@ -51,7 +54,8 @@ public class CommandLineOperations JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); } - private static final int TEST_TIMEOUT = 9000; // Note longer timeout needed on + private static final int TEST_TIMEOUT = 9000; // Note longer timeout needed + // on // full test run than on // individual tests @@ -123,6 +127,10 @@ public class CommandLineOperations private static String classpath = null; + private static String modules = null; + + private static String java_exe = null; + public synchronized static String getClassPath() { if (scanner == null) @@ -130,6 +138,14 @@ public class CommandLineOperations scanner = new ClassGraph(); ScanResult scan = scanner.scan(); classpath = scan.getClasspath(); + modules = ""; + for (ModuleRef mr : scan.getModules()) + { + modules.concat(mr.getName()); + } + java_exe = System.getProperty("java.home") + File.separator + "bin" + + File.separator + "java"; + } while (classpath == null) { @@ -150,9 +166,12 @@ 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 " + String _cmd = java_exe + " " + (withAwt ? "-Djava.awt.headless=true" : "") - + " -classpath " + classpath + " jalview.bin.Jalview "; + + " -classpath " + classpath + + (modules.length() > 2 ? "--add-modules=\"" + modules + "\"" + : "") + + " jalview.bin.Jalview "; Process ls2_proc = null; Worker worker = null; try @@ -183,6 +202,20 @@ public class CommandLineOperations return worker; } + @Test(groups = { "Functional" }) + public void reportCurrentWorkingDirectory() + { + try + { + Path currentRelativePath = Paths.get(""); + String s = currentRelativePath.toAbsolutePath().toString(); + System.out.println("Test CWD is " + s); + } catch (Exception q) + { + q.printStackTrace(); + } + } + @BeforeTest(alwaysRun = true) public void initialize() { @@ -241,7 +274,8 @@ public class CommandLineOperations } @Test( - groups = { "Functional" }, + groups = + { "Functional", "testben" }, dataProvider = "headlessModeOutputOperationsData") public void testHeadlessModeOutputOperations(String harg, String type, String fileName, boolean withAWT, int expectedMinFileSize, @@ -262,11 +296,9 @@ public class CommandLineOperations worker.interrupt(); Thread.currentThread().interrupt(); worker.process.destroy(); - Assert.fail("Jalview did not exit after " - + type + Assert.fail("Jalview did not exit after " + type + " generation (try running test again to verify - timeout at " - + SETUP_TIMEOUT + "ms). [" - + harg + "]"); + + timeout + "ms). [" + harg + "]"); } file.delete(); } @@ -304,54 +336,58 @@ public class CommandLineOperations @DataProvider(name = "headlessModeOutputOperationsData") public static Object[][] getHeadlessModeOutputParams() { - return new Object[][] { - { "nodisplay -open examples/uniref50.fa", " -eps", - "test/jalview/bin/test_uniref50_out.eps", true, MINFILESIZE_BIG, - TEST_TIMEOUT }, + // JBPNote: I'm not clear why need to specify full path for output file + // when running tests on build server, but we will keep this patch for now + // 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 }, { "nodisplay -open examples/uniref50.fa", " -eps", - "test/jalview/bin/test_uniref50_out.eps", false, + workingDir + "test_uniref50_out.eps", false, MINFILESIZE_BIG, TEST_TIMEOUT }, { "nogui -open examples/uniref50.fa", " -eps", - "test/jalview/bin/test_uniref50_out.eps", true, MINFILESIZE_BIG, + workingDir + "test_uniref50_out.eps", true, MINFILESIZE_BIG, TEST_TIMEOUT }, { "nogui -open examples/uniref50.fa", " -eps", - "test/jalview/bin/test_uniref50_out.eps", false, + workingDir + "test_uniref50_out.eps", false, MINFILESIZE_BIG, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -eps", - "test/jalview/bin/test_uniref50_out.eps", true, MINFILESIZE_BIG, + workingDir + "test_uniref50_out.eps", true, MINFILESIZE_BIG, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -svg", - "test/jalview/bin/test_uniref50_out.svg", false, + workingDir + "test_uniref50_out.svg", false, MINFILESIZE_BIG, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -png", - "test/jalview/bin/test_uniref50_out.png", true, MINFILESIZE_BIG, + workingDir + "test_uniref50_out.png", true, MINFILESIZE_BIG, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -html", - "test/jalview/bin/test_uniref50_out.html", true, + workingDir + "test_uniref50_out.html", true, MINFILESIZE_BIG, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -fasta", - "test/jalview/bin/test_uniref50_out.mfa", true, - MINFILESIZE_SMALL, TEST_TIMEOUT }, + workingDir + "test_uniref50_out.mfa", true, MINFILESIZE_SMALL, + TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -clustal", - "test/jalview/bin/test_uniref50_out.aln", true, - MINFILESIZE_SMALL, TEST_TIMEOUT }, + workingDir + "test_uniref50_out.aln", true, MINFILESIZE_SMALL, + TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -msf", - "test/jalview/bin/test_uniref50_out.msf", true, - MINFILESIZE_SMALL, TEST_TIMEOUT }, + workingDir + "test_uniref50_out.msf", true, MINFILESIZE_SMALL, + TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -pileup", - "test/jalview/bin/test_uniref50_out.aln", true, - MINFILESIZE_SMALL, TEST_TIMEOUT }, + workingDir + "test_uniref50_out.aln", true, MINFILESIZE_SMALL, + TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -pir", - "test/jalview/bin/test_uniref50_out.pir", true, - MINFILESIZE_SMALL, TEST_TIMEOUT }, + workingDir + "test_uniref50_out.pir", true, MINFILESIZE_SMALL, + TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -pfam", - "test/jalview/bin/test_uniref50_out.pfam", true, - MINFILESIZE_SMALL, TEST_TIMEOUT }, + workingDir + "test_uniref50_out.pfam", true, MINFILESIZE_SMALL, + TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -blc", - "test/jalview/bin/test_uniref50_out.blc", true, - MINFILESIZE_SMALL, TEST_TIMEOUT }, + workingDir + "test_uniref50_out.blc", true, MINFILESIZE_SMALL, + TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -jalview", - "test/jalview/bin/test_uniref50_out.jvp", true, - MINFILESIZE_SMALL, TEST_TIMEOUT }, }; + workingDir + "test_uniref50_out.jvp", true, MINFILESIZE_SMALL, + TEST_TIMEOUT }, }; } }