Merge branch 'JWS-29' into develop

[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 859c4ae..353509a 100644 (file)
--- a/testsrc/compbio/runner/conservation/AAConTester.java
+++ b/testsrc/compbio/runner/conservation/AAConTester.java
@@ -39,6 +39,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;\r
 \r
 import compbio.data.sequence.Score;\r
+import compbio.data.sequence.ScoreManager;\r
 import compbio.engine.AsyncExecutor;\r
 import compbio.engine.Configurator;\r
 import compbio.engine.FilePuller;\r
@@ -51,6 +52,7 @@ import compbio.engine.cluster.drmaa.ClusterUtil;
 import compbio.engine.cluster.drmaa.JobRunner;\r
 import compbio.engine.cluster.drmaa.StatisticManager;\r
 import compbio.engine.local.LocalRunner;\r
+import compbio.metadata.AllTestSuit;\r
 import compbio.metadata.ChunkHolder;\r
 import compbio.metadata.JobExecutionException;\r
 import compbio.metadata.JobStatus;\r
@@ -80,7 +82,7 @@ public class AAConTester {
                aacon.setInput(test_alignment_input).setOutput(test_outfile);\r
        }\r
 \r
-       @Test()\r
+       @Test(groups = {AllTestSuit.test_group_runner})\r
        public void testRunOnCluster() {\r
                assertFalse(SysPrefs.isWindows,\r
                                "Cluster execution can only be in unix environment");\r
@@ -136,7 +138,7 @@ public class AAConTester {
         * This tests fails from time to time depending on the cluster load or some\r
         * other factors. Any client code has to adjust for this issue\r
         */\r
-       @Test()\r
+       @Test(groups = {AllTestSuit.test_group_runner, AllTestSuit.test_group_cluster})\r
        public void testRunOnClusterAsync() {\r
                assertFalse(SysPrefs.isWindows,\r
                                "Cluster execution can only be in unix environment");\r
@@ -177,7 +179,7 @@ public class AAConTester {
                }\r
        }\r
 \r
-       @Test()\r
+       @Test(groups = {AllTestSuit.test_group_runner})\r
        public void testRunLocally() {\r
                try {\r
                        ConfiguredExecutable<AACon> confAAcon = Configurator\r
@@ -188,9 +190,9 @@ public class AAConTester {
                        lr.executeJob();\r
                        ConfiguredExecutable<?> al1 = lr.waitForResult();\r
                        assertNotNull(al1.getResults());\r
-                       HashSet<Score> annotations = confAAcon.getResults();\r
+                       ScoreManager annotations = confAAcon.getResults();\r
                        assertNotNull(annotations);\r
-                       assertEquals(annotations.size(), 1);\r
+                       assertEquals(annotations.asSet().size(), 18);\r
                        assertEquals(al1.getResults(), annotations);\r
                } catch (JobSubmissionException e) {\r
                        e.printStackTrace();\r
@@ -204,7 +206,7 @@ public class AAConTester {
                }\r
        }\r
 \r
-       @Test()\r
+       @Test(groups = {AllTestSuit.test_group_runner})\r
        public void testRunLocallyWithPreset() {\r
                try {\r
                        PresetManager<AACon> aaconPresets = Util.getPresets(AACon.class);\r
@@ -219,9 +221,9 @@ public class AAConTester {
                        lr.executeJob();\r
                        ConfiguredExecutable<?> al1 = lr.waitForResult();\r
                        assertNotNull(al1.getResults());\r
-                       HashSet<Score> annotations = confAAcon.getResults();\r
+                       ScoreManager annotations = confAAcon.getResults();\r
                        assertNotNull(annotations);\r
-                       assertEquals(annotations.size(), 13);\r
+                       assertEquals(annotations.asSet().size(), 13);\r
                        assertEquals(al1.getResults(), annotations);\r
                } catch (JobSubmissionException e) {\r
                        e.printStackTrace();\r
@@ -235,7 +237,7 @@ public class AAConTester {
                }\r
        }\r
 \r
-       @Test()\r
+       @Test(groups = {AllTestSuit.test_group_runner})\r
        public void testRunLocallyOnTwoCpu() {\r
                try {\r
                        aacon = new AACon();\r
@@ -252,9 +254,9 @@ public class AAConTester {
                        lr.executeJob();\r
                        ConfiguredExecutable<?> al1 = lr.waitForResult();\r
                        assertNotNull(al1.getResults());\r
-                       HashSet<Score> annotations = confAAcon.getResults();\r
+                       ScoreManager annotations = confAAcon.getResults();\r
                        assertNotNull(annotations);\r
-                       assertEquals(annotations.size(), 3);\r
+                       assertEquals(annotations.asSet().size(), 3);\r
                        assertEquals(al1.getResults(), annotations);\r
 \r
                } catch (JobSubmissionException e) {\r
@@ -268,7 +270,8 @@ public class AAConTester {
                        fail(e.getLocalizedMessage());\r
                }\r
        }\r
-       @Test()\r
+       \r
+       @Test(groups = {AllTestSuit.test_group_runner})\r
        public void readStatistics() {\r
                try {\r
                        ConfiguredExecutable<AACon> confAAcon = Configurator\r
@@ -318,7 +321,7 @@ public class AAConTester {
                }\r
        }\r
 \r
-       @Test()\r
+       @Test(groups = {AllTestSuit.test_group_runner})\r
        public void testPersistance() {\r
                try {\r
                        AACon aacon = new AACon();\r
@@ -386,7 +389,7 @@ public class AAConTester {
                }\r
        }\r
 \r
-       @Test()\r
+       @Test(groups = {AllTestSuit.test_group_runner})\r
        public void testConfigurationLoading() {\r
                try {\r
                        RunnerConfig<AACon> aaconConfig = ConfExecutable\r