X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fbin%2FCommandLineOperations.java;h=a539f78cdf891448a2687ba58f6c99ce7752e450;hb=f2bb3db094696bb382ecb8d08913c1b5dc293b53;hp=b81facf6964111ef0ef18bba8b7a7a743d049de6;hpb=d3546f175bfbb5d16ed7942bf8e602e8ba53c5b5;p=jalview.git diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java index b81facf..a539f78 100644 --- a/test/jalview/bin/CommandLineOperations.java +++ b/test/jalview/bin/CommandLineOperations.java @@ -20,12 +20,17 @@ */ 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; import java.io.InputStreamReader; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import org.testng.Assert; @@ -36,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 @@ -48,7 +54,8 @@ public class CommandLineOperations JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); } - private static final int TEST_TIMEOUT = 4500; // Note longer timeout needed on + private static final int TEST_TIMEOUT = 10500; // Note longer timeout needed + // on // full test run than on // individual tests @@ -120,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) @@ -127,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) { @@ -140,21 +159,25 @@ public class CommandLineOperations } return classpath; } - private Worker jalviewDesktopRunner(boolean withAwt, String cmd, + + private Worker getJalviewDesktopRunner(boolean withAwt, String cmd, int timeout) { // 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 { ls2_proc = Runtime.getRuntime().exec(_cmd + cmd); - } catch (IOException e1) + } catch (Throwable e1) { e1.printStackTrace(); } @@ -171,7 +194,7 @@ public class CommandLineOperations worker.join(timeout); } catch (InterruptedException e) { - // e.printStackTrace(); + System.err.println("Thread interrupted"); } worker.setOutputReader(outputReader); worker.setErrorReader(errorReader); @@ -179,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() { @@ -189,30 +226,34 @@ public class CommandLineOperations public void setUpForHeadlessCommandLineInputOperations() throws IOException { - String cmds = "nodisplay -open examples/uniref50.fa -sortbytree -props FILE -colour zappo " - + "-jabaws http://www.compbio.dundee.ac.uk/jabaws -nosortbytree -dasserver nickname=www.test.com " + String cmds = "nodisplay -open examples/uniref50.fa -sortbytree -props test/jalview/io/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 = jalviewDesktopRunner(true, cmds, SETUP_TIMEOUT); + Worker worker = getJalviewDesktopRunner(true, cmds, SETUP_TIMEOUT); String ln = null; while ((ln = worker.getOutputReader().readLine()) != null) { System.out.println(ln); successfulCMDs.add(ln); } + while ((ln = worker.getErrorReader().readLine()) != null) + { + System.err.println(ln); + } } @BeforeTest(alwaysRun = true) public void setUpForCommandLineInputOperations() throws IOException { String cmds = "-open examples/uniref50.fa -noquestionnaire -nousagestats"; - Worker worker = jalviewDesktopRunner(false, cmds, SETUP_TIMEOUT); + Worker worker = getJalviewDesktopRunner(false, cmds, SETUP_TIMEOUT); String ln = null; int count = 0; while ((ln = worker.getErrorReader().readLine()) != null) { System.out.println(ln); successfulCMDs.add(ln); - if (++count > 5) + if (++count > 25) { break; } @@ -225,7 +266,7 @@ public class CommandLineOperations } } - @Test(groups = { "Functional" }, dataProvider = "allInputOpearationsData") + @Test(groups = { "Functional" }, dataProvider = "allInputOperationsData") public void testAllInputOperations(String expectedString, String failureMsg) { @@ -233,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, @@ -242,97 +284,110 @@ public class CommandLineOperations String cmd = harg + type + " " + fileName; // System.out.println(">>>>>>>>>>>>>>>> Command : " + cmd); File file = new File(fileName); - Worker worker = jalviewDesktopRunner(withAWT, cmd, timeout); - - FileAssert.assertFile(file, "Didn't create an output" + type - + " file.[" + harg + "]"); - FileAssert.assertMinLength(new File(fileName), expectedMinFileSize); + file.deleteOnExit(); + Worker worker = getJalviewDesktopRunner(withAWT, cmd, timeout); + assertNotNull(worker, "worker is null"); + String msg = "Didn't create an output" + type + " file.[" + harg + "]"; + assertTrue(file.exists(), msg); + FileAssert.assertFile(file, msg); + FileAssert.assertMinLength(file, expectedMinFileSize); if (worker != null && worker.exit == null) { 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 + "]"); } - new File(fileName).delete(); + file.delete(); } - @DataProvider(name = "allInputOpearationsData") + @DataProvider(name = "allInputOperationsData") public Object[][] getHeadlessModeInputParams() { return new Object[][] { // headless mode input operations { "CMD [-color zappo] executed successfully!", "Failed command : -color zappo" }, - { "CMD [-props FILE] executed successfully!", + { "CMD [-props test/jalview/io/testProps.jvprops] executed successfully!", "Failed command : -props File" }, { "CMD [-sortbytree] executed successfully!", "Failed command : -sortbytree" }, - { - "CMD [-jabaws http://www.compbio.dundee.ac.uk/jabaws] executed successfully!", + { "CMD [-jabaws http://www.compbio.dundee.ac.uk/jabaws] executed successfully!", "Failed command : -jabaws http://www.compbio.dundee.ac.uk/jabaws" }, { "CMD [-open examples/uniref50.fa] executed successfully!", "Failed command : -open examples/uniref50.fa" }, { "CMD [-nosortbytree] executed successfully!", "Failed command : -nosortbytree" }, - { "CMD [-dasserver nickname=www.test.com] executed successfully!", - "Failed command : -dasserver nickname=www.test.com" }, - { - "CMD [-features examples/testdata/plantfdx.features] executed successfully!", + { "CMD [-features examples/testdata/plantfdx.features] executed successfully!", "Failed command : -features examples/testdata/plantfdx.features" }, - { - "CMD [-annotations examples/testdata/plantfdx.annotations] executed successfully!", + { "CMD [-annotations examples/testdata/plantfdx.annotations] executed successfully!", "Failed command : -annotations examples/testdata/plantfdx.annotations" }, - { - "CMD [-tree examples/testdata/uniref50_test_tree] executed successfully!", + { "CMD [-tree examples/testdata/uniref50_test_tree] executed successfully!", "Failed command : -tree examples/testdata/uniref50_test_tree" }, // non headless mode input operations { "CMD [-nousagestats] executed successfully!", "Failed command : -nousagestats" }, { "CMD [-noquestionnaire] executed successfully!", - "Failed command : -noquestionnaire nickname=www.test.com" } }; - + "Failed command : -noquestionnaire" } }; } @DataProvider(name = "headlessModeOutputOperationsData") public static Object[][] getHeadlessModeOutputParams() { - return new Object[][] { - { "nodisplay -open examples/uniref50.fa", " -eps", - "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_uniref50_out.eps", false, MINFILESIZE_BIG, TEST_TIMEOUT }, + workingDir + "test_uniref50_out.eps", false, + MINFILESIZE_BIG, TEST_TIMEOUT }, { "nogui -open examples/uniref50.fa", " -eps", - "test_uniref50_out.eps", true, MINFILESIZE_BIG, TEST_TIMEOUT }, + workingDir + "test_uniref50_out.eps", true, MINFILESIZE_BIG, + TEST_TIMEOUT }, { "nogui -open examples/uniref50.fa", " -eps", - "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", - "test_uniref50_out.eps", true, MINFILESIZE_BIG, TEST_TIMEOUT }, + workingDir + "test_uniref50_out.eps", true, MINFILESIZE_BIG, + TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -svg", - "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", - "test_uniref50_out.png", true, MINFILESIZE_BIG, TEST_TIMEOUT }, + workingDir + "test_uniref50_out.png", true, MINFILESIZE_BIG, + TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -html", - "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", - "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_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_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_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_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_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_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_uniref50_out.jvp", true, MINFILESIZE_SMALL, TEST_TIMEOUT }, }; + workingDir + "test_uniref50_out.jvp", true, MINFILESIZE_SMALL, + TEST_TIMEOUT }, }; } }