Further work on AAConWS

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

diff --git a/testsrc/compbio/ws/client/TestAAConWS.java b/testsrc/compbio/ws/client/TestAAConWS.java
index a6affb9..e0b002c 100644 (file)
--- a/testsrc/compbio/ws/client/TestAAConWS.java
+++ b/testsrc/compbio/ws/client/TestAAConWS.java
@@ -8,21 +8,17 @@ import java.io.File;
 import java.io.FileInputStream;\r
 import java.io.FileNotFoundException;\r
 import java.io.IOException;\r
-import java.net.MalformedURLException;\r
-import java.net.URL;\r
 import java.util.ArrayList;\r
 import java.util.HashSet;\r
 import java.util.List;\r
 \r
-import javax.xml.namespace.QName;\r
-import javax.xml.ws.Service;\r
-\r
 import org.testng.annotations.BeforeTest;\r
 import org.testng.annotations.Test;\r
 \r
 import compbio.data.msa.Annotation;\r
+import compbio.data.msa.JABAService;\r
 import compbio.data.sequence.FastaSequence;\r
-import compbio.data.sequence.Method;\r
+import compbio.data.sequence.ConservationMethod;\r
 import compbio.data.sequence.Score;\r
 import compbio.data.sequence.SequenceUtil;\r
 import compbio.metadata.JobSubmissionException;\r
@@ -41,18 +37,19 @@ public class TestAAConWS {
 \r
        @BeforeTest\r
        void initConnection() {\r
-               URL url = null;\r
-               try {\r
-                       url = new URL("http://localhost:8080/jabaws/AAConWS?wsdl");\r
-               } catch (MalformedURLException e) {\r
-                       e.printStackTrace();\r
-                       fail(e.getLocalizedMessage());\r
-               }\r
-               String namespace = "http://msa.data.compbio/01/12/2010/";\r
-               QName qname = new QName(namespace, "AAConWS");\r
-               Service serv = Service.create(url, qname);\r
-               msaws = serv.getPort(new QName(namespace, "AAConWSPort"),\r
-                               Annotation.class);\r
+               /*\r
+                * URL url = null; try { url = new\r
+                * URL("http://localhost:8080/jabaws/AAConWS?wsdl"); } catch\r
+                * (MalformedURLException e) { e.printStackTrace();\r
+                * fail(e.getLocalizedMessage()); } String namespace =\r
+                * "http://msa.data.compbio/01/12/2010/"; QName qname = new\r
+                * QName(namespace, "AAConWS"); Service serv = Service.create(url,\r
+                * qname); msaws = serv.getPort(new QName(namespace, "AAConWSPort"),\r
+                * Annotation.class);\r
+                */\r
+               JABAService client = Jws2Client.connect("http://localhost:8080/jabaws",\r
+                               Services.AAConWS);\r
+               msaws = (Annotation<AACon>) client;\r
        }\r
 \r
        @Test\r
@@ -83,7 +80,7 @@ public class TestAAConWS {
                        HashSet<Score> result = msaws.getAnnotation(jobId);\r
                        assertNotNull(result);\r
                        assertEquals(result.size(), 1);\r
-                       assertEquals(result.iterator().next().getMethod(), Method.SHENKIN);\r
+                       assertEquals(result.iterator().next().getMethod(), ConservationMethod.SHENKIN);\r
                        List<Float> scores = result.iterator().next().getScores();\r
                        assertNotNull(scores);\r
                        assertEquals(scores.size(), 568);\r