X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FJvSwingUtilsTest.java;h=d46972ad478111f0f166c3341847060567283976;hb=447c5c1b22bd12a78730640321264fb38c39ec7b;hp=fc186e5a5fe3775c2274acc25676e31ae3699acc;hpb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;p=jalview.git diff --git a/test/jalview/gui/JvSwingUtilsTest.java b/test/jalview/gui/JvSwingUtilsTest.java index fc186e5..d46972a 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. * @@ -20,16 +20,24 @@ */ 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; +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() { @@ -78,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))); + } /** @@ -92,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)); +// + } /** @@ -105,10 +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 = "

" - + tip + "

"; - assertEquals("" + expected + "", + String expected = JvSwingUtils.HTML_PREFIX + tip + ""; + assertEquals(expected, JvSwingUtils.wrapTooltip(true, tip)); - assertEquals(expected, JvSwingUtils.wrapTooltip(false, tip)); + assertEquals(tip, JvSwingUtils.wrapTooltip(false, tip)); } }