X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FJpredJabaStructExportImport.java;h=7f94b6bc35c1aaaab3e280b11d5451819b7472c5;hb=a5be53df96dabea00429121a742ae476872640eb;hp=e347e5531b00ed174a295a394c32cc2824932593;hpb=fddf3084802b37e5cee17829e32692a4aac3e60d;p=jalview.git diff --git a/test/jalview/ws/jabaws/JpredJabaStructExportImport.java b/test/jalview/ws/jabaws/JpredJabaStructExportImport.java index e347e55..7f94b6b 100644 --- a/test/jalview/ws/jabaws/JpredJabaStructExportImport.java +++ b/test/jalview/ws/jabaws/JpredJabaStructExportImport.java @@ -23,6 +23,7 @@ package jalview.ws.jabaws; import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertTrue; +import jalview.bin.Cache; import jalview.datamodel.AlignmentI; import jalview.gui.Jalview2XML; import jalview.io.AnnotationFile; @@ -62,11 +63,11 @@ public class JpredJabaStructExportImport public static jalview.gui.AlignFrame af = null; - @BeforeClass + @BeforeClass(alwaysRun = true) public static void setUpBeforeClass() throws Exception { - - jalview.bin.Cache.initLogger(); + Cache.loadProperties("test/jalview/io/testProps.jvprops"); + Cache.initLogger(); disc = JalviewJabawsTestUtils.getJabawsDiscoverer(false); for (Jws2Instance svc : disc.getServices()) @@ -84,7 +85,7 @@ public class JpredJabaStructExportImport assertNotNull("Couldn't load test data ('" + testseqs + "')", af); } - @AfterClass + @AfterClass(alwaysRun = true) public static void tearDownAfterClass() throws Exception { if (af != null) @@ -94,7 +95,7 @@ public class JpredJabaStructExportImport } } - @Test(groups ={ "Functional" }) + @Test(groups = { "Functional" }) public void testJPredStructOneSeqOnly() { af.selectAllSequenceMenuItem_actionPerformed(null); @@ -146,7 +147,7 @@ public class JpredJabaStructExportImport } - @Test(groups ={ "Functional" }) + @Test(groups = { "Functional" }) public void testJPredStructExport() { @@ -217,7 +218,7 @@ public class JpredJabaStructExportImport + "\nCouldn't complete Annotation file roundtrip input/output/input test."); } - @Test(groups ={ "Functional" }) + @Test(groups = { "Functional" }) public void testJpredwsSettingsRecovery() { Assert.fail("not implemnented");