X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fbin%2FCommandLineOperations.java;h=e104e21470a45501c142d0f83a12379be3fd473c;hb=3ccad94a2e470ed7b75890ee1957a8f3c3760f37;hp=2163a7a9ddc0e344b9378d55b926c0ae2c4fcc3f;hpb=b242acfd02dab9c625454c91c6cb1ac71a4bfe9f;p=jalview.git diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java index 2163a7a..e104e21 100644 --- a/test/jalview/bin/CommandLineOperations.java +++ b/test/jalview/bin/CommandLineOperations.java @@ -20,6 +20,11 @@ */ 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; @@ -28,13 +33,28 @@ 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.ScanResult; + +@Test(singleThreaded = true) public class CommandLineOperations { - private static final int TEST_TIMEOUT = 4000; + + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + + private static final int TEST_TIMEOUT = 9000; // Note longer timeout needed on + // full test run than on + // individual tests private static final int SETUP_TIMEOUT = 9000; @@ -42,7 +62,7 @@ public class CommandLineOperations private static final int MINFILESIZE_BIG = 4096; - private ArrayList successfulCMDs = new ArrayList(); + private ArrayList successfulCMDs = new ArrayList<>(); /*** * from @@ -100,19 +120,46 @@ public class CommandLineOperations } } - private Worker jalviewDesktopRunner(boolean withAwt, String cmd, + private static ClassGraph scanner = null; + + private static String classpath = null; + + public synchronized static String getClassPath() + { + if (scanner == null) + { + scanner = new ClassGraph(); + ScanResult scan = scanner.scan(); + classpath = scan.getClasspath(); + } + while (classpath == null) + { + try + { + Thread.sleep(10); + } catch (InterruptedException x) + { + + } + } + return classpath; + } + + 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 " + (withAwt ? "-Djava.awt.headless=true" : "") - + " -Djava.ext.dirs=./lib -classpath ./classes jalview.bin.Jalview "; - System.out.println("CMD [" + cmd + "]"); + + " -classpath " + classpath + " 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(); } @@ -123,16 +170,18 @@ public class CommandLineOperations BufferedReader errorReader = new BufferedReader( new InputStreamReader(ls2_proc.getErrorStream())); worker = new Worker(ls2_proc); + worker.setOutputReader(outputReader); + worker.setErrorReader(errorReader); worker.start(); try { + worker.join(timeout); + } catch (InterruptedException e) { - // e.printStackTrace(); + System.err.println("Thread interrupted"); } - worker.setOutputReader(outputReader); - worker.setErrorReader(errorReader); } return worker; } @@ -147,29 +196,52 @@ 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); + System.out.println("CommandLine test " + ++ntest); + Worker worker = getJalviewDesktopRunner(true, cmds, SETUP_TIMEOUT); String ln = null; while ((ln = worker.getOutputReader().readLine()) != null) { System.out.println(ln); successfulCMDs.add(ln); + if (ln.equals(Jalview.TERMINATOR_LINE)) + { + break; + } + } + if (worker != null && worker.exit == null) + { + worker.interrupt(); + Thread.currentThread().interrupt(); + worker.process.destroy(); } + // while ((ln = worker.getErrorReader().readLine()) != null) + // { + // System.err.println(ln); + // } + } + int ntest = 0; + @BeforeTest(alwaysRun = true) - public void setUpForCommandLineInputOperations() throws IOException + public void setUpForNonHeadlessInputOperations() 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 (ln.equals(Jalview.TERMINATOR_LINE)) + { + break; + } + if (++count > 5) { break; @@ -183,7 +255,7 @@ public class CommandLineOperations } } - @Test(groups = { "Functional" }, dataProvider = "allInputOpearationsData") + @Test(groups = { "Functional" }, dataProvider = "allInputOperationsData") public void testAllInputOperations(String expectedString, String failureMsg) { @@ -191,106 +263,131 @@ public class CommandLineOperations } @Test( - groups = { "Functional" }, + groups = + { "Functional" }, dataProvider = "headlessModeOutputOperationsData") public void testHeadlessModeOutputOperations(String harg, String type, String fileName, boolean withAWT, int expectedMinFileSize, - int timeout) + int timeout) throws IOException { - String cmd = harg + type + " " + fileName; - // System.out.println(">>>>>>>>>>>>>>>> Command : " + cmd); File file = new File(fileName); - Worker worker = jalviewDesktopRunner(withAWT, cmd, timeout); + String cmd = harg + type + " " + + file.getAbsolutePath().replace('\\', '/'); + System.out.println(">>>>>>>>>>>>>>>> Command : " + cmd); - 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: " + + file.getAbsolutePath() + " [" + harg + "]"; + while (worker.isAlive()) + { + } + while (worker.getOutputReader().ready()) + { + String ln = worker.getOutputReader().readLine(); + System.out.println(ln); + } + 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 - + " generation (try running test again to verify - timeout at " - + SETUP_TIMEOUT + "ms). [" - + harg + "]"); + // Assert.fail("Jalview did not exit after " + // + type + // + " generation (try running test again to verify - timeout at " + // + SETUP_TIMEOUT + "ms). [" + // + harg + "]"); } - new File(fileName).delete(); + file.delete(); } - @DataProvider(name = "allInputOpearationsData") - public Object[][] getHeadlessModeInputParams() + @DataProvider(name = "allInputOperationsData") + public Object[][] getAllInputParams() { 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[][] { + // works { "nodisplay -open examples/uniref50.fa", " -eps", - "test_uniref50_out.eps", true, MINFILESIZE_BIG, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.eps", true, MINFILESIZE_BIG, + TEST_TIMEOUT }, { "nodisplay -open examples/uniref50.fa", " -eps", - "test_uniref50_out.eps", false, MINFILESIZE_BIG, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.eps", false, + MINFILESIZE_BIG, TEST_TIMEOUT }, { "nogui -open examples/uniref50.fa", " -eps", - "test_uniref50_out.eps", true, MINFILESIZE_BIG, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.eps", true, MINFILESIZE_BIG, + TEST_TIMEOUT }, { "nogui -open examples/uniref50.fa", " -eps", - "test_uniref50_out.eps", false, MINFILESIZE_BIG, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.eps", false, + MINFILESIZE_BIG, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -eps", - "test_uniref50_out.eps", true, MINFILESIZE_BIG, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.eps", true, MINFILESIZE_BIG, + TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -svg", - "test_uniref50_out.svg", false, MINFILESIZE_BIG, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.svg", false, + MINFILESIZE_BIG, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -png", - "test_uniref50_out.png", true, MINFILESIZE_BIG, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.png", true, MINFILESIZE_BIG, + TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -html", - "test_uniref50_out.html", true, MINFILESIZE_BIG, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.html", true, + MINFILESIZE_BIG, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -fasta", - "test_uniref50_out.mfa", true, MINFILESIZE_SMALL, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.mfa", true, + MINFILESIZE_SMALL, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -clustal", - "test_uniref50_out.aln", true, MINFILESIZE_SMALL, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.aln", true, + MINFILESIZE_SMALL, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -msf", - "test_uniref50_out.msf", true, MINFILESIZE_SMALL, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.msf", true, + MINFILESIZE_SMALL, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -pileup", - "test_uniref50_out.aln", true, MINFILESIZE_SMALL, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.aln", true, + MINFILESIZE_SMALL, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -pir", - "test_uniref50_out.pir", true, MINFILESIZE_SMALL, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.pir", true, + MINFILESIZE_SMALL, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -pfam", - "test_uniref50_out.pfam", true, MINFILESIZE_SMALL, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.pfam", true, + MINFILESIZE_SMALL, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -blc", - "test_uniref50_out.blc", true, MINFILESIZE_SMALL, TEST_TIMEOUT }, + "test/jalview/bin/test_uniref50_out.blc", true, + MINFILESIZE_SMALL, TEST_TIMEOUT }, { "headless -open examples/uniref50.fa", " -jalview", - "test_uniref50_out.jvp", true, MINFILESIZE_SMALL, TEST_TIMEOUT }, }; + "test/jalview/bin/test_uniref50_out.jvp", true, + MINFILESIZE_SMALL, TEST_TIMEOUT }, + }; } }