git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into trialMerge
[jalview.git]
/
test
/
jalview
/
datamodel
/
AlignmentAnnotationTests.java
diff --git
a/test/jalview/datamodel/AlignmentAnnotationTests.java
b/test/jalview/datamodel/AlignmentAnnotationTests.java
index
fb02166
..
a2c6256
100644
(file)
--- a/
test/jalview/datamodel/AlignmentAnnotationTests.java
+++ b/
test/jalview/datamodel/AlignmentAnnotationTests.java
@@
-24,13
+24,23
@@
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNull;
import jalview.analysis.AlignSeq;
import static org.testng.AssertJUnit.assertNull;
import jalview.analysis.AlignSeq;
+import jalview.gui.JvOptionPane;
import jalview.io.AppletFormatAdapter;
import jalview.io.FileFormat;
import jalview.io.AppletFormatAdapter;
import jalview.io.FileFormat;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class AlignmentAnnotationTests
{
import org.testng.annotations.Test;
public class AlignmentAnnotationTests
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
@Test(groups = { "Functional" })
public void testCopyConstructor()
{
@Test(groups = { "Functional" })
public void testCopyConstructor()
{