Merge branch 'feature/JAL-3468featureDescriptionEllipsis' into develop

[jalview.git] / test / MCview / ResidueTest.java

diff --git a/test/MCview/ResidueTest.java b/test/MCview/ResidueTest.java
index e50267f..0acd681 100644 (file)
--- a/test/MCview/ResidueTest.java
+++ b/test/MCview/ResidueTest.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * 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.
  * 
@@ -23,13 +23,23 @@ package MCview;
 import static org.testng.AssertJUnit.assertNull;
 import static org.testng.AssertJUnit.assertSame;
 
+import jalview.gui.JvOptionPane;
+
 import java.util.Vector;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class ResidueTest
 {
 
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   @Test(groups = { "Functional" })
   public void testFindAtom()
   {