From 4256eccf6ec646fed89f0e0931f8eb50ff97522c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 12 Nov 2017 19:07:11 +0000 Subject: [PATCH v1 1/6] MinimapDialogTest: switch all utility methods to non-static, requiring fewer arguments --- .../josm/gui/dialogs/MinimapDialogTest.java | 26 ++++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java index 2fbb0a1fb..2e7267c15 100644 --- a/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java +++ b/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java @@ -54,7 +54,8 @@ public class MinimapDialogTest { assertFalse(dlg.isVisible()); } - private static void assertSingleSelectedSourceLabel(JPopupMenu menu, String label) { + protected void assertSingleSelectedSourceLabel(String label) { + JPopupMenu menu = this.sourceButton.getPopupMenu(); boolean found = false; for (Component c: menu.getComponents()) { if (JPopupMenu.Separator.class.isInstance(c)) { @@ -72,7 +73,8 @@ public class MinimapDialogTest { assertTrue("Selected source not found in menu", found); } - private static JMenuItem getSourceMenuItemByLabel(JPopupMenu menu, String label) { + protected JMenuItem getSourceMenuItemByLabel(String label) { + JPopupMenu menu = this.sourceButton.getPopupMenu(); for (Component c: menu.getComponents()) { if (JPopupMenu.Separator.class.isInstance(c)) { break; @@ -98,7 +100,7 @@ public class MinimapDialogTest { this.slippyMap = (SlippyMapBBoxChooser) TestUtils.getPrivateField(this.minimap, "slippyMap"); this.sourceButton = (SourceButton) TestUtils.getPrivateField(this.slippyMap, "iSourceButton"); - // get dlg in a paintable state + // get minimap in a paintable state this.minimap.addNotify(); this.minimap.doLayout(); } @@ -149,10 +151,10 @@ public class MinimapDialogTest { assertEquals(0xffffffff, paintedSlippyMap.getRGB(0, 0)); - assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "White Tiles"); + this.assertSingleSelectedSourceLabel("White Tiles"); - getSourceMenuItemByLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles").doClick(); - assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles"); + this.getSourceMenuItemByLabel("Magenta Tiles").doClick(); + this.assertSingleSelectedSourceLabel("Magenta Tiles"); // call paint to trigger new tile fetch this.paintSlippyMap(); @@ -162,8 +164,8 @@ public class MinimapDialogTest { assertEquals(0xffff00ff, paintedSlippyMap.getRGB(0, 0)); - getSourceMenuItemByLabel(this.sourceButton.getPopupMenu(), "Green Tiles").doClick(); - assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Green Tiles"); + this.getSourceMenuItemByLabel("Green Tiles").doClick(); + this.assertSingleSelectedSourceLabel("Green Tiles"); // call paint to trigger new tile fetch this.paintSlippyMap(); @@ -186,7 +188,7 @@ public class MinimapDialogTest { this.setUpMiniMap(); - assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Green Tiles"); + this.assertSingleSelectedSourceLabel("Green Tiles"); // an initial paint operation is required to trigger the tile fetches this.paintSlippyMap(); @@ -197,8 +199,8 @@ public class MinimapDialogTest { assertEquals(0xff00ff00, paintedSlippyMap.getRGB(0, 0)); - getSourceMenuItemByLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles").doClick(); - assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles"); + this.getSourceMenuItemByLabel("Magenta Tiles").doClick(); + this.assertSingleSelectedSourceLabel("Magenta Tiles"); assertEquals("Magenta Tiles", Main.pref.get("slippy_map_chooser.mapstyle", "Fail")); } @@ -213,7 +215,7 @@ public class MinimapDialogTest { this.setUpMiniMap(); - assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "White Tiles"); + this.assertSingleSelectedSourceLabel("White Tiles"); // an initial paint operation is required to trigger the tile fetches this.paintSlippyMap(); -- 2.11.0