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 features/JAL-2295setChimeraAttributes
[jalview.git]
/
test
/
jalview
/
ext
/
rbvi
/
chimera
/
ChimeraCommandsTest.java
diff --git
a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
index
f24ff22
..
70c6922
100644
(file)
--- a/
test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
+++ b/
test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
@@
-23,16
+23,27
@@
package jalview.ext.rbvi.chimera;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
+import jalview.gui.JvOptionPane;
+
import java.awt.Color;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.awt.Color;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class ChimeraCommandsTest
{
import org.testng.annotations.Test;
public class ChimeraCommandsTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
@Test(groups = { "Functional" })
public void testBuildColourCommands()
{
@Test(groups = { "Functional" })
public void testBuildColourCommands()
{