X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FJalviewJabawsTestUtils.java;h=e897b1de3390bc01d0d564eb096a0a1521770985;hb=57dd16688caa6dacaeaf465bab3ee8b6126e1a51;hp=546ba90475c2760c4a98aac400fbc084a467039d;hpb=3412b273e964fb1a9d22564b04a5f0c827ec2461;p=jalview.git diff --git a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java index 546ba90..e897b1d 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-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -23,18 +23,18 @@ package jalview.ws.jabaws; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import jalview.ws.jws2.Jws2Discoverer; + import java.util.Vector; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import jalview.ws.jws2.Jws2Discoverer; - public class JalviewJabawsTestUtils { - @BeforeClass + @BeforeClass(alwaysRun = true) public static void setUpBeforeClass() throws Exception { } @@ -47,11 +47,11 @@ public class JalviewJabawsTestUtils /** * test servers */ - private 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(enabled = false) + @Test(groups = { "Functional" }, enabled = false) public void testAnnotExport() { fail("Not yet implemented"); @@ -61,6 +61,7 @@ public class JalviewJabawsTestUtils { return getJabawsDiscoverer(true); } + public static Jws2Discoverer getJabawsDiscoverer(boolean localhost) { jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer @@ -91,5 +92,4 @@ public class JalviewJabawsTestUtils return disc; } - }