JAL-2326 added setup method for JvOptionPane in all Jalveiw test classes to enable...

[jalview.git] / test / jalview / controller / AlignViewControllerTest.java

diff --git a/test/jalview/controller/AlignViewControllerTest.java b/test/jalview/controller/AlignViewControllerTest.java
index c88c878..7ac1452 100644 (file)
--- a/test/jalview/controller/AlignViewControllerTest.java
+++ b/test/jalview/controller/AlignViewControllerTest.java
@@ -32,16 +32,26 @@ import jalview.datamodel.SequenceFeature;
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
+import jalview.gui.JvOptionPane;
 import jalview.io.FileLoader;
 import jalview.io.FormatAdapter;
 
 import java.util.Arrays;
 import java.util.BitSet;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class AlignViewControllerTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   @Test(groups = "Functional")
   public void testFindColumnsWithFeature()
   {
@@ -169,8 +179,8 @@ public class AlignViewControllerTest
     AlignViewControllerI avc = af.avc;
 
     avc.markHighlightedColumns(false, false, false);
-    assertEquals("Didn't select highlighted columns", af.getViewport()
-            .getColumnSelection().getSelectedRanges(),
-            Arrays.asList(new int[][] { { 1, 13 } }));
+    assertTrue("Didn't select highlighted columns", Arrays.deepEquals(af
+            .getViewport().getColumnSelection().getSelectedRanges()
+            .toArray(), new int[][] { { 1, 14 } }));
   }
 }