JAL-629 Removed --headless to fix CommandsTest

[jalview.git] / test / jalview / workers / AlignCalcManagerTest.java

diff --git a/test/jalview/workers/AlignCalcManagerTest.java b/test/jalview/workers/AlignCalcManagerTest.java
index acb9f33..a523f38 100644 (file)
--- a/test/jalview/workers/AlignCalcManagerTest.java
+++ b/test/jalview/workers/AlignCalcManagerTest.java
@@ -34,15 +34,25 @@ import jalview.datamodel.Annotation;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
+import jalview.gui.JvOptionPane;
 
 import java.util.Collections;
 import java.util.List;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class AlignCalcManagerTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   private AlignFrame alignFrame;
 
   /**
@@ -54,10 +64,10 @@ public class AlignCalcManagerTest
   public void testRemoveWorkerForAnnotation()
   {
     AlignCalcManagerI acm = alignFrame.getViewport().getCalcManager();
-    final AlignmentAnnotation ann1 = new AlignmentAnnotation("Ann1",
-            "desc", new Annotation[] {});
-    final AlignmentAnnotation ann2 = new AlignmentAnnotation("Ann2",
-            "desc", new Annotation[] {});
+    final AlignmentAnnotation ann1 = new AlignmentAnnotation("Ann1", "desc",
+            new Annotation[] {});
+    final AlignmentAnnotation ann2 = new AlignmentAnnotation("Ann2", "desc",
+            new Annotation[] {});
 
     /*
      * make two workers for ann1, one deletable, one not
@@ -110,8 +120,8 @@ public class AlignCalcManagerTest
      * - should delete worker1 but not worker2
      */
     acm.removeWorkerForAnnotation(ann1);
-    assertEquals(1, acm.getRegisteredWorkersOfClass(worker1.getClass())
-            .size());
+    assertEquals(1,
+            acm.getRegisteredWorkersOfClass(worker1.getClass()).size());
     assertTrue(acm.getRegisteredWorkersOfClass(worker1.getClass())
             .contains(worker2));
     assertFalse(acm.isDisabled(worker1));
@@ -157,8 +167,9 @@ public class AlignCalcManagerTest
   @BeforeMethod(alwaysRun = true)
   public void setUp()
   {
-    AlignmentI al = new Alignment(new SequenceI[] { new Sequence("Seq1",
-            "ABC") });
+    AlignmentI al = new Alignment(
+            new SequenceI[]
+            { new Sequence("Seq1", "ABC") });
     al.setDataset(null);
     alignFrame = new AlignFrame(al, 3, 1);
   }