JAL - 3690 AlignCalc rebuilt - FutureTask-based manager

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

diff --git a/test/jalview/workers/AlignCalcManagerTest.java b/test/jalview/workers/AlignCalcManagerTest.java
index acb9f33..f0fcdba 100644 (file)
--- a/test/jalview/workers/AlignCalcManagerTest.java
+++ b/test/jalview/workers/AlignCalcManagerTest.java
@@ -25,6 +25,7 @@ import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
 
 import jalview.api.AlignCalcManagerI;
+import jalview.api.AlignCalcManagerI2;
 import jalview.api.AlignCalcWorkerI;
 import jalview.api.FeatureRenderer;
 import jalview.datamodel.Alignment;
@@ -34,15 +35,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;
 
   /**
@@ -53,7 +64,7 @@ public class AlignCalcManagerTest
   @Test(groups = "Functional")
   public void testRemoveWorkerForAnnotation()
   {
-    AlignCalcManagerI acm = alignFrame.getViewport().getCalcManager();
+    AlignCalcManagerI2 acm = alignFrame.getViewport().getCalcManager();
     final AlignmentAnnotation ann1 = new AlignmentAnnotation("Ann1",
             "desc", new Annotation[] {});
     final AlignmentAnnotation ann2 = new AlignmentAnnotation("Ann2",
@@ -86,8 +97,7 @@ public class AlignCalcManagerTest
       }
     }
 
-    List<AlignCalcWorkerI> workers = acm
-            .getRegisteredWorkersOfClass(worker1.getClass());
+    List<AlignCalcWorkerI> workers = acm.getWorkersOfClass(worker1.getClass());
     assertEquals(2, workers.size());
     assertTrue(workers.contains(worker1));
     assertTrue(workers.contains(worker2));
@@ -98,10 +108,8 @@ public class AlignCalcManagerTest
      * remove workers for ann2 (there aren't any)
      */
     acm.removeWorkerForAnnotation(ann2);
-    assertTrue(acm.getRegisteredWorkersOfClass(worker1.getClass())
-            .contains(worker1));
-    assertTrue(acm.getRegisteredWorkersOfClass(worker1.getClass())
-            .contains(worker2));
+    assertTrue(acm.getWorkersOfClass(worker1.getClass()).contains(worker1));
+    assertTrue(acm.getWorkersOfClass(worker1.getClass()).contains(worker2));
     assertFalse(acm.isDisabled(worker1));
     assertFalse(acm.isDisabled(worker2));
 
@@ -110,10 +118,8 @@ public class AlignCalcManagerTest
      * - should delete worker1 but not worker2
      */
     acm.removeWorkerForAnnotation(ann1);
-    assertEquals(1, acm.getRegisteredWorkersOfClass(worker1.getClass())
-            .size());
-    assertTrue(acm.getRegisteredWorkersOfClass(worker1.getClass())
-            .contains(worker2));
+    assertEquals(1, acm.getWorkersOfClass(worker1.getClass()).size());
+    assertTrue(acm.getWorkersOfClass(worker1.getClass()).contains(worker2));
     assertFalse(acm.isDisabled(worker1));
     assertFalse(acm.isDisabled(worker2));
   }