Merge branch 'develop' into trialMerge

[jalview.git] / test / jalview / ext / jmol / JmolVsJalviewPDBParserEndToEndTest.java

diff --git a/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java b/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
index 6baa1dd..d285b04 100644 (file)
--- a/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
+++ b/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
@@ -21,6 +21,7 @@
 package jalview.ext.jmol;
 
 import jalview.datamodel.SequenceI;
+import jalview.gui.JvOptionPane;
 import jalview.io.DataSourceType;
 
 import java.io.File;
@@ -29,6 +30,8 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.Vector;
 
+import org.testng.annotations.BeforeClass;
+
 import MCview.PDBfile;
 
 /**
@@ -43,6 +46,13 @@ import MCview.PDBfile;
 public class JmolVsJalviewPDBParserEndToEndTest
 {
 
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   public static void main(String[] args)
   {
     if (args == null || args[0] == null)