X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=testsrc%2Fcompbio%2Fmetadata%2FAllTestSuit.java;h=92f17487af0e2f49e92a97766b7c394f759bbad8;hb=99c3b6398a51c3b71e519de2e3d3dcfb552a4232;hp=2c045cca43c34212701846ca7107b8ec32b5b0c8;hpb=535359a3d592ee41bda72e7356f0181f6cee9d07;p=jabaws.git

diff --git a/testsrc/compbio/metadata/AllTestSuit.java b/testsrc/compbio/metadata/AllTestSuit.java
index 2c045cc..92f1748 100644
--- a/testsrc/compbio/metadata/AllTestSuit.java
+++ b/testsrc/compbio/metadata/AllTestSuit.java
@@ -32,35 +32,36 @@ public class AllTestSuit {
 			.getPresets(ClustalW.class);
 	public static final RunnerConfig<ClustalW> CLUSTAL_PARAMETERS = Util
 			.getSupportedOptions(ClustalW.class);
-	public static final LimitsManager<ClustalW> CLUSTAL_LIMITS = Util
-			.getLimits(ClustalW.class);
+	public static final LimitsManager<ClustalW> CLUSTAL_LIMITS = compbio.engine.client.Util
+			.getLimits(new ClustalW().getType());
 
 	public static final PresetManager<Tcoffee> TCOFFEE_PRESETS = Util
 			.getPresets(Tcoffee.class);
 	public static final RunnerConfig<Tcoffee> TCOFFEE_PARAMETERS = Util
 			.getSupportedOptions(Tcoffee.class);
-	public static final LimitsManager<Tcoffee> TCOFFEE_LIMITS = Util
-			.getLimits(Tcoffee.class);
+	public static final LimitsManager<Tcoffee> TCOFFEE_LIMITS = compbio.engine.client.Util
+			.getLimits(new Tcoffee().getType());
 
 	public static final PresetManager<Muscle> MUSCLE_PRESETS = Util
 			.getPresets(Muscle.class);
 	public static final RunnerConfig<Muscle> MUSCLE_PARAMETERS = Util
 			.getSupportedOptions(Muscle.class);
-	public static final LimitsManager<Muscle> MUSCLE_LIMITS = Util
-			.getLimits(Muscle.class);
+	public static final LimitsManager<Muscle> MUSCLE_LIMITS = compbio.engine.client.Util
+			.getLimits(new Muscle().getType());
 
 	public final static String test_group_cluster = "cluster";
 	public final static String test_group_runner = "runner";
 	public final static String test_group_non_windows = "non_windows";
+	public final static String test_group_windows_only = "windows_only";
 	public final static String test_group_engine = "engine";
 	public final static String test_group_long = "performance";
+	public final static String test_group_webservices = "webservices";
 
 	/*
 	 * For this to work execution must start from the project directory!
 	 */
 	public static final String CURRENT_DIRECTORY = SysPrefs
-			.getCurrentDirectory()
-			+ File.separator;
+			.getCurrentDirectory() + File.separator;
 
 	public static final String TEST_DATA_PATH = "testsrc" + File.separator
 			+ "testdata" + File.separator;
@@ -71,13 +72,16 @@ public class AllTestSuit {
 	// For cluster execution paths MUST BE ABSOLUTE as cluster hosts will not be
 	// able to access the task otherwise
 	public static final String OUTPUT_DIR_ABSOLUTE = AllTestSuit.CURRENT_DIRECTORY
-			+ File.separator + "jobsout" + File.separator;
+			+ File.separator + "local_jobsout" + File.separator;
 
 	public static final String RUNNER_TEST_LOGGER = "RunnerLogger";
 
 	public static final String test_input = AllTestSuit.TEST_DATA_PATH_ABSOLUTE
 			+ "TO1381.fasta";
 
+	public static final String test_alignment_input = AllTestSuit.TEST_DATA_PATH_ABSOLUTE
+			+ "TO1381.fasta.aln";
+
 	public static final String test_input_real = AllTestSuit.TEST_DATA_PATH_ABSOLUTE
 			+ "50x500Protein.fasta";