Merge branch 'features/JAL-2326_JOptionPane-refactoring' into develop

[jalview.git] / test / jalview / analysis / ConservationTest.java

diff --git a/test/jalview/analysis/ConservationTest.java b/test/jalview/analysis/ConservationTest.java
index 39eb309..fb58655 100644 (file)
--- a/test/jalview/analysis/ConservationTest.java
+++ b/test/jalview/analysis/ConservationTest.java
@@ -25,16 +25,26 @@ import static org.testng.Assert.assertTrue;
 
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
+import jalview.gui.JvOptionPane;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class ConservationTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   @Test(groups = "Functional")
   public void testRecordConservation()
   {