X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FJvSwingUtilsTest.java;h=d46972ad478111f0f166c3341847060567283976;hb=a29326254cf21aa7633d1485c1621ffd0fee1097;hp=5a8fba71256481a506df7b6db81490cd65b90f7c;hpb=27b0df2e1c37d831297ae41e606a59a71567d12f;p=jalview.git diff --git a/test/jalview/gui/JvSwingUtilsTest.java b/test/jalview/gui/JvSwingUtilsTest.java index 5a8fba7..d46972a 100644 --- a/test/jalview/gui/JvSwingUtilsTest.java +++ b/test/jalview/gui/JvSwingUtilsTest.java @@ -20,8 +20,8 @@ */ package jalview.gui; +import static org.junit.Assert.assertTrue; import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertFalse; import javax.swing.JScrollBar; @@ -86,9 +86,17 @@ public class JvSwingUtilsTest JvSwingUtils.wrapTooltip(true, tip)); tip = "0123456789012345678901234567890123456789012345678901234567890"; // 61 - assertFalse(tip.equals(JvSwingUtils.wrapTooltip(false, tip))); - assertFalse(("" + tip + "").equals(JvSwingUtils + assertTrue(tip.equals(JvSwingUtils.wrapTooltip(false, tip))); + assertTrue((JvSwingUtils.HTML_PREFIX + tip + "") + .equals(JvSwingUtils .wrapTooltip(true, tip))); + +// was: +// +// assertFalse(tip.equals(JvSwingUtils.wrapTooltip(false, tip))); +// assertFalse(("" + tip + "").equals(JvSwingUtils +// .wrapTooltip(true, tip))); + } /** @@ -100,9 +108,23 @@ public class JvSwingUtilsTest public void testWrapTooltip_multilineShortText() { String tip = "Now is the winter of our discontent
Made glorious summer by this sun of York"; - assertEquals(tip, JvSwingUtils.wrapTooltip(false, tip)); + + // System.out.println( + // JvSwingUtils.wrapTooltip(false, "" + tip + "")); + // System.out.println(JvSwingUtils.wrapTooltip(true, tip)); + + assertEquals("" + tip + "", + JvSwingUtils.wrapTooltip(false, "" + tip + "")); assertEquals("" + tip + "", JvSwingUtils.wrapTooltip(true, tip)); + +// was: +// +// assertEquals(tip, JvSwingUtils.wrapTooltip(false, tip)); +// assertEquals("" + tip + "", +// JvSwingUtils.wrapTooltip(true, tip)); +// + } /** @@ -113,9 +135,9 @@ 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 = JvSwingUtils.HTML_PREFIX + tip + " "; + String expected = JvSwingUtils.HTML_PREFIX + tip + ""; assertEquals(expected, JvSwingUtils.wrapTooltip(true, tip)); - assertEquals(expected, JvSwingUtils.wrapTooltip(false, tip)); + assertEquals(tip, JvSwingUtils.wrapTooltip(false, tip)); } }