X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FJalviewJabawsTestUtils.java;h=12f5e1b5cd1cc932025f614018161c62ec7bb95a;hb=c2e0797f0a114da79ed00e67ec029a3e83496d8d;hp=c2b483a6fd32256da0a895a1685794f396afab6e;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java index c2b483a..12f5e1b 100644 --- a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java +++ b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java @@ -20,25 +20,32 @@ */ package jalview.ws.jabaws; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import jalview.gui.JvOptionPane; import jalview.ws.jws2.Jws2Discoverer; import java.util.Vector; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.testng.Assert; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; public class JalviewJabawsTestUtils { - @BeforeClass + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + + @BeforeClass(alwaysRun = true) public static void setUpBeforeClass() throws Exception { } - @AfterClass + @AfterClass(alwaysRun = true) public static void tearDownAfterClass() throws Exception { } @@ -46,19 +53,35 @@ public class JalviewJabawsTestUtils /** * test servers */ - public static String[] serviceUrls = new String[] - { "http://localhost:8080/jabaws" }; + private static String[] serviceUrls = new String[] { + "http://localhost:8080/jabaws", + "http://www.compbio.dundee.ac.uk/jabaws" }; - @Test + @Test(groups = { "Functional" }, enabled = false) public void testAnnotExport() { - fail("Not yet implemented"); + Assert.fail("Not yet implemented"); } public static jalview.ws.jws2.Jws2Discoverer getJabawsDiscoverer() { return getJabawsDiscoverer(true); } + + /** + * Returns a service discoverer that queries localhost and compbio urls. + *
+ * If using this method, be sure to have read-only Jalview properties, to + * avoid writing the test urls to .jalview_properties. This can be done by + * either + *