JAL-4217 move CommandsTest to testTask3 involving structure image export and random...

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

diff --git a/test/jalview/bin/CommandsTest.java b/test/jalview/bin/CommandsTest.java
index 66250d8..ecec67d 100644 (file)
--- a/test/jalview/bin/CommandsTest.java
+++ b/test/jalview/bin/CommandsTest.java
@@ -2,11 +2,14 @@ package jalview.bin;
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.swing.SwingUtilities;
+
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
@@ -46,9 +49,26 @@ public class CommandsTest
   }
 
   @AfterMethod(alwaysRun = true)
-  public void tearDown()
+  public void tearDown() 
   {
-    Desktop.closeDesktop();
+    try
+    {
+      // occasionally we are blocked by Jmol redraws
+      SwingUtilities.invokeAndWait(new Runnable()
+      {
+
+        @Override
+        public void run()
+        {
+          Desktop.closeDesktop();
+        }
+      });
+    } catch (Exception foo)
+    {
+      System.err.println("Failed during teardown with exception");
+      foo.printStackTrace();
+    }
+
   }
 
   public static void callJalviewMain(String[] args)
@@ -76,7 +96,7 @@ public class CommandsTest
   }
   */
 
-  @Test(groups = "Functional", dataProvider = "cmdLines")
+  @Test(groups = {"Functional","testTask3"}, dataProvider = "cmdLines")
   public void commandsOpenTest(String cmdLine, boolean cmdArgs,
           int numFrames, String[] sequences)
   {
@@ -127,7 +147,7 @@ public class CommandsTest
 
   @Test(
     groups =
-    { "Functional", "testTask1" },
+    { "Functional", "testTask3" },
     dataProvider = "structureImageOutputFiles")
   public void structureImageOutputTest(String cmdLine, String[] filenames)
           throws IOException
@@ -214,11 +234,11 @@ public class CommandsTest
                 + "--open=./examples/test_fab41.result/sample.a2m "
                 + "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
                 + "--structureimage=" + testfiles
-                + "/structureimage2.png --structureimagescale=1.5"
+                + "/structureimage2.png --scale=1.5 "
                 + "--open=./examples/test_fab41.result/sample.a2m "
                 + "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
                 + "--structureimage=" + testfiles
-                + "/structureimage3.png --structureimagescale=2.0",
+                + "/structureimage3.png --scale=2.0 ",
             new String[]
             { testfiles + "/structureimage1.png",
                 testfiles + "/structureimage2.png",
@@ -229,11 +249,11 @@ public class CommandsTest
                 + "--open=./examples/test_fab41.result/sample.a2m "
                 + "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
                 + "--structureimage=" + testfiles
-                + "/structureimage2.png --structureimagescale=1.5"
+                + "/structureimage2.png --scale=1.5 "
                 + "--open=./examples/test_fab41.result/sample.a2m "
                 + "--structure=./examples/test_fab41.result/test_fab41_unrelaxed_rank_1_model_3.pdb "
                 + "--structureimage=" + testfiles
-                + "/structureimage3.png --structureimagescale=2.0",
+                + "/structureimage3.png --scale=2.0 ",
             new String[]
             { testfiles + "/structureimage1.png",
                 testfiles + "/structureimage2.png",