From ead09494eebf803b6332fadef71e8d6762c65901 Mon Sep 17 00:00:00 2001 From: Sasha Sherstnev Date: Thu, 8 Aug 2013 13:16:14 +0100 Subject: [PATCH] Remove unused global varibles --- testsrc/compbio/metadata/AllTestSuit.java | 31 ++--------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/testsrc/compbio/metadata/AllTestSuit.java b/testsrc/compbio/metadata/AllTestSuit.java index 3cef5ef..2448824 100644 --- a/testsrc/compbio/metadata/AllTestSuit.java +++ b/testsrc/compbio/metadata/AllTestSuit.java @@ -19,27 +19,9 @@ package compbio.metadata; import java.io.File; - -import compbio.runner.Util; -import compbio.runner.msa.ClustalW; -import compbio.runner.msa.Muscle; -import compbio.runner.msa.Tcoffee; import compbio.util.SysPrefs; public class AllTestSuit { - - public static final PresetManager CLUSTAL_PRESETS = Util.getPresets(ClustalW.class); - public static final RunnerConfig CLUSTAL_PARAMETERS = Util.getSupportedOptions(ClustalW.class); - public static final LimitsManager CLUSTAL_LIMITS = compbio.engine.client.Util.getLimits(new ClustalW().getType()); - - public static final PresetManager TCOFFEE_PRESETS = Util.getPresets(Tcoffee.class); - public static final RunnerConfig TCOFFEE_PARAMETERS = Util.getSupportedOptions(Tcoffee.class); - public static final LimitsManager TCOFFEE_LIMITS = compbio.engine.client.Util.getLimits(new Tcoffee().getType()); - - public static final PresetManager MUSCLE_PRESETS = Util.getPresets(Muscle.class); - public static final RunnerConfig MUSCLE_PARAMETERS = Util.getSupportedOptions(Muscle.class); - public static final LimitsManager 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"; @@ -48,29 +30,20 @@ public class AllTestSuit { 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! - */ + // For this to work execution must start from the project directory! public static final String CURRENT_DIRECTORY = SysPrefs.getCurrentDirectory() + File.separator; - public static final String TEST_DATA_PATH = "testsrc" + File.separator + "testdata" + File.separator; - public static final String TEST_DATA_PATH_ABSOLUTE = AllTestSuit.CURRENT_DIRECTORY + TEST_DATA_PATH; // 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 + "local_jobsout" + File.separator; - + public static final String OUTPUT_DIR_ABSOLUTE = AllTestSuit.CURRENT_DIRECTORY + "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"; - public static final String test_input_dna = AllTestSuit.TEST_DATA_PATH_ABSOLUTE + "3dnaseqs.fasta"; - public static final String test_input_large = AllTestSuit.TEST_DATA_PATH_ABSOLUTE + "1000x3000Dna.fasta"; } -- 1.7.10.2