git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-4290 fixed tests
[jalview.git]
/
test
/
jalview
/
bin
/
CommandsTest.java
diff --git
a/test/jalview/bin/CommandsTest.java
b/test/jalview/bin/CommandsTest.java
index
80354f9
..
c34a7fa
100644
(file)
--- a/
test/jalview/bin/CommandsTest.java
+++ b/
test/jalview/bin/CommandsTest.java
@@
-185,10
+185,10
@@
public class CommandsTest
throws IOException
{
cleanupFiles(filenames);
throws IOException
{
cleanupFiles(filenames);
- String[] args = (cmdLine + "").split("\\s+");
+ String[] args = (cmdLine).split("\\s+");
try
{
try
{
- callJalviewMain(args);
+ callJalviewMain(args, true);
Commands cmds = Jalview.getInstance().getCommands();
Assert.assertNotNull(cmds);
verifyIncreasingSize(cmdLine, filenames);
Commands cmds = Jalview.getInstance().getCommands();
Assert.assertNotNull(cmds);
verifyIncreasingSize(cmdLine, filenames);
@@
-454,56
+454,60
@@
public class CommandsTest
return new Object[][] {
//
/*
return new Object[][] {
//
/*
+ */
{ "--gui --nonews --nosplash --open=./examples/test_fab41.result/sample.a2m "
+ "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
{ "--gui --nonews --nosplash --open=./examples/test_fab41.result/sample.a2m "
+ "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
- + "--structureimage=" + testfiles + "/structureimage1.png "
+ + "--structureimage=" + testfiles
+ + "/structureimage0-1.png "
+ "--open=./examples/test_fab41.result/sample.a2m "
+ "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ "--structureimage=" + testfiles
+ "--open=./examples/test_fab41.result/sample.a2m "
+ "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ "--structureimage=" + testfiles
- + "/structureimage2.png --scale=1.5 "
+ + "/structureimage0-2.png --scale=1.5 "
+ "--open=./examples/test_fab41.result/sample.a2m "
+ "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ "--structureimage=" + testfiles
+ "--open=./examples/test_fab41.result/sample.a2m "
+ "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ "--structureimage=" + testfiles
- + "/structureimage3.png --scale=2.0 ",
+ + "/structureimage0-3.png --scale=2.0 ",
new String[]
new String[]
- { testfiles + "/structureimage1.png",
- testfiles + "/structureimage2.png",
- testfiles + "/structureimage3.png" } },
+ { testfiles + "/structureimage0-1.png",
+ testfiles + "/structureimage0-2.png",
+ testfiles + "/structureimage0-3.png" } },
{ "--headless --noquit --open=./examples/test_fab41.result/sample.a2m "
+ "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
{ "--headless --noquit --open=./examples/test_fab41.result/sample.a2m "
+ "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
- + "--structureimage=" + testfiles + "/structureimage1.png "
+ + "--structureimage=" + testfiles
+ + "/structureimage1-1.png "
+ "--open=./examples/test_fab41.result/sample.a2m "
+ "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ "--structureimage=" + testfiles
+ "--open=./examples/test_fab41.result/sample.a2m "
+ "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ "--structureimage=" + testfiles
- + "/structureimage2.png --scale=1.5 "
+ + "/structureimage1-2.png --scale=1.5 "
+ "--open=./examples/test_fab41.result/sample.a2m "
+ "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ "--structureimage=" + testfiles
+ "--open=./examples/test_fab41.result/sample.a2m "
+ "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
+ "--structureimage=" + testfiles
- + "/structureimage3.png --scale=2.0 ",
+ + "/structureimage1-3.png --scale=2.0 ",
new String[]
new String[]
- { testfiles + "/structureimage1.png",
- testfiles + "/structureimage2.png",
- testfiles + "/structureimage3.png" } },
- */
+ { testfiles + "/structureimage1-1.png",
+ testfiles + "/structureimage1-2.png",
+ testfiles + "/structureimage1-3.png" } },
{ "--gui --nonews --nosplash --open examples/1gaq.txt --append ./examples/3W5V.pdb "
+ "--structure examples/1gaq.txt --seqid \"1GAQ|A\" "
+ "--structureimage " + testfiles
{ "--gui --nonews --nosplash --open examples/1gaq.txt --append ./examples/3W5V.pdb "
+ "--structure examples/1gaq.txt --seqid \"1GAQ|A\" "
+ "--structureimage " + testfiles
- + "/1gaq.png --structure examples/3W5V.pdb "
+ + "/structureimage2-1gaq.png --structure examples/3W5V.pdb "
+ "--seqid \"3W5V|A\" --structureimage " + testfiles
+ "--seqid \"3W5V|A\" --structureimage " + testfiles
- + "/3w5v.png --overwrite",
+ + "/structureimage2-3w5v.png --overwrite",
new String[]
new String[]
- { testfiles + "/1gaq.png", testfiles + "/3w5v.png" } },
- /*
+ { testfiles + "/structureimage2-3w5v.png",
+ testfiles + "/structureimage2-1gaq.png", } },
{ "--headless --noquit --open ./examples/1gaq.txt --append ./examples/3W5V.pdb "
+ "--structure examples/1gaq.txt --seqid \"1GAQ|A\" "
+ "--structureimage " + testfiles
{ "--headless --noquit --open ./examples/1gaq.txt --append ./examples/3W5V.pdb "
+ "--structure examples/1gaq.txt --seqid \"1GAQ|A\" "
+ "--structureimage " + testfiles
- + "/1gaq.png --structure examples/3W5V.pdb "
+ + "/structureimage3-1gaq.png --structure examples/3W5V.pdb "
+ "--seqid \"3W5V|A\" --structureimage " + testfiles
+ "--seqid \"3W5V|A\" --structureimage " + testfiles
- + "/3w5v.png --overwrite",
-
+ + "/structureimage3-3w5v.png --overwrite",
+
new String[]
new String[]
- { testfiles + "/1gaq.png", testfiles + "/3w5v.png" } }
+ { testfiles + "/structureimage3-3w5v.png",
+ testfiles + "/structureimage3-1gaq.png", } }
+ /*
*/
//
};
*/
//
};