X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=testsrc%2Fcompbio%2Frunner%2Fconservation%2FAAConTester.java;fp=testsrc%2Fcompbio%2Frunner%2Fconservation%2FAAConTester.java;h=353509a70c14b9461eb1ac5d2be7099f1eef820a;hb=ab2670db1c5eb76c98844d5a3272ac27df65af57;hp=1dc0b7766b057a765ed9cba81140318cc18351b1;hpb=db5333c93e7d29d2a6eb301a017300583bc9f44c;p=jabaws.git

diff --git a/testsrc/compbio/runner/conservation/AAConTester.java b/testsrc/compbio/runner/conservation/AAConTester.java
index 1dc0b77..353509a 100644
--- a/testsrc/compbio/runner/conservation/AAConTester.java
+++ b/testsrc/compbio/runner/conservation/AAConTester.java
@@ -52,6 +52,7 @@ import compbio.engine.cluster.drmaa.ClusterUtil;
 import compbio.engine.cluster.drmaa.JobRunner;
 import compbio.engine.cluster.drmaa.StatisticManager;
 import compbio.engine.local.LocalRunner;
+import compbio.metadata.AllTestSuit;
 import compbio.metadata.ChunkHolder;
 import compbio.metadata.JobExecutionException;
 import compbio.metadata.JobStatus;
@@ -81,7 +82,7 @@ public class AAConTester {
 		aacon.setInput(test_alignment_input).setOutput(test_outfile);
 	}
 
-	@Test()
+	@Test(groups = {AllTestSuit.test_group_runner})
 	public void testRunOnCluster() {
 		assertFalse(SysPrefs.isWindows,
 				"Cluster execution can only be in unix environment");
@@ -137,7 +138,7 @@ public class AAConTester {
 	 * This tests fails from time to time depending on the cluster load or some
 	 * other factors. Any client code has to adjust for this issue
 	 */
-	@Test()
+	@Test(groups = {AllTestSuit.test_group_runner, AllTestSuit.test_group_cluster})
 	public void testRunOnClusterAsync() {
 		assertFalse(SysPrefs.isWindows,
 				"Cluster execution can only be in unix environment");
@@ -178,7 +179,7 @@ public class AAConTester {
 		}
 	}
 
-	@Test()
+	@Test(groups = {AllTestSuit.test_group_runner})
 	public void testRunLocally() {
 		try {
 			ConfiguredExecutable<AACon> confAAcon = Configurator
@@ -205,7 +206,7 @@ public class AAConTester {
 		}
 	}
 
-	@Test()
+	@Test(groups = {AllTestSuit.test_group_runner})
 	public void testRunLocallyWithPreset() {
 		try {
 			PresetManager<AACon> aaconPresets = Util.getPresets(AACon.class);
@@ -236,7 +237,7 @@ public class AAConTester {
 		}
 	}
 
-	@Test()
+	@Test(groups = {AllTestSuit.test_group_runner})
 	public void testRunLocallyOnTwoCpu() {
 		try {
 			aacon = new AACon();
@@ -269,7 +270,8 @@ public class AAConTester {
 			fail(e.getLocalizedMessage());
 		}
 	}
-	@Test()
+	
+	@Test(groups = {AllTestSuit.test_group_runner})
 	public void readStatistics() {
 		try {
 			ConfiguredExecutable<AACon> confAAcon = Configurator
@@ -319,7 +321,7 @@ public class AAConTester {
 		}
 	}
 
-	@Test()
+	@Test(groups = {AllTestSuit.test_group_runner})
 	public void testPersistance() {
 		try {
 			AACon aacon = new AACon();
@@ -387,7 +389,7 @@ public class AAConTester {
 		}
 	}
 
-	@Test()
+	@Test(groups = {AllTestSuit.test_group_runner})
 	public void testConfigurationLoading() {
 		try {
 			RunnerConfig<AACon> aaconConfig = ConfExecutable