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 'Jalview-JS/jim/JAL-3253-JAL-3418' into Jalview-JS/JAL-3253-applet
[jalview.git]
/
test
/
jalview
/
gui
/
PaintRefresherTest.java
diff --git
a/test/jalview/gui/PaintRefresherTest.java
b/test/jalview/gui/PaintRefresherTest.java
index
52eadcb
..
5167eb3
100644
(file)
--- a/
test/jalview/gui/PaintRefresherTest.java
+++ b/
test/jalview/gui/PaintRefresherTest.java
@@
-36,11
+36,20
@@
import java.util.Map;
import javax.swing.JPanel;
import org.testng.annotations.AfterMethod;
import javax.swing.JPanel;
import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
public class PaintRefresherTest
{
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
public class PaintRefresherTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
// TODO would prefer PaintRefresher to be a single rather than static
@BeforeMethod(alwaysRun = true)
public void setUp()
// TODO would prefer PaintRefresher to be a single rather than static
@BeforeMethod(alwaysRun = true)
public void setUp()
@@
-48,7
+57,7
@@
public class PaintRefresherTest
PaintRefresher.components.clear();
}
PaintRefresher.components.clear();
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void tearDown()
{
PaintRefresher.components.clear();
public void tearDown()
{
PaintRefresher.components.clear();