Further work on AAConWS

[jabaws.git] / testsrc / compbio / runner / conservation / AAConTester.java

diff --git a/testsrc/compbio/runner/conservation/AAConTester.java b/testsrc/compbio/runner/conservation/AAConTester.java
index edf637b..fd3749b 100644 (file)
--- a/testsrc/compbio/runner/conservation/AAConTester.java
+++ b/testsrc/compbio/runner/conservation/AAConTester.java
@@ -37,7 +37,7 @@ import org.ggf.drmaa.JobInfo;
 import org.testng.annotations.BeforeMethod;\r
 import org.testng.annotations.Test;\r
 \r
-import compbio.data.sequence.Method;\r
+import compbio.data.sequence.ConservationMethod;\r
 import compbio.data.sequence.MultiAnnotatedSequence;\r
 import compbio.engine.AsyncExecutor;\r
 import compbio.engine.Configurator;\r
@@ -188,7 +188,7 @@ public class AAConTester {
                        lr.executeJob();\r
                        ConfiguredExecutable<?> al1 = lr.waitForResult();\r
                        assertNotNull(al1.getResults());\r
-                       MultiAnnotatedSequence<Method> annotations = confAAcon.getResults();\r
+                       MultiAnnotatedSequence<ConservationMethod> annotations = confAAcon.getResults();\r
                        assertNotNull(annotations);\r
                        assertEquals(annotations.getAnnotations().size(), 1);\r
                        assertEquals(al1.getResults(), annotations);\r
@@ -219,7 +219,7 @@ public class AAConTester {
                        lr.executeJob();\r
                        ConfiguredExecutable<?> al1 = lr.waitForResult();\r
                        assertNotNull(al1.getResults());\r
-                       MultiAnnotatedSequence<Method> annotations = confAAcon.getResults();\r
+                       MultiAnnotatedSequence<ConservationMethod> annotations = confAAcon.getResults();\r
                        assertNotNull(annotations);\r
                        assertEquals(annotations.getAnnotations().size(), 13);\r
                        assertEquals(al1.getResults(), annotations);\r
@@ -252,7 +252,7 @@ public class AAConTester {
                        lr.executeJob();\r
                        ConfiguredExecutable<?> al1 = lr.waitForResult();\r
                        assertNotNull(al1.getResults());\r
-                       MultiAnnotatedSequence<Method> annotations = confAAcon.getResults();\r
+                       MultiAnnotatedSequence<ConservationMethod> annotations = confAAcon.getResults();\r
                        assertNotNull(annotations);\r
                        assertEquals(annotations.getAnnotations().size(), 3);\r
                        assertEquals(al1.getResults(), annotations);\r