change code style

diff --git a/testsrc/compbio/metadata/AllTestSuit.java b/testsrc/compbio/metadata/AllTestSuit.java
index 92f1748..3cef5ef 100644 (file)
--- a/testsrc/compbio/metadata/AllTestSuit.java
+++ b/testsrc/compbio/metadata/AllTestSuit.java
@@ -28,26 +28,17 @@ import compbio.util.SysPrefs;
 \r
 public class AllTestSuit {\r
 \r
-       public static final PresetManager<ClustalW> CLUSTAL_PRESETS = Util\r
-                       .getPresets(ClustalW.class);\r
-       public static final RunnerConfig<ClustalW> CLUSTAL_PARAMETERS = Util\r
-                       .getSupportedOptions(ClustalW.class);\r
-       public static final LimitsManager<ClustalW> CLUSTAL_LIMITS = compbio.engine.client.Util\r
-                       .getLimits(new ClustalW().getType());\r
-\r
-       public static final PresetManager<Tcoffee> TCOFFEE_PRESETS = Util\r
-                       .getPresets(Tcoffee.class);\r
-       public static final RunnerConfig<Tcoffee> TCOFFEE_PARAMETERS = Util\r
-                       .getSupportedOptions(Tcoffee.class);\r
-       public static final LimitsManager<Tcoffee> TCOFFEE_LIMITS = compbio.engine.client.Util\r
-                       .getLimits(new Tcoffee().getType());\r
-\r
-       public static final PresetManager<Muscle> MUSCLE_PRESETS = Util\r
-                       .getPresets(Muscle.class);\r
-       public static final RunnerConfig<Muscle> MUSCLE_PARAMETERS = Util\r
-                       .getSupportedOptions(Muscle.class);\r
-       public static final LimitsManager<Muscle> MUSCLE_LIMITS = compbio.engine.client.Util\r
-                       .getLimits(new Muscle().getType());\r
+       public static final PresetManager<ClustalW> CLUSTAL_PRESETS = Util.getPresets(ClustalW.class);\r
+       public static final RunnerConfig<ClustalW> CLUSTAL_PARAMETERS = Util.getSupportedOptions(ClustalW.class);\r
+       public static final LimitsManager<ClustalW> CLUSTAL_LIMITS = compbio.engine.client.Util.getLimits(new ClustalW().getType());\r
+\r
+       public static final PresetManager<Tcoffee> TCOFFEE_PRESETS = Util.getPresets(Tcoffee.class);\r
+       public static final RunnerConfig<Tcoffee> TCOFFEE_PARAMETERS = Util.getSupportedOptions(Tcoffee.class);\r
+       public static final LimitsManager<Tcoffee> TCOFFEE_LIMITS = compbio.engine.client.Util.getLimits(new Tcoffee().getType());\r
+\r
+       public static final PresetManager<Muscle> MUSCLE_PRESETS = Util.getPresets(Muscle.class);\r
+       public static final RunnerConfig<Muscle> MUSCLE_PARAMETERS = Util.getSupportedOptions(Muscle.class);\r
+       public static final LimitsManager<Muscle> MUSCLE_LIMITS = compbio.engine.client.Util.getLimits(new Muscle().getType());\r
 \r
        public final static String test_group_cluster = "cluster";\r
        public final static String test_group_runner = "runner";\r
@@ -60,35 +51,26 @@ public class AllTestSuit {
        /*\r
         * For this to work execution must start from the project directory!\r
         */\r
-       public static final String CURRENT_DIRECTORY = SysPrefs\r
-                       .getCurrentDirectory() + File.separator;\r
+       public static final String CURRENT_DIRECTORY = SysPrefs.getCurrentDirectory() + File.separator;\r
 \r
-       public static final String TEST_DATA_PATH = "testsrc" + File.separator\r
-                       + "testdata" + File.separator;\r
+       public static final String TEST_DATA_PATH = "testsrc" + File.separator + "testdata" + File.separator;\r
 \r
-       public static final String TEST_DATA_PATH_ABSOLUTE = AllTestSuit.CURRENT_DIRECTORY\r
-                       + TEST_DATA_PATH;\r
+       public static final String TEST_DATA_PATH_ABSOLUTE = AllTestSuit.CURRENT_DIRECTORY + TEST_DATA_PATH;\r
 \r
        // For cluster execution paths MUST BE ABSOLUTE as cluster hosts will not be\r
        // able to access the task otherwise\r
-       public static final String OUTPUT_DIR_ABSOLUTE = AllTestSuit.CURRENT_DIRECTORY\r
-                       + File.separator + "local_jobsout" + File.separator;\r
+       public static final String OUTPUT_DIR_ABSOLUTE = AllTestSuit.CURRENT_DIRECTORY + File.separator + "local_jobsout" + File.separator;\r
 \r
        public static final String RUNNER_TEST_LOGGER = "RunnerLogger";\r
 \r
-       public static final String test_input = AllTestSuit.TEST_DATA_PATH_ABSOLUTE\r
-                       + "TO1381.fasta";\r
+       public static final String test_input = AllTestSuit.TEST_DATA_PATH_ABSOLUTE + "TO1381.fasta";\r
 \r
-       public static final String test_alignment_input = AllTestSuit.TEST_DATA_PATH_ABSOLUTE\r
-                       + "TO1381.fasta.aln";\r
+       public static final String test_alignment_input = AllTestSuit.TEST_DATA_PATH_ABSOLUTE + "TO1381.fasta.aln";\r
 \r
-       public static final String test_input_real = AllTestSuit.TEST_DATA_PATH_ABSOLUTE\r
-                       + "50x500Protein.fasta";\r
+       public static final String test_input_real = AllTestSuit.TEST_DATA_PATH_ABSOLUTE + "50x500Protein.fasta";\r
 \r
-       public static final String test_input_dna = AllTestSuit.TEST_DATA_PATH_ABSOLUTE\r
-                       + "3dnaseqs.fasta";\r
+       public static final String test_input_dna = AllTestSuit.TEST_DATA_PATH_ABSOLUTE + "3dnaseqs.fasta";\r
 \r
-       public static final String test_input_large = AllTestSuit.TEST_DATA_PATH_ABSOLUTE\r
-                       + "1000x3000Dna.fasta";\r
+       public static final String test_input_large = AllTestSuit.TEST_DATA_PATH_ABSOLUTE + "1000x3000Dna.fasta";\r
 \r
 }\r

diff --git a/testsrc/compbio/ws/client/WSTesterTester.java b/testsrc/compbio/ws/client/WSTesterTester.java
index 22ad229..3671e1b 100644 (file)
--- a/testsrc/compbio/ws/client/WSTesterTester.java
+++ b/testsrc/compbio/ws/client/WSTesterTester.java
@@ -5,11 +5,8 @@ import static org.testng.Assert.fail;
 \r
 import java.io.PrintWriter;\r
 import java.net.ConnectException;\r
-\r
 import javax.xml.ws.WebServiceException;\r
-\r
 import org.testng.annotations.Test;\r
-\r
 import compbio.metadata.AllTestSuit;\r
 \r
 public class WSTesterTester {\r