@BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
- Cache.loadProperties("test/jalview/testProps.jvprops");
+ Cache.loadProperties("test/jalview/bin/commandsTest2.jvprops");
Date oneHourFromNow = new Date(
System.currentTimeMillis() + 3600 * 1000);
Cache.setDateProperty("JALVIEW_NEWS_RSS_LASTMODIFIED", oneHourFromNow);
@Test(
groups =
- { "Functional" },
- dataProvider = "structureOpeningArgsParams")
+ { "Functional", "testTask1" },
+ dataProvider = "structureOpeningArgsParams",
+ singleThreaded = true)
public void structureOpeningArgsTest(String cmdLine, int seqNum,
int annNum, int viewerNum)
{
String[] args = cmdLine.split("\\s+");
Jalview.main(args);
+ try
+ {
+ // sleep for slow build server to open annotations and viewer windows
+ Thread.sleep(seqNum * 50 + annNum * 50 + viewerNum * 500);
+ } catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ }
+
AlignFrame[] afs = Desktop.getAlignFrames();
Assert.assertNotNull(afs);
Assert.assertTrue(afs.length > 0);
AlignmentAnnotation[] aas = al.getAlignmentAnnotation();
int visibleAnn = 0;
+ int dcount = 0;
for (AlignmentAnnotation aa : aas)
{
if (aa.visible)
if (viewerNum > -1)
{
- try
- {
- Thread.sleep(100);
- } catch (InterruptedException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
List<StructureViewerBase> openViewers = Desktop.instance
.getStructureViewers(ap, null);
Assert.assertNotNull(openViewers);
- Assert.assertEquals(openViewers.size(), viewerNum,
+ int count = 0;
+ for (StructureViewerBase svb : openViewers)
+ {
+ if (svb.isVisible())
+ count++;
+ }
+ Assert.assertEquals(count, viewerNum,
"Wrong number of structure viewers opened");
}
}
int viewerNum,
String propsFile
*/
- return new Object[][] { { "--nonews --nosplash --debug "
- + "--open=examples/uniref50.fa " + "--colour=gecos:flower "
- + "--structure=[seqid=FER1_SPIOL]examples/AlphaFold/AF-P00221-F1-model_v4.cif "
- + "--paematrix=examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
- + "--props=test/jalview/bin/commandsTest2.jvprops1 ",
- 15, 7, 1 },
- { "--nonews --nosplash --debug " + "--open=examples/uniref50.fa "
+ return new Object[][] {
+ //
+ /*
+ */
+ { "--nonews --nosplash --debug " + "--append=examples/uniref50.fa "
+ + "--colour=gecos:flower "
+ + "--structure=[seqid=FER1_SPIOL]examples/AlphaFold/AF-P00221-F1-model_v4.cif "
+ + "--paematrix=examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ + "--props=test/jalview/bin/commandsTest2.jvprops1 ",
+ 15, 7, 1 },
+ { "--nonews --nosplash --debug " + "--append=examples/uniref50.fa "
+ "--colour=gecos:flower "
+ "--structure=[seqid=FER1_SPIOL]examples/AlphaFold/AF-P00221-F1-model_v4.cif "
+ "--paematrix=examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ "--props=test/jalview/bin/commandsTest2.jvprops2 ",
15, 4, 1 },
- { "--nonews --nosplash --debug " + "--open=examples/uniref50.fa "
+ { "--nonews --nosplash --debug " + "--append=examples/uniref50.fa "
+ "--colour=gecos:flower "
+ "--structure=[seqid=FER1_SPIOL]examples/AlphaFold/AF-P00221-F1-model_v4.cif "
+ "--paematrix=examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ "--nossannotations "
+ "--props=test/jalview/bin/commandsTest2.jvprops1 ",
15, 4, 1 },
- { "--nonews --nosplash --debug " + "--open=examples/uniref50.fa "
+ { "--nonews --nosplash --debug " + "--append=examples/uniref50.fa "
+ "--colour=gecos:flower "
+ "--structure=[seqid=FER1_SPIOL]examples/AlphaFold/AF-P00221-F1-model_v4.cif "
+ "--paematrix=examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ "--noannotations "
+ "--props=test/jalview/bin/commandsTest2.jvprops1 ",
15, 3, 1 },
- { "--nonews --nosplash --debug " + "--open=examples/uniref50.fa "
+ { "--nonews --nosplash --debug " + "--append=examples/uniref50.fa "
+ "--colour=gecos:flower "
+ "--structure=[seqid=FER1_SPIOL]examples/AlphaFold/AF-P00221-F1-model_v4.cif "
+ "--paematrix=examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ "--noannotations " + "--nossannotations "
+ "--props=test/jalview/bin/commandsTest2.jvprops1 ",
15, 0, 1 },
- { "--nonews --nosplash --debug " + "--open=examples/uniref50.fa "
+ { "--nonews --nosplash --debug " + "--append=examples/uniref50.fa "
+ "--colour=gecos:flower "
+ "--structure=[seqid=FER1_SPIOL]examples/AlphaFold/AF-P00221-F1-model_v4.cif "
+ "--paematrix=examples/AlphaFold/AF-P00221-F1-predicted_aligned_error_v4.json "
+ "--noannotations " + "--nossannotations "
+ "--props=test/jalview/bin/commandsTest2.jvprops1 ",
15, 0, 1 },
- { "--argfile=test/jalview/bin/commandsTest2.argfile1 ", 16, 19, 3 },
- { "--argfile=test/jalview/bin/commandsTest2.argfile2 ", 16, 0, 2 },
+ { "--nonews --nosplash --debug --nowebservicediscovery --props=test/jalview/bin/commandsTest.jvprops --argfile=test/jalview/bin/commandsTest2.argfile1 ",
+ 16, 19, 3 },
+ { "--nonews --nosplash --debug --nowebservicediscovery --props=test/jalview/bin/commandsTest.jvprops --argfile=test/jalview/bin/commandsTest2.argfile2 ",
+ 16, 0, 2 },
//
};
}