X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FJvSwingUtilsTest.java;h=e6f40419e809b2126ed254a9611e953404e5d23d;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=fc186e5a5fe3775c2274acc25676e31ae3699acc;hpb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;p=jalview.git
diff --git a/test/jalview/gui/JvSwingUtilsTest.java b/test/jalview/gui/JvSwingUtilsTest.java
index fc186e5..e6f4041 100644
--- 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.
*
@@ -25,11 +25,19 @@ import static org.testng.AssertJUnit.assertFalse;
import javax.swing.JScrollBar;
+import org.testng.annotations.BeforeClass;
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()
{
@@ -79,8 +87,8 @@ public class JvSwingUtilsTest
tip = "0123456789012345678901234567890123456789012345678901234567890"; // 61
assertFalse(tip.equals(JvSwingUtils.wrapTooltip(false, tip)));
- assertFalse(("" + tip + "").equals(JvSwingUtils
- .wrapTooltip(true, tip)));
+ assertFalse(("" + tip + "")
+ .equals(JvSwingUtils.wrapTooltip(true, tip)));
}
/**
@@ -105,8 +113,8 @@ public class JvSwingUtilsTest
public void testWrapTooltip_longText()
{
String tip = "Now is the winter of our discontent made glorious summer by this sun of York";
- String expected = ""
- + tip + "
";
+ String expected = ""
+ + "" + tip + "
";
assertEquals("" + expected + "",
JvSwingUtils.wrapTooltip(true, tip));
assertEquals(expected, JvSwingUtils.wrapTooltip(false, tip));