X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=testsrc%2Fcompbio%2Frunner%2Fpredictors%2FJpredTester.java;h=1bf753b52e5faf87ac37f1c20f80b0914a9e6e27;hb=b2a2fdc2bd95a64b3908d8ea2f31270b6c7199d3;hp=b1b991f22fa3cddd0f9d833b6be3bf5b7f509cb1;hpb=c6a3bc57b6b96407d7b203e319e947e9d9aed31c;p=jabaws.git

diff --git a/testsrc/compbio/runner/predictors/JpredTester.java b/testsrc/compbio/runner/predictors/JpredTester.java
index b1b991f..1bf753b 100644
--- a/testsrc/compbio/runner/predictors/JpredTester.java
+++ b/testsrc/compbio/runner/predictors/JpredTester.java
@@ -47,7 +47,7 @@ import compbio.engine.client.ConfExecutable;
 import compbio.engine.client.ConfiguredExecutable;
 import compbio.engine.client.Executable;
 import compbio.engine.client.RunConfiguration;
-import compbio.engine.cluster.drmaa.ClusterUtil;
+import compbio.engine.cluster.drmaa.ClusterEngineUtil;
 import compbio.engine.cluster.drmaa.JobRunner;
 import compbio.engine.cluster.drmaa.StatisticManager;
 import compbio.engine.local.LocalRunner;
@@ -61,7 +61,7 @@ import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;
 import compbio.metadata.ResultNotAvailableException;
 import compbio.metadata.RunnerConfig;
-import compbio.runner.Util;
+import compbio.runner.RunnerUtil;
 import compbio.util.FileWatcher;
 import compbio.util.SysPrefs;
 
@@ -85,7 +85,7 @@ public class JpredTester {
 	public void RunOnCluster() {
 		assertFalse(SysPrefs.isWindows, "Cluster execution can only be in unix environment");
 		try {
-			PresetManager<Jpred> jpredPreset = Util.getPresets(Jpred.class);
+			PresetManager<Jpred> jpredPreset = RunnerUtil.getPresets(Jpred.class);
 			assert jpredPreset != null;
 			ConfiguredExecutable<Jpred> confpred = Configurator.configureExecutable(pred, Executable.ExecProvider.Cluster);
 			Preset<Jpred> conf = jpredPreset.getPresetByName("cluster configuration");
@@ -104,7 +104,7 @@ public class JpredTester {
 				String exits = sm.getExitStatus();
 				assertNotNull("Exit status is null", exits);
 				// cut 4 trailing zeros from the number
-				int exitsInt = ClusterUtil.CLUSTER_STAT_IN_SEC.parse(exits).intValue();
+				int exitsInt = ClusterEngineUtil.CLUSTER_STAT_IN_SEC.parse(exits).intValue();
 				assertEquals(0, exitsInt);
 				System.out.println(sm.getAllStats());
 			} catch (ParseException e) {
@@ -194,7 +194,7 @@ public class JpredTester {
 	public void RunLocallyWithPreset() {
 		try {
 			ConfiguredExecutable<Jpred> confpred = Configurator.configureExecutable(pred, Executable.ExecProvider.Local);
-			PresetManager<Jpred> preset = Util.getPresets(Jpred.class);
+			PresetManager<Jpred> preset = RunnerUtil.getPresets(Jpred.class);
 			assert preset != null;
 			Preset<Jpred> conf = preset.getPresetByName("laptop configuration");
 			confpred.addParameters(conf.getOptions());
@@ -227,7 +227,7 @@ public class JpredTester {
 			jpred.setInput(test_input);
 			jpred.setOutput(test_output);
 			ConfiguredExecutable<Jpred> confpred = Configurator.configureExecutable(jpred, Executable.ExecProvider.Local);
-			PresetManager<Jpred> preset = Util.getPresets(Jpred.class);
+			PresetManager<Jpred> preset = RunnerUtil.getPresets(Jpred.class);
 			assert preset != null;
 			Preset<Jpred> conf = preset.getPresetByName("laptop configuration");
 			confpred.addParameters(conf.getOptions());