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 remote-tracking branch 'origin/tasks/JAL-3035_remove_dasobert_dependency' into...
[jalview.git]
/
test
/
jalview
/
gui
/
JvSwingUtilsTest.java
diff --git
a/test/jalview/gui/JvSwingUtilsTest.java
b/test/jalview/gui/JvSwingUtilsTest.java
index
fc186e5
..
5e65cc2
100644
(file)
--- a/
test/jalview/gui/JvSwingUtilsTest.java
+++ b/
test/jalview/gui/JvSwingUtilsTest.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-25,11
+25,19
@@
import static org.testng.AssertJUnit.assertFalse;
import javax.swing.JScrollBar;
import javax.swing.JScrollBar;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class JvSwingUtilsTest
{
import org.testng.annotations.Test;
public class JvSwingUtilsTest
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
@Test(groups = { "Functional" })
public void testGetScrollBarProportion()
{
@Test(groups = { "Functional" })
public void testGetScrollBarProportion()
{