Merge branch 'develop' into feature/JAL-2759

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

diff --git a/test/jalview/gui/JvSwingUtilsTest.java b/test/jalview/gui/JvSwingUtilsTest.java
index f2ba731..5e65cc2 100644 (file)
--- a/test/jalview/gui/JvSwingUtilsTest.java
+++ b/test/jalview/gui/JvSwingUtilsTest.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -25,11 +25,19 @@ import static org.testng.AssertJUnit.assertFalse;
 
 import javax.swing.JScrollBar;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class JvSwingUtilsTest
 {
 
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   @Test(groups = { "Functional" })
   public void testGetScrollBarProportion()
   {