Changeset 14121 in josm for trunk/test

Timestamp:

2018-08-11T17:51:12+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate all Main methods related to network features. New NetworkManager class

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• MainTest.java (modified) (3 diffs)
• io/NetworkManagerTest.java (added)

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

@@ -2 +2 @@
 package org.openstreetmap.josm;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
 
 import org.junit.Rule;
@@ -16 +11 @@
 import org.openstreetmap.josm.Main.InitializationTask;
 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
-import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -40 +34 @@
         Main.preConstructorInit();
         assertNotNull(CoordinateFormatManager.getDefaultFormat());
-    }
-
-    /**
-     * Unit test of {@link Main#addNetworkError}, {@link Main#getNetworkErrors} and {@link Main#clearNetworkErrors}.
-     * @throws MalformedURLException if any error occurs
-     */
-    @Test
-    public void testNetworkErrors() throws MalformedURLException {
-        Main.clearNetworkErrors();
-        assertTrue(Main.getNetworkErrors().isEmpty());
-        Main.addNetworkError("http://url1", new Exception("exception_1"));
-        Main.addNetworkError(new URL("http://url2"), new Exception("exception_2"));
-        Map<String, Throwable> errors = Main.getNetworkErrors();
-        assertEquals(2, errors.size());
-        assertEquals("exception_1", errors.get("http://url1").getMessage());
-        assertEquals("exception_2", errors.get("http://url2").getMessage());
-        Main.clearNetworkErrors();
-        assertTrue(Main.getNetworkErrors().isEmpty());
-    }
-
-    /**
-     * Unit test of {@link Main#setOffline} and {@link Main#getOfflineResources}.
-     */
-    @Test
-    public void testOfflineRessources() {
-        Main.setOnline(OnlineResource.ALL);
-        assertTrue(Main.getOfflineResources().isEmpty());
-        assertFalse(Main.isOffline(OnlineResource.JOSM_WEBSITE));
-        Main.setOffline(OnlineResource.JOSM_WEBSITE);
-        assertTrue(Main.isOffline(OnlineResource.JOSM_WEBSITE));
-        Main.setOnline(OnlineResource.JOSM_WEBSITE);
-        assertFalse(Main.isOffline(OnlineResource.JOSM_WEBSITE));
-        Main.setOffline(OnlineResource.ALL);
-        assertTrue(Main.isOffline(OnlineResource.JOSM_WEBSITE));
-        assertTrue(Main.isOffline(OnlineResource.OSM_API));
-        Main.setOnline(OnlineResource.ALL);
     }