More javadocs

[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 a76b41b..a6affb9 100644 (file)
--- a/testsrc/compbio/ws/client/TestAAConWS.java
+++ b/testsrc/compbio/ws/client/TestAAConWS.java
@@ -80,7 +80,7 @@ public class TestAAConWS {
                        System.out.println("Pres: " + msaws.getPresets().getPresets());\r
                        String jobId = msaws.analize(fsl);\r
                        System.out.println("J: " + jobId);\r
-                       HashSet<Score> result = msaws.getConservation(jobId);\r
+                       HashSet<Score> result = msaws.getAnnotation(jobId);\r
                        assertNotNull(result);\r
                        assertEquals(result.size(), 1);\r
                        assertEquals(result.iterator().next().getMethod(), Method.SHENKIN);\r
@@ -92,19 +92,19 @@ public class TestAAConWS {
                        PresetManager<AACon> presets = msaws.getPresets();\r
                        jobId = msaws.presetAnalize(fsl,\r
                                        presets.getPresetByName("Quick conservation"));\r
-                       result = msaws.getConservation(jobId);\r
+                       result = msaws.getAnnotation(jobId);\r
                        assertNotNull(result);\r
                        assertEquals(result.size(), 13);\r
 \r
                        jobId = msaws.presetAnalize(fsl,\r
                                        presets.getPresetByName("Slow conservation"));\r
-                       result = msaws.getConservation(jobId);\r
+                       result = msaws.getAnnotation(jobId);\r
                        assertNotNull(result);\r
                        assertEquals(result.size(), 5);\r
 \r
                        jobId = msaws.presetAnalize(fsl,\r
                                        presets.getPresetByName("Complete conservation"));\r
-                       result = msaws.getConservation(jobId);\r
+                       result = msaws.getAnnotation(jobId);\r
                        assertNotNull(result);\r
                        assertEquals(result.size(), 18);\r
 \r
@@ -144,19 +144,19 @@ public class TestAAConWS {
                        PresetManager<AACon> presets = msaws.getPresets();\r
                        String jobId = msaws.presetAnalize(fsl,\r
                                        presets.getPresetByName("Quick conservation"));\r
-                       HashSet<Score> result = msaws.getConservation(jobId);\r
+                       HashSet<Score> result = msaws.getAnnotation(jobId);\r
                        assertNotNull(result);\r
                        assertEquals(result.size(), 13);\r
 \r
                        jobId = msaws.presetAnalize(fsl,\r
                                        presets.getPresetByName("Slow conservation"));\r
-                       result = msaws.getConservation(jobId);\r
+                       result = msaws.getAnnotation(jobId);\r
                        assertNotNull(result);\r
                        assertEquals(result.size(), 5);\r
 \r
                        jobId = msaws.presetAnalize(fsl,\r
                                        presets.getPresetByName("Complete conservation"));\r
-                       result = msaws.getConservation(jobId);\r
+                       result = msaws.getAnnotation(jobId);\r
                        assertNotNull(result);\r
                        assertEquals(result.size(), 18);\r
 \r
@@ -196,7 +196,7 @@ public class TestAAConWS {
                try {\r
                        options.getArgument("Calculation method").setDefaultValue("SMERFS");\r
                        String jobId = msaws.customAnalize(fsl, options.getArguments());\r
-                       HashSet<Score> result = msaws.getConservation(jobId);\r
+                       HashSet<Score> result = msaws.getAnnotation(jobId);\r
                        assertNotNull(result);\r
                        assertEquals(result.size(), 1);\r
                        assertEquals(\r
@@ -207,7 +207,7 @@ public class TestAAConWS {
                        options.removeArgument("Normalize");\r
                        System.out.println(options);\r
                        jobId = msaws.customAnalize(fsl, options.getArguments());\r
-                       result = msaws.getConservation(jobId);\r
+                       result = msaws.getAnnotation(jobId);\r
                        assertNotNull(result);\r
                        assertEquals(result.size(), 1);\r
                        assertEquals(\r