Changeset 14125 in josm for trunk/test/unit/org

Timestamp:

2018-08-11T19:01:26+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - extract lifecycle Main classes to a new lifecycle SPI

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• JOSMFixture.java (modified) (1 diff)
• MainTest.java (modified) (2 diffs)
• spi/lifecycle (added)
• spi/lifecycle/LifecycleTest.java (added)

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -151 +151 @@
     }
 
-    @SuppressWarnings("deprecation")
     private void setupGUI() {
         JOSMTestRules.cleanLayerEnvironment();

trunk/test/unit/org/openstreetmap/josm/MainTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm;
 
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main.InitStatusListener;
-import org.openstreetmap.josm.Main.InitializationTask;
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -35 +31 @@
         assertNotNull(CoordinateFormatManager.getDefaultFormat());
     }
-
-    private static class InitStatusListenerStub implements InitStatusListener {
-
-        boolean updated;
-        boolean finished;
-
-        @Override
-        public Object updateStatus(String event) {
-            updated = true;
-            return null;
-        }
-
-        @Override
-        public void finish(Object status) {
-            finished = true;
-        }
-    }
-
-    /**
-     * Unit test of {@link Main#setInitStatusListener}.
-     */
-    @Test
-    public void testSetInitStatusListener() {
-        InitStatusListenerStub listener = new InitStatusListenerStub();
-        Main.setInitStatusListener(listener);
-        assertFalse(listener.updated);
-        assertFalse(listener.finished);
-        new InitializationTask("", () -> { }).call();
-        assertTrue(listener.updated);
-        assertTrue(listener.finished);
-    }
 }