Ticket #15599: v1-0002-MinimapDialogTest-only-construct-slippyMapTasksFi.patch

File v1-0002-MinimapDialogTest-only-construct-slippyMapTasksFi.patch, 3.7 KB (added by ris, 8 years ago)

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

    From babb73275412a7c50081d0d2526330b39c373e65 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 12 Nov 2017 19:26:00 +0000
Subject: [PATCH v1 2/6] MinimapDialogTest: only construct
 slippyMapTasksFinished once per test

---
 .../josm/gui/dialogs/MinimapDialogTest.java             | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java
index 2e7267c15..e302a7c51 100644
    a b public class MinimapDialogTest {  
    9090    protected MinimapDialog minimap;
    9191    protected SlippyMapBBoxChooser slippyMap;
    9292    protected SourceButton sourceButton;
     93    protected Callable<Boolean> slippyMapTasksFinished;
    9394
    9495    protected static BufferedImage paintedSlippyMap;
    9596
    … … public class MinimapDialogTest {  
    100101        this.slippyMap = (SlippyMapBBoxChooser) TestUtils.getPrivateField(this.minimap, "slippyMap");
    101102        this.sourceButton = (SourceButton) TestUtils.getPrivateField(this.slippyMap, "iSourceButton");
    102103
     104        this.slippyMapTasksFinished = () -> !this.slippyMap.getTileController().getTileLoader().hasOutstandingTasks();
     105
    103106        // get minimap in a paintable state
    104107        this.minimap.addNotify();
    105108        this.minimap.doLayout();
    … … public class MinimapDialogTest {  
    127130        this.slippyMap.paintAll(g);
    128131    }
    129132
    130     protected Callable<Boolean> slippyMapTasksFinished() {
    131         return () -> !this.slippyMap.getTileController().getTileLoader().hasOutstandingTasks();
    132     }
    133 
    134133    /**
    135134     * Tests to switch imagery source.
    136135     * @throws Exception if any error occurs
    … … public class MinimapDialogTest {  
    145144        // an initial paint operation is required to trigger the tile fetches
    146145        this.paintSlippyMap();
    147146
    148         Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished());
     147        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished);
    149148
    150149        this.paintSlippyMap();
    151150
    … … public class MinimapDialogTest {  
    158157        // call paint to trigger new tile fetch
    159158        this.paintSlippyMap();
    160159
    161         Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished());
     160        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished);
    162161
    163162        this.paintSlippyMap();
    164163
    … … public class MinimapDialogTest {  
    169168        // call paint to trigger new tile fetch
    170169        this.paintSlippyMap();
    171170
    172         Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished());
     171        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished);
    173172
    174173        this.paintSlippyMap();
    175174
    … … public class MinimapDialogTest {  
    193192        // an initial paint operation is required to trigger the tile fetches
    194193        this.paintSlippyMap();
    195194
    196         Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished());
     195        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished);
    197196
    198197        this.paintSlippyMap();
    199198
    … … public class MinimapDialogTest {  
    220219        // an initial paint operation is required to trigger the tile fetches
    221220        this.paintSlippyMap();
    222221
    223         Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished());
     222        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished);
    224223
    225224        this.paintSlippyMap();
    226225