X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fbin%2FCommandLineOperations.java;h=564e57d0112aebda9367834d101918211ccb71cf;hb=a3d82d30b2bc55f250bbf1c94975308407e8aae7;hp=e878e2574179555c0c6237bd9b75a8e30b5f7f12;hpb=123dfa2839bd9786e205a4764f0f5dea69b77eb1;p=jalview.git diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java index e878e25..564e57d 100644 --- a/test/jalview/bin/CommandLineOperations.java +++ b/test/jalview/bin/CommandLineOperations.java @@ -196,6 +196,7 @@ public class CommandLineOperations 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"; + System.out.println("CommandLine test " + ++ntest); Worker worker = getJalviewDesktopRunner(true, cmds, SETUP_TIMEOUT); String ln = null; while ((ln = worker.getOutputReader().readLine()) != null) @@ -207,8 +208,11 @@ public class CommandLineOperations { System.err.println(ln); } + } + int ntest = 0; + @BeforeTest(alwaysRun = true) public void setUpForCommandLineInputOperations() throws IOException { @@ -247,9 +251,12 @@ public class CommandLineOperations String fileName, boolean withAWT, int expectedMinFileSize, int timeout) { - String cmd = harg + type + " " + fileName; - // System.out.println(">>>>>>>>>>>>>>>> Command : " + cmd); File file = new File(fileName); + String cmd = harg + type + " " + + file.getAbsolutePath().replace('\\', '/'); + System.out.println(">>>>>>>>>>>>>>>> Command : " + cmd); + + file.deleteOnExit(); Worker worker = getJalviewDesktopRunner(withAWT, cmd, timeout); assertNotNull(worker, "worker is null"); String msg = "Didn't create an output" + type + " file.[" + harg + "]";