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;
}
// Note longer timeout needed on full test run than on individual tests
- private static final int TEST_TIMEOUT = 13000;
+ private static final int TEST_TIMEOUT = 15000;
private static final int SETUP_TIMEOUT = 9500;
}
}
- @BeforeTest(alwaysRun = true)
+ @BeforeClass(alwaysRun = true)
public void initialize()
{
new CommandLineOperations();
}
- @BeforeTest(alwaysRun = true)
+ @BeforeClass(alwaysRun = true)
public void setUpForHeadlessCommandLineInputOperations()
throws IOException
{
- String cmds = "nodisplay -open examples/uniref50.fa -sortbytree --props=test/jalview/bin/testProps.jvprops -colour zappo "
+ String cmds = "nodisplay -open examples/uniref50.fa -sortbytree -props test/jalview/bin/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 = getJalviewDesktopRunner(true, cmds, SETUP_TIMEOUT);
String ln = null;
while ((ln = worker.getOutputReader().readLine()) != null)
{
- System.out.println(ln);
+ System.out.println("STDOUT: " + ln);
successfulCMDs.add(ln);
}
while ((ln = worker.getErrorReader().readLine()) != null)
{
- System.err.println(ln);
+ System.err.println("STDERR: " + ln);
+ successfulCMDs.add(ln);
}
}
- @BeforeTest(alwaysRun = true)
+ @BeforeClass(alwaysRun = true)
public void setUpForCommandLineInputOperations() throws IOException
{
String cmds = "-open examples/uniref50.fa -noquestionnaire -nousagestats";
// number of lines expected on STDERR when Jalview starts up normally
// may need to adjust this if Jalview is excessively noisy ?
+ final int STDOUT_SETUPLINES = 50;
final int STDERR_SETUPLINES = 50;
// thread monitors stderr - bails after SETUP_TIMEOUT or when
public void run()
{
String ln = null;
- int count = 0;
+ int stdoutcount = 0;
+ int stderrcount = 0;
try
{
- while ((ln = worker.getErrorReader().readLine()) != null)
+ while ((ln = worker.getOutputReader().readLine()) != null)
{
System.out.println(ln);
successfulCMDs.add(ln);
- if (++count > STDERR_SETUPLINES)
+ if (++stdoutcount > STDOUT_SETUPLINES)
+ {
+ break;
+ }
+ }
+ while ((ln = worker.getErrorReader().readLine()) != null)
+ {
+ System.err.println(ln);
+ successfulCMDs.add(ln);
+ if (++stderrcount > STDERR_SETUPLINES)
{
break;
}
return new Object[][] {
// headless mode input operations
{ "CMD [-colour zappo] executed successfully!",
- "Failed command : -color zappo" },
+ "Failed command : -colour zappo" },
{ "CMD [-props test/jalview/bin/testProps.jvprops] executed successfully!",
- "Failed command : --props=File" },
+ "Failed command : -props File" },
{ "CMD [-sortbytree] executed successfully!",
"Failed command : -sortbytree" },
{ "CMD [-jabaws http://www.compbio.dundee.ac.uk/jabaws] executed successfully!",
// 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 },
+ 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",
workingDir + "test_uniref50_out.eps", false, MINFILESIZE_BIG,
TEST_TIMEOUT },
TEST_TIMEOUT },
{ "headless -open examples/uniref50.fa", " -jalview",
workingDir + "test_uniref50_out.jvp", true, MINFILESIZE_SMALL,
- TEST_TIMEOUT }, };
+ TEST_TIMEOUT },
+ //
+ };
}
}