Ticket #15599: v1-0001-MinimapDialogTest-switch-all-utility-methods-to-n.patch

File v1-0001-MinimapDialogTest-switch-all-utility-methods-to-n.patch, 4.5 KB (added by ris, 8 years ago)

  • test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java 

    From 4256eccf6ec646fed89f0e0931f8eb50ff97522c Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
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 b public class MinimapDialogTest {  
    5454        assertFalse(dlg.isVisible());
    5555    }
    5656
    57     private static void assertSingleSelectedSourceLabel(JPopupMenu menu, String label) {
     57    protected void assertSingleSelectedSourceLabel(String label) {
     58        JPopupMenu menu = this.sourceButton.getPopupMenu();
    5859        boolean found = false;
    5960        for (Component c: menu.getComponents()) {
    6061            if (JPopupMenu.Separator.class.isInstance(c)) {
    … … public class MinimapDialogTest {  
    7273        assertTrue("Selected source not found in menu", found);
    7374    }
    7475
    75     private static JMenuItem getSourceMenuItemByLabel(JPopupMenu menu, String label) {
     76    protected JMenuItem getSourceMenuItemByLabel(String label) {
     77        JPopupMenu menu = this.sourceButton.getPopupMenu();
    7678        for (Component c: menu.getComponents()) {
    7779            if (JPopupMenu.Separator.class.isInstance(c)) {
    7880                break;
    … … public class MinimapDialogTest {  
    98100        this.slippyMap = (SlippyMapBBoxChooser) TestUtils.getPrivateField(this.minimap, "slippyMap");
    99101        this.sourceButton = (SourceButton) TestUtils.getPrivateField(this.slippyMap, "iSourceButton");
    100102
    101         // get dlg in a paintable state
     103        // get minimap in a paintable state
    102104        this.minimap.addNotify();
    103105        this.minimap.doLayout();
    104106    }
    … … public class MinimapDialogTest {  
    149151
    150152        assertEquals(0xffffffff, paintedSlippyMap.getRGB(0, 0));
    151153
    152         assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "White Tiles");
     154        this.assertSingleSelectedSourceLabel("White Tiles");
    153155
    154         getSourceMenuItemByLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles").doClick();
    155         assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles");
     156        this.getSourceMenuItemByLabel("Magenta Tiles").doClick();
     157        this.assertSingleSelectedSourceLabel("Magenta Tiles");
    156158        // call paint to trigger new tile fetch
    157159        this.paintSlippyMap();
    158160
    … … public class MinimapDialogTest {  
    162164
    163165        assertEquals(0xffff00ff, paintedSlippyMap.getRGB(0, 0));
    164166
    165         getSourceMenuItemByLabel(this.sourceButton.getPopupMenu(), "Green Tiles").doClick();
    166         assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Green Tiles");
     167        this.getSourceMenuItemByLabel("Green Tiles").doClick();
     168        this.assertSingleSelectedSourceLabel("Green Tiles");
    167169        // call paint to trigger new tile fetch
    168170        this.paintSlippyMap();
    169171
    … … public class MinimapDialogTest {  
    186188
    187189        this.setUpMiniMap();
    188190
    189         assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Green Tiles");
     191        this.assertSingleSelectedSourceLabel("Green Tiles");
    190192
    191193        // an initial paint operation is required to trigger the tile fetches
    192194        this.paintSlippyMap();
    … … public class MinimapDialogTest {  
    197199
    198200        assertEquals(0xff00ff00, paintedSlippyMap.getRGB(0, 0));
    199201
    200         getSourceMenuItemByLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles").doClick();
    201         assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles");
     202        this.getSourceMenuItemByLabel("Magenta Tiles").doClick();
     203        this.assertSingleSelectedSourceLabel("Magenta Tiles");
    202204
    203205        assertEquals("Magenta Tiles", Main.pref.get("slippy_map_chooser.mapstyle", "Fail"));
    204206    }
    … … public class MinimapDialogTest {  
    213215
    214216        this.setUpMiniMap();
    215217
    216         assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "White Tiles");
     218        this.assertSingleSelectedSourceLabel("White Tiles");
    217219
    218220        // an initial paint operation is required to trigger the tile fetches
    219221        this.paintSlippyMap();