X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FJalviewJabawsTestUtils.java;h=12f5e1b5cd1cc932025f614018161c62ec7bb95a;hb=c2e0797f0a114da79ed00e67ec029a3e83496d8d;hp=047d78cd26747e2905903c20da7ff95dbebc0624;hpb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;p=jalview.git diff --git a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java index 047d78c..12f5e1b 100644 --- a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java +++ b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,13 +20,12 @@ */ 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.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -35,11 +34,18 @@ public class JalviewJabawsTestUtils { @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 { } @@ -54,7 +60,7 @@ public class JalviewJabawsTestUtils @Test(groups = { "Functional" }, enabled = false) public void testAnnotExport() { - fail("Not yet implemented"); + Assert.fail("Not yet implemented"); } public static jalview.ws.jws2.Jws2Discoverer getJabawsDiscoverer() @@ -62,6 +68,20 @@ public class JalviewJabawsTestUtils 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 + *