*/
package jalview.bin;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
import jalview.gui.JvOptionPane;
import java.io.BufferedReader;
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
try
{
ls2_proc = Runtime.getRuntime().exec(_cmd + cmd);
- } catch (IOException e1)
+ } catch (Throwable e1)
{
e1.printStackTrace();
}
worker.join(timeout);
} catch (InterruptedException e)
{
- // e.printStackTrace();
+ System.err.println("Thread interrupted");
}
worker.setOutputReader(outputReader);
worker.setErrorReader(errorReader);
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)
}
}
- @Test(groups = { "Functional" }, dataProvider = "allInputOpearationsData")
+ @Test(groups = { "Functional" }, dataProvider = "allInputOperationsData")
public void testAllInputOperations(String expectedString,
String failureMsg)
{
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 + "]");
- // System.out.println( "File '" + file.getName() + "' has size " +
- // file.length());
- // 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)
{
+ " generation (try running test again to verify - timeout at "
+ 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" },
"Failed command : -open examples/uniref50.fa" },
{ "CMD [-nosortbytree] executed successfully!",
"Failed command : -nosortbytree" },
- {
- "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!",
"Failed command : -annotations examples/testdata/plantfdx.annotations" },
"Failed command : -nousagestats" },
{ "CMD [-noquestionnaire] executed successfully!",
"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 },
+ return new Object[][] { { "nodisplay -open examples/uniref50.fa",
+ " -eps", "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 },