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 'merge/JAL-3609_and_JAL-3608' into releases/Release_2_11_1_Branch
[jalview.git]
/
test
/
jalview
/
gui
/
JvSwingUtilsTest.java
diff --git
a/test/jalview/gui/JvSwingUtilsTest.java
b/test/jalview/gui/JvSwingUtilsTest.java
index
f1358d8
..
22d8a9d
100644
(file)
--- a/
test/jalview/gui/JvSwingUtilsTest.java
+++ b/
test/jalview/gui/JvSwingUtilsTest.java
@@
-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()
{
@@
-105,7
+113,7
@@
public class JvSwingUtilsTest
public void testWrapTooltip_longText()
{
String tip = "Now is the winter of our discontent made glorious summer by this sun of York";
public void testWrapTooltip_longText()
{
String tip = "Now is the winter of our discontent made glorious summer by this sun of York";
- String expected = "<style> p.ttip {width: 350; text-align: justify; word-wrap: break-word;}</style><p class=\"ttip\">"
+ String expected = "<style> p.ttip {width: 350; text-align: left; word-wrap: break-word;}</style><p class=\"ttip\">"
+ tip + "</p>";
assertEquals("<html>" + expected + "</html>",
JvSwingUtils.wrapTooltip(true, tip));
+ tip + "</p>";
assertEquals("<html>" + expected + "</html>",
JvSwingUtils.wrapTooltip(true, tip));