X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FPopupMenuTest.java;h=335240b3d9a05e8128b2dfab41c990a5ea321ec6;hb=136c0793b90b72b928c4d77dc109dd5c644e00d3;hp=922d45758d1b2c784e40848d15fc3de0141716a8;hpb=8677e6e34e291edc58c1da2fc9c958473754143f;p=jalview.git diff --git a/test/jalview/gui/PopupMenuTest.java b/test/jalview/gui/PopupMenuTest.java index 922d457..335240b 100644 --- a/test/jalview/gui/PopupMenuTest.java +++ b/test/jalview/gui/PopupMenuTest.java @@ -321,7 +321,8 @@ public class PopupMenuTest assertEquals(4, showOptions.length); // includes 'All' and separator assertEquals(4, hideOptions.length); - assertEquals("All", ((JMenuItem) showOptions[0]).getText()); + String all = MessageManager.getString("label.all"); + assertEquals(all, ((JMenuItem) showOptions[0]).getText()); assertTrue(showOptions[1] instanceof JPopupMenu.Separator); assertEquals(JSeparator.HORIZONTAL, ((JSeparator) showOptions[1]).getOrientation()); @@ -331,7 +332,7 @@ public class PopupMenuTest assertEquals("SSP", ((JMenuItem) showOptions[3]).getText()); assertEquals("JPred", ((JMenuItem) showOptions[3]).getToolTipText()); - assertEquals("All", ((JMenuItem) hideOptions[0]).getText()); + assertEquals(all, ((JMenuItem) hideOptions[0]).getText()); assertTrue(hideOptions[1] instanceof JPopupMenu.Separator); assertEquals(JSeparator.HORIZONTAL, ((JSeparator) hideOptions[1]).getOrientation()); @@ -383,12 +384,13 @@ public class PopupMenuTest assertEquals(2, showOptions.length); // includes 'All' and separator assertEquals(4, hideOptions.length); - assertEquals("All", ((JMenuItem) showOptions[0]).getText()); + String all = MessageManager.getString("label.all"); + assertEquals(all, ((JMenuItem) showOptions[0]).getText()); assertTrue(showOptions[1] instanceof JPopupMenu.Separator); assertEquals(JSeparator.HORIZONTAL, ((JSeparator) showOptions[1]).getOrientation()); - assertEquals("All", ((JMenuItem) hideOptions[0]).getText()); + assertEquals(all, ((JMenuItem) hideOptions[0]).getText()); assertTrue(hideOptions[1] instanceof JPopupMenu.Separator); assertEquals(JSeparator.HORIZONTAL, ((JSeparator) hideOptions[1]).getOrientation()); @@ -440,7 +442,8 @@ public class PopupMenuTest assertEquals(4, showOptions.length); // includes 'All' and separator assertEquals(2, hideOptions.length); - assertEquals("All", ((JMenuItem) showOptions[0]).getText()); + String all = MessageManager.getString("label.all"); + assertEquals(all, ((JMenuItem) showOptions[0]).getText()); assertTrue(showOptions[1] instanceof JPopupMenu.Separator); assertEquals(JSeparator.HORIZONTAL, ((JSeparator) showOptions[1]).getOrientation()); @@ -450,7 +453,7 @@ public class PopupMenuTest assertEquals("Temp", ((JMenuItem) showOptions[3]).getText()); assertEquals("PDB2", ((JMenuItem) showOptions[3]).getToolTipText()); - assertEquals("All", ((JMenuItem) hideOptions[0]).getText()); + assertEquals(all, ((JMenuItem) hideOptions[0]).getText()); assertTrue(hideOptions[1] instanceof JPopupMenu.Separator); assertEquals(JSeparator.HORIZONTAL, ((JSeparator) hideOptions[1]).getOrientation());