A few minor changes to the test

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4706 e3abac25-378b-4346-85de-24260fe3988d

diff --git a/testsrc/compbio/data/msa/CategoryTester.java b/testsrc/compbio/data/msa/CategoryTester.java
index 575ac16..00a93f4 100644 (file)
--- a/testsrc/compbio/data/msa/CategoryTester.java
+++ b/testsrc/compbio/data/msa/CategoryTester.java
@@ -12,11 +12,12 @@ import org.testng.annotations.Test;
 import compbio.metadata.AllTestSuit;\r
 import compbio.ws.client.Jws2Client;\r
 import compbio.ws.client.Services;\r
+import compbio.ws.client.WSTesterTester;\r
 \r
 public class CategoryTester {\r
 \r
        // test category membership from string constants\r
-       compbio.data.msa.RegistryWS registry = null;\r
+       RegistryWS registry = null;\r
 \r
        @BeforeTest(groups = AllTestSuit.test_group_webservices)\r
        public void setupTest() {\r
@@ -25,8 +26,8 @@ public class CategoryTester {
                         * registry = Jws2Client .connectToRegistry(\r
                         * "http://webserv1.cluster.lifesci.dundee.ac.uk:8089/jaba");\r
                         */\r
-                       registry = Jws2Client\r
-                                       .connectToRegistry("http://localhost:8080/jabaws");\r
+                       registry = Jws2Client.connectToRegistry(WSTesterTester.SERVER);\r
+\r
                } catch (ConnectException e) {\r
                        e.printStackTrace();\r
                        Assert.fail(e.getMessage());\r
@@ -62,8 +63,7 @@ public class CategoryTester {
                        }\r
                }\r
                if (!found) {\r
-                       throw new Error(\r
-                                       "Could not match any category to one of the given category constants");\r
+                       Assert.fail("Could not match any category to one of the given category constants");\r
                }\r
        }\r
 \r