JAL-1805 modified test setup's so the are ran for groups which requires them

[jalview.git] / test / jalview / bin / CommandLineOperations.java

diff --git a/test/jalview/bin/CommandLineOperations.java b/test/jalview/bin/CommandLineOperations.java
index 8bd484a..adc24db 100644 (file)
--- a/test/jalview/bin/CommandLineOperations.java
+++ b/test/jalview/bin/CommandLineOperations.java
@@ -109,7 +109,6 @@ public class CommandLineOperations
     {
       BufferedReader outputReader = new BufferedReader(
               new InputStreamReader(ls2_proc.getInputStream()));
-
       BufferedReader errorReader = new BufferedReader(
               new InputStreamReader(ls2_proc.getErrorStream()));
       worker = new Worker(ls2_proc);
@@ -127,20 +126,20 @@ public class CommandLineOperations
     return worker;
   }
 
-  @BeforeTest
+  @BeforeTest(alwaysRun = true)
   public void initialize()
   {
     new CommandLineOperations();
   }
 
   
-  @BeforeTest
+  @BeforeTest(alwaysRun = true)
   public void setUpForHeadlessCommandLineInputOperations()
           throws IOException
   {
     String cmds = "nodisplay -open examples/uniref50.fa -sortbytree -props FILE -colour zappo "
             + "-jabaws http://www.compbio.dundee.ac.uk/jabaws -nosortbytree -dasserver nickname=www.test.com "
-            + "-features examples/uniref50_test_features -annotations examples/uniref50_test_annot -tree examples/uniref50_test_tree";
+            + "-features examples/testdata/plantfdx.features -annotations examples/testdata/plantfdx.annotations -tree examples/testdata/uniref50_test_tree";
     Worker worker = jalviewDesktopRunner(true, cmds, 9000);
     String ln = null;
     while ((ln = worker.getOutputReader().readLine()) != null)
@@ -150,7 +149,7 @@ public class CommandLineOperations
     }
   }
 
-  @BeforeTest
+  @BeforeTest(alwaysRun = true)
   public void setUpForCommandLineInputOperations() throws IOException
   {
     String cmds = "-open examples/uniref50.fa -noquestionnaire -nousagestats";
@@ -232,13 +231,14 @@ public class CommandLineOperations
         { "CMD [-dasserver nickname=www.test.com] executed successfully!",
             "Failed command : -dasserver nickname=www.test.com" },
         {
-            "CMD [-features examples/uniref50_test_features]  executed successfully!",
-            "Failed command : -features examples/uniref50_test_features" },
+            "CMD [-features examples/testdata/plantfdx.features]  executed successfully!",
+            "Failed command : -features examples/testdata/plantfdx.features" },
+        {
+            "CMD [-annotations examples/testdata/plantfdx.annotations] executed successfully!",
+            "Failed command : -annotations examples/testdata/plantfdx.annotations" },
         {
-            "CMD [-annotations examples/uniref50_test_annot] executed successfully!",
-            "Failed command : -annotations examples/uniref50_test_annot" },
-        { "CMD [-tree examples/uniref50_test_tree] executed successfully!",
-            "Failed command : -tree examples/uniref50_test_tree" },
+            "CMD [-tree examples/testdata/uniref50_test_tree] executed successfully!",
+            "Failed command : -tree examples/testdata/uniref50_test_tree" },
         // non headless mode input operations
         { "CMD [-nousagestats] executed successfully!",
             "Failed command : -nousagestats" },