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
JAL-4313 Clamp start and end ranges to array size
[jalview.git]
/
test
/
jalview
/
ext
/
rbvi
/
chimera
/
ChimeraConnect.java
diff --git
a/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
b/test/jalview/ext/rbvi/chimera/ChimeraConnect.java
index
a5393ec
..
b07a622
100644
(file)
--- a/
test/jalview/ext/rbvi/chimera/ChimeraConnect.java
+++ b/
test/jalview/ext/rbvi/chimera/ChimeraConnect.java
@@
-23,6
+23,9
@@
package jalview.ext.rbvi.chimera;
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertTrue;
+import jalview.gui.JvOptionPane;
+
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import ext.edu.ucsf.rbvi.strucviz2.ChimeraManager;
import org.testng.annotations.Test;
import ext.edu.ucsf.rbvi.strucviz2.ChimeraManager;
@@
-31,13
+34,20
@@
import ext.edu.ucsf.rbvi.strucviz2.StructureManager;
public class ChimeraConnect
{
public class ChimeraConnect
{
- @Test(groups = { "Functional" })
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
+ @Test(groups = { "External" })
public void testLaunchAndExit()
{
final StructureManager structureManager = new StructureManager(true);
ChimeraManager cm = new ChimeraManager(structureManager);
assertTrue("Couldn't launch chimera",
public void testLaunchAndExit()
{
final StructureManager structureManager = new StructureManager(true);
ChimeraManager cm = new ChimeraManager(structureManager);
assertTrue("Couldn't launch chimera",
- cm.launchChimera(StructureManager.getChimeraPaths()));
+ cm.launchChimera(StructureManager.getChimeraPaths(false)));
assertTrue(cm.isChimeraLaunched()); // Chimera process is alive
// int n=0;
// not sure of the point of this is unless the tester is loading models
assertTrue(cm.isChimeraLaunched()); // Chimera process is alive
// int n=0;
// not sure of the point of this is unless the tester is loading models