Merge branch 'features/JAL-2473_set-minimium-dimensions' into develop

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

diff --git a/test/jalview/controller/AlignViewControllerTest.java b/test/jalview/controller/AlignViewControllerTest.java
index e2c2130..2e89b0e 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.DataSourceType;
 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()
   {
@@ -163,7 +173,7 @@ public class AlignViewControllerTest
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
             "seq1 aMMMaaaaaaaaaaaaaaaa\n" + "seq2 aaaMMMMMMMaaaaaaaaaa\n"
                     + "seq3 aaaaaaaaaaMMMMMaaaaa\n"
-                    + "seq4 aaaaaaaaaaaaaaaaaaaa\n", FormatAdapter.PASTE);
+                    + "seq4 aaaaaaaaaaaaaaaaaaaa\n", DataSourceType.PASTE);
 
     SearchResultsI sr = new SearchResults();
     SequenceI[] sqs = af.getViewport().getAlignment().getSequencesArray();