Ticket #15539: v1-0002-MiniMapDialogTest-move-minimap-setup-routine-to-shar.patch

File v1-0002-MiniMapDialogTest-move-minimap-setup-routine-to-shar.patch, 8.6 KB (added by ris, 8 years ago)

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

    From 5e9a42471cdc9734fffb222b3137808753209a25 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 11 Nov 2017 12:15:38 +0000
Subject: [PATCH 2/6] MiniMapDialogTest: move minimap setup routine to shared
 method

---
 .../josm/gui/dialogs/MinimapDialogTest.java        | 100 ++++++++++-----------
 1 file changed, 46 insertions(+), 54 deletions(-)

diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java
index 4c704bdae..ba4fafc53 100644
    a b public class MinimapDialogTest {  
    7979        return null;
    8080    }
    8181
     82    protected MinimapDialog minimap;
     83    protected SlippyMapBBoxChooser slippyMap;
     84    protected SourceButton sourceButton;
     85
     86    protected void setUpMiniMap() throws Exception {
     87        this.minimap = new MinimapDialog();
     88        this.minimap.setSize(300, 200);
     89        this.minimap.showDialog();
     90        this.slippyMap = (SlippyMapBBoxChooser) TestUtils.getPrivateField(this.minimap, "slippyMap");
     91        this.sourceButton = (SourceButton) TestUtils.getPrivateField(this.slippyMap, "iSourceButton");
     92
     93        // get dlg in a paintable state
     94        this.minimap.addNotify();
     95        this.minimap.doLayout();
     96    }
     97
    8298    /**
    8399     * Tests to switch imagery source.
    84100     * @throws Exception if any error occurs
    … … public class MinimapDialogTest {  
    88104        // relevant prefs starting out empty, should choose the first source and have shown download area enabled
    89105        // (not that there's a data layer for it to use)
    90106
    91         MinimapDialog dlg = new MinimapDialog();
    92         dlg.setSize(300, 200);
    93         dlg.showDialog();
    94         SlippyMapBBoxChooser slippyMap = (SlippyMapBBoxChooser) TestUtils.getPrivateField(dlg, "slippyMap");
    95         SourceButton sourceButton = (SourceButton) TestUtils.getPrivateField(slippyMap, "iSourceButton");
    96 
    97         // get dlg in a paintable state
    98         dlg.addNotify();
    99         dlg.doLayout();
     107        this.setUpMiniMap();
    100108
    101109        BufferedImage image = new BufferedImage(
    102             slippyMap.getSize().width,
    103             slippyMap.getSize().height,
     110            this.slippyMap.getSize().width,
     111            this.slippyMap.getSize().height,
    104112            BufferedImage.TYPE_INT_RGB
    105113        );
    106114
    107115        Graphics2D g = image.createGraphics();
    108116        // an initial paint operation is required to trigger the tile fetches
    109         slippyMap.paintAll(g);
     117        this.slippyMap.paintAll(g);
    110118        g.setBackground(Color.BLUE);
    111119        g.clearRect(0, 0, image.getWidth(), image.getHeight());
    112120        g.dispose();
    … … public class MinimapDialogTest {  
    114122        Thread.sleep(500);
    115123
    116124        g = image.createGraphics();
    117         slippyMap.paintAll(g);
     125        this.slippyMap.paintAll(g);
    118126
    119127        assertEquals(0xffffffff, image.getRGB(0, 0));
    120128
    121         assertSingleSelectedSourceLabel(sourceButton.getPopupMenu(), "White Tiles");
     129        assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "White Tiles");
    122130
    123         getSourceMenuItemByLabel(sourceButton.getPopupMenu(), "Magenta Tiles").doClick();
    124         assertSingleSelectedSourceLabel(sourceButton.getPopupMenu(), "Magenta Tiles");
     131        getSourceMenuItemByLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles").doClick();
     132        assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles");
    125133        // call paint to trigger new tile fetch
    126         slippyMap.paintAll(g);
     134        this.slippyMap.paintAll(g);
    127135
    128136        // clear background to a recognizably "wrong" color & dispose our Graphics2D so we don't risk carrying over
    129137        // any state
    … … public class MinimapDialogTest {  
    134142        Thread.sleep(500);
    135143
    136144        g = image.createGraphics();
    137         slippyMap.paintAll(g);
     145        this.slippyMap.paintAll(g);
    138146
    139147        assertEquals(0xffff00ff, image.getRGB(0, 0));
    140148
    141         getSourceMenuItemByLabel(sourceButton.getPopupMenu(), "Green Tiles").doClick();
    142         assertSingleSelectedSourceLabel(sourceButton.getPopupMenu(), "Green Tiles");
     149        getSourceMenuItemByLabel(this.sourceButton.getPopupMenu(), "Green Tiles").doClick();
     150        assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Green Tiles");
    143151        // call paint to trigger new tile fetch
    144         slippyMap.paintAll(g);
     152        this.slippyMap.paintAll(g);
    145153
    146154        g.setBackground(Color.BLUE);
    147155        g.clearRect(0, 0, image.getWidth(), image.getHeight());
    … … public class MinimapDialogTest {  
    150158        Thread.sleep(500);
    151159
    152160        g = image.createGraphics();
    153         slippyMap.paintAll(g);
     161        this.slippyMap.paintAll(g);
    154162
    155163        assertEquals(0xff00ff00, image.getRGB(0, 0));
    156164
    … … public class MinimapDialogTest {  
    158166    }
    159167
    160168    @Test
    161     public void testSourcePrefObeyed() throws Throwable {
     169    public void testSourcePrefObeyed() throws Exception {
    162170        Main.pref.put("slippy_map_chooser.mapstyle", "Green Tiles");
    163171
    164         MinimapDialog dlg = new MinimapDialog();
    165         dlg.setSize(300, 200);
    166         dlg.showDialog();
    167         SlippyMapBBoxChooser slippyMap = (SlippyMapBBoxChooser) TestUtils.getPrivateField(dlg, "slippyMap");
    168         SourceButton sourceButton = (SourceButton) TestUtils.getPrivateField(slippyMap, "iSourceButton");
    169 
    170         // get dlg in a paintable state
    171         dlg.addNotify();
    172         dlg.doLayout();
     172        this.setUpMiniMap();
    173173
    174         assertSingleSelectedSourceLabel(sourceButton.getPopupMenu(), "Green Tiles");
     174        assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Green Tiles");
    175175
    176176        BufferedImage image = new BufferedImage(
    177             slippyMap.getSize().width,
    178             slippyMap.getSize().height,
     177            this.slippyMap.getSize().width,
     178            this.slippyMap.getSize().height,
    179179            BufferedImage.TYPE_INT_RGB
    180180        );
    181181
    182182        Graphics2D g = image.createGraphics();
    183183        // an initial paint operation is required to trigger the tile fetches
    184         slippyMap.paintAll(g);
     184        this.slippyMap.paintAll(g);
    185185        g.setBackground(Color.BLUE);
    186186        g.clearRect(0, 0, image.getWidth(), image.getHeight());
    187187        g.dispose();
    … … public class MinimapDialogTest {  
    189189        Thread.sleep(500);
    190190
    191191        g = image.createGraphics();
    192         slippyMap.paintAll(g);
     192        this.slippyMap.paintAll(g);
    193193
    194194        assertEquals(0xff00ff00, image.getRGB(0, 0));
    195195
    196         getSourceMenuItemByLabel(sourceButton.getPopupMenu(), "Magenta Tiles").doClick();
    197         assertSingleSelectedSourceLabel(sourceButton.getPopupMenu(), "Magenta Tiles");
     196        getSourceMenuItemByLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles").doClick();
     197        assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles");
    198198
    199199        assertEquals("Magenta Tiles", Main.pref.get("slippy_map_chooser.mapstyle", "Fail"));
    200200    }
    201201
    202202    @Test
    203     public void testSourcePrefInvalid() throws Throwable {
     203    public void testSourcePrefInvalid() throws Exception {
    204204        Main.pref.put("slippy_map_chooser.mapstyle", "Hooloovoo Tiles");
    205205
    206         MinimapDialog dlg = new MinimapDialog();
    207         dlg.setSize(300, 200);
    208         dlg.showDialog();
    209         SlippyMapBBoxChooser slippyMap = (SlippyMapBBoxChooser) TestUtils.getPrivateField(dlg, "slippyMap");
    210         SourceButton sourceButton = (SourceButton) TestUtils.getPrivateField(slippyMap, "iSourceButton");
    211 
    212         // get dlg in a paintable state
    213         dlg.addNotify();
    214         dlg.doLayout();
     206        this.setUpMiniMap();
    215207
    216         assertSingleSelectedSourceLabel(sourceButton.getPopupMenu(), "White Tiles");
     208        assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "White Tiles");
    217209
    218210        BufferedImage image = new BufferedImage(
    219             slippyMap.getSize().width,
    220             slippyMap.getSize().height,
     211            this.slippyMap.getSize().width,
     212            this.slippyMap.getSize().height,
    221213            BufferedImage.TYPE_INT_RGB
    222214        );
    223215
    224216        Graphics2D g = image.createGraphics();
    225217        // an initial paint operation is required to trigger the tile fetches
    226         slippyMap.paintAll(g);
     218        this.slippyMap.paintAll(g);
    227219        g.setBackground(Color.BLUE);
    228220        g.clearRect(0, 0, image.getWidth(), image.getHeight());
    229221        g.dispose();
    … … public class MinimapDialogTest {  
    231223        Thread.sleep(500);
    232224
    233225        g = image.createGraphics();
    234         slippyMap.paintAll(g);
     226        this.slippyMap.paintAll(g);
    235227
    236228        assertEquals(0xffffffff, image.getRGB(0, 0));
    237229    }