Merge branch 'develop' into trialMerge

[jalview.git] / test / jalview / gui / ProgressBarTest.java

diff --git a/test/jalview/gui/ProgressBarTest.java b/test/jalview/gui/ProgressBarTest.java
index 4346420..a1715e9 100644 (file)
--- a/test/jalview/gui/ProgressBarTest.java
+++ b/test/jalview/gui/ProgressBarTest.java
@@ -31,11 +31,19 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class ProgressBarTest
 {
 
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   private JPanel statusPanel;
 
   private JLabel statusBar;