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-2759 Move isVisible to use cursor
[jalview.git]
/
test
/
jalview
/
ext
/
jmol
/
JmolViewerTest.java
diff --git
a/test/jalview/ext/jmol/JmolViewerTest.java
b/test/jalview/ext/jmol/JmolViewerTest.java
index
1100000
..
792f7ad
100644
(file)
--- a/
test/jalview/ext/jmol/JmolViewerTest.java
+++ b/
test/jalview/ext/jmol/JmolViewerTest.java
@@
-24,8
+24,10
@@
import static org.testng.AssertJUnit.assertTrue;
import jalview.api.structures.JalviewStructureDisplayI;
import jalview.bin.Cache;
import jalview.api.structures.JalviewStructureDisplayI;
import jalview.bin.Cache;
+import jalview.bin.Jalview;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
+import jalview.gui.JvOptionPane;
import jalview.gui.Preferences;
import jalview.gui.StructureViewer;
import jalview.gui.StructureViewer.ViewerType;
import jalview.gui.Preferences;
import jalview.gui.StructureViewer;
import jalview.gui.StructureViewer.ViewerType;
@@
-39,14
+41,20
@@
import org.testng.annotations.Test;
public class JmolViewerTest
{
public class JmolViewerTest
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
/**
* @throws java.lang.Exception
*/
@BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
/**
* @throws java.lang.Exception
*/
@BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
- jalview.bin.Jalview.main(new String[] {
- "-noquestionnaire -nonews -props",
+ Jalview.main(new String[] { "-noquestionnaire", "-nonews", "-props",
"test/jalview/ext/rbvi/chimera/testProps.jvprops" });
}
"test/jalview/ext/rbvi/chimera/testProps.jvprops" });
}
@@
-107,4
+115,6
@@
public class JmolViewerTest
}
}
}
}
}
}
+
+
}
}