/*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
private static class Worker extends Thread
{
private final Process process;
+
private BufferedReader outputReader;
+
private BufferedReader errorReader;
+
private Integer exit;
private Worker(Process process)
{
BufferedReader outputReader = new BufferedReader(
new InputStreamReader(ls2_proc.getInputStream()));
-
BufferedReader errorReader = new BufferedReader(
new InputStreamReader(ls2_proc.getErrorStream()));
worker = new Worker(ls2_proc);
return worker;
}
- @BeforeTest
+ @BeforeTest(alwaysRun = true)
public void initialize()
{
new CommandLineOperations();
}
-
- @BeforeTest
+ @BeforeTest(alwaysRun = true)
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 "
- + "-features examples/uniref50_test_features -annotations examples/uniref50_test_annot -tree examples/uniref50_test_tree";
+ + "-features examples/testdata/plantfdx.features -annotations examples/testdata/plantfdx.annotations -tree examples/testdata/uniref50_test_tree";
Worker worker = jalviewDesktopRunner(true, cmds, 9000);
String ln = null;
while ((ln = worker.getOutputReader().readLine()) != null)
}
}
- @BeforeTest
+ @BeforeTest(alwaysRun = true)
public void setUpForCommandLineInputOperations() throws IOException
{
String cmds = "-open examples/uniref50.fa -noquestionnaire -nousagestats";
}
}
- @Test(groups =
- { "Functional" }, dataProvider = "allInputOpearationsData")
+ @Test(groups = { "Functional" }, dataProvider = "allInputOpearationsData")
public void testAllInputOperations(String expectedString,
String failureMsg)
{
Assert.assertTrue(successfulCMDs.contains(expectedString), failureMsg);
}
- @Test(groups =
- { "Functional" }, dataProvider = "headlessModeOutputOperationsData")
+ @Test(
+ groups = { "Functional" },
+ dataProvider = "headlessModeOutputOperationsData")
public void testHeadlessModeOutputOperations(String harg, String type,
String fileName, boolean withAWT, int expectedMinFileSize,
int timeout)
new File(fileName).delete();
}
-
@DataProvider(name = "allInputOpearationsData")
public Object[][] getHeadlessModeInputParams()
{
- return new Object[][]
- {
+ return new Object[][] {
// headless mode input operations
{ "CMD [-color zappo] executed successfully!",
"Failed command : -color zappo" },
{ "CMD [-dasserver nickname=www.test.com] executed successfully!",
"Failed command : -dasserver nickname=www.test.com" },
{
- "CMD [-features examples/uniref50_test_features] executed successfully!",
- "Failed command : -features examples/uniref50_test_features" },
+ "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" },
{
- "CMD [-annotations examples/uniref50_test_annot] executed successfully!",
- "Failed command : -annotations examples/uniref50_test_annot" },
- { "CMD [-tree examples/uniref50_test_tree] executed successfully!",
- "Failed command : -tree examples/uniref50_test_tree" },
+ "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 nickname=www.test.com" } };
}
-
+
@DataProvider(name = "headlessModeOutputOperationsData")
public static Object[][] getHeadlessModeOutputParams()
{
- return new Object[][]
- {
+ return new Object[][] {
{ "nodisplay -open examples/uniref50.fa", " -eps",
"test_uniref50_out.eps", true, 4096, 4000 },
{ "nodisplay -open examples/uniref50.fa", " -eps",
{ "headless -open examples/uniref50.fa", " -blc",
"test_uniref50_out.blc", true, 2096, 3000 },
{ "headless -open examples/uniref50.fa", " -jalview",
- "test_uniref50_out.jvp", true, 2096, 3000 },
- };
+ "test_uniref50_out.jvp", true, 2096, 3000 }, };
}
}