From 8e566fb53ad6f8ae7c12c4c1cb640215edea4810 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Mon, 23 Jul 2018 11:53:22 +0100 Subject: [PATCH] JAL-3032 test updates to match change to implementation --- test/jalview/gui/JvSwingUtilsTest.java | 4 ++-- test/jalview/gui/PopupMenuTest.java | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/test/jalview/gui/JvSwingUtilsTest.java b/test/jalview/gui/JvSwingUtilsTest.java index 5e65cc2..61c5c9b 100644 --- a/test/jalview/gui/JvSwingUtilsTest.java +++ b/test/jalview/gui/JvSwingUtilsTest.java @@ -113,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)); diff --git a/test/jalview/gui/PopupMenuTest.java b/test/jalview/gui/PopupMenuTest.java index 6f60588..6d0422d 100644 --- a/test/jalview/gui/PopupMenuTest.java +++ b/test/jalview/gui/PopupMenuTest.java @@ -196,8 +196,12 @@ public class PopupMenuTest testee.configureReferenceAnnotationsMenu(menu, seqs); assertTrue(menu.isEnabled()); String s = MessageManager.getString("label.add_annotations_for"); - String expected = "

" - + s + "
Jmol/secondary structure
PDB/Temp

"; + // String expected = "

" + // + s + "
Jmol/secondary structure
PDB/Temp

"; + String expected = "" + + "
" + s + + "
Jmol/secondary structure
PDB/Temp
"; assertEquals(expected, menu.getToolTipText()); } @@ -219,8 +223,11 @@ public class PopupMenuTest testee.configureReferenceAnnotationsMenu(menu, seqs); assertTrue(menu.isEnabled()); String s = MessageManager.getString("label.add_annotations_for"); - String expected = "

" - + s + "
Jmol/secondary structure
PDB/Temp

"; + // String expected = "

" + // + s + "
Jmol/secondary structure
PDB/Temp

"; + String expected = "" + + "
Add annotations for
Jmol/secondary structure
PDB/Temp
"; assertEquals(expected, menu.getToolTipText()); } -- 1.7.10.2