Refactoring (renaming) 2 classes: AsyncJobRunner.java -> AsyncClusterRunner.java...

[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 b453eb7..37f50cd 100644 (file)
--- a/testsrc/compbio/runner/conservation/AAConTester.java
+++ b/testsrc/compbio/runner/conservation/AAConTester.java
@@ -48,8 +48,8 @@ import compbio.engine.client.ConfExecutable;
 import compbio.engine.client.ConfiguredExecutable;\r
 import compbio.engine.client.Executable;\r
 import compbio.engine.client.RunConfiguration;\r
-import compbio.engine.cluster.drmaa.ClusterUtil;\r
-import compbio.engine.cluster.drmaa.JobRunner;\r
+import compbio.engine.cluster.drmaa.ClusterEngineUtil;\r
+import compbio.engine.cluster.drmaa.ClusterRunner;\r
 import compbio.engine.cluster.drmaa.StatisticManager;\r
 import compbio.engine.local.LocalRunner;\r
 import compbio.metadata.AllTestSuit;\r
@@ -62,7 +62,7 @@ import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;\r
 import compbio.metadata.ResultNotAvailableException;\r
 import compbio.metadata.RunnerConfig;\r
-import compbio.runner.Util;\r
+import compbio.runner.RunnerUtil;\r
 import compbio.util.FileWatcher;\r
 import compbio.util.SysPrefs;\r
 \r
@@ -84,7 +84,7 @@ public class AAConTester {
                assertFalse(SysPrefs.isWindows, "Cluster execution can only be in unix environment");\r
                try {\r
                        ConfiguredExecutable<AACon> confAAcon = Configurator.configureExecutable(aacon, Executable.ExecProvider.Cluster);\r
-                       JobRunner runner = JobRunner.getInstance(confAAcon);\r
+                       ClusterRunner runner = ClusterRunner.getInstance(confAAcon);\r
 \r
                        assertNotNull(runner, "Runner is NULL");\r
                        runner.executeJob();\r
@@ -98,7 +98,7 @@ public class AAConTester {
                                String exits = sm.getExitStatus();\r
                                assertNotNull("Exit status is null", exits);\r
                                // cut 4 trailing zeros from the number\r
-                               int exitsInt = ClusterUtil.CLUSTER_STAT_IN_SEC.parse(exits).intValue();\r
+                               int exitsInt = ClusterEngineUtil.CLUSTER_STAT_IN_SEC.parse(exits).intValue();\r
                                assertEquals(0, exitsInt);\r
                                System.out.println(sm.getAllStats());\r
 \r
@@ -191,7 +191,7 @@ public class AAConTester {
        @Test(groups = {AllTestSuit.test_group_runner})\r
        public void RunLocallyWithPreset() {\r
                try {\r
-                       PresetManager<AACon> aaconPresets = Util.getPresets(AACon.class);\r
+                       PresetManager<AACon> aaconPresets = RunnerUtil.getPresets(AACon.class);\r
                        assert aaconPresets != null;\r
                        ConfiguredExecutable<AACon> confAAcon = Configurator.configureExecutable(aacon, Executable.ExecProvider.Local);\r
                        Preset<AACon> quick = aaconPresets.getPresetByName("Quick conservation");\r