Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java	(revision 13169)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java	(revision 13172)
@@ -55,5 +55,6 @@
     }
 
-    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()) {
@@ -73,5 +74,6 @@
     }
 
-    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)) {
@@ -89,4 +91,5 @@
     protected SlippyMapBBoxChooser slippyMap;
     protected SourceButton sourceButton;
+    protected Callable<Boolean> slippyMapTasksFinished;
 
     protected static BufferedImage paintedSlippyMap;
@@ -99,5 +102,7 @@
         this.sourceButton = (SourceButton) TestUtils.getPrivateField(this.slippyMap, "iSourceButton");
 
-        // get dlg in a paintable state
+        this.slippyMapTasksFinished = () -> !this.slippyMap.getTileController().getTileLoader().hasOutstandingTasks();
+
+        // get minimap in a paintable state
         this.minimap.addNotify();
         this.minimap.doLayout();
@@ -126,8 +131,4 @@
     }
 
-    protected Callable<Boolean> slippyMapTasksFinished() {
-        return () -> !this.slippyMap.getTileController().getTileLoader().hasOutstandingTasks();
-    }
-
     /**
      * Tests to switch imagery source.
@@ -144,5 +145,5 @@
         this.paintSlippyMap();
 
-        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished());
+        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished);
 
         this.paintSlippyMap();
@@ -150,12 +151,12 @@
         assertEquals(0xffffffff, paintedSlippyMap.getRGB(0, 0));
 
-        assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "White Tiles");
-
-        getSourceMenuItemByLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles").doClick();
-        assertSingleSelectedSourceLabel(this.sourceButton.getPopupMenu(), "Magenta Tiles");
+        this.assertSingleSelectedSourceLabel("White Tiles");
+
+        this.getSourceMenuItemByLabel("Magenta Tiles").doClick();
+        this.assertSingleSelectedSourceLabel("Magenta Tiles");
         // call paint to trigger new tile fetch
         this.paintSlippyMap();
 
-        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished());
+        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished);
 
         this.paintSlippyMap();
@@ -163,10 +164,10 @@
         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();
 
-        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished());
+        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished);
 
         this.paintSlippyMap();
@@ -187,10 +188,10 @@
         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();
 
-        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished());
+        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished);
 
         this.paintSlippyMap();
@@ -198,6 +199,6 @@
         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"));
@@ -214,10 +215,10 @@
         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();
 
-        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished());
+        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished);
 
         this.paintSlippyMap();