further work on registry & WSTester nearly there

[jabaws.git] / testsrc / compbio / ws / client / WSTesterTester.java

diff --git a/testsrc/compbio/ws/client/WSTesterTester.java b/testsrc/compbio/ws/client/WSTesterTester.java
index 43204e5..5fe0a35 100644 (file)
--- a/testsrc/compbio/ws/client/WSTesterTester.java
+++ b/testsrc/compbio/ws/client/WSTesterTester.java
@@ -6,7 +6,6 @@ import java.io.PrintWriter;
 \r
 import org.testng.annotations.Test;\r
 \r
-import compbio.data.msa.JABAService;\r
 import compbio.metadata.AllTestSuit;\r
 \r
 public class WSTesterTester {\r
@@ -15,18 +14,13 @@ public class WSTesterTester {
 \r
        @Test(groups = {AllTestSuit.test_group_runner})\r
        public void testAllWindowsWS() {\r
-               WSTester tester = new WSTester(new PrintWriter(System.out, true));\r
-               JABAService ws = Jws2Client.connect(SERVER, Services.AAConWS);\r
-               assertTrue(tester.checkService(ws));\r
+               WSTester tester = new WSTester(SERVER,\r
+                               new PrintWriter(System.out, true));\r
 \r
-               ws = Jws2Client.connect(SERVER, Services.JronnWS);\r
-               assertTrue(tester.checkService(ws));\r
-\r
-               ws = Jws2Client.connect(SERVER, Services.ClustalWS);\r
-               assertTrue(tester.checkService(ws));\r
-\r
-               ws = Jws2Client.connect(SERVER, Services.MuscleWS);\r
-               assertTrue(tester.checkService(ws));\r
+               assertTrue(tester.checkService(Services.AAConWS));\r
+               assertTrue(tester.checkService(Services.JronnWS));\r
+               assertTrue(tester.checkService(Services.ClustalWS));\r
+               assertTrue(tester.checkService(Services.MuscleWS));\r
 \r
                // Will throw UnsupportedRuntimeException on windows\r
                // ws = Jws2Client.connect(SERVER, Services.MafftWS);\r
@@ -36,11 +30,9 @@ public class WSTesterTester {
 \r
        @Test(groups = {AllTestSuit.test_group_non_windows})\r
        public void testAllWS() {\r
-               WSTester tester = new WSTester(new PrintWriter(System.out));\r
-\r
+               WSTester tester = new WSTester(SERVER, new PrintWriter(System.out));\r
                for (Services service : Services.values()) {\r
-                       JABAService ws = Jws2Client.connect(SERVER, service);\r
-                       assertTrue(tester.checkService(ws));\r
+                       assertTrue(tester.checkService(service));\r
                }\r
        }\r
 \r