Index: trunk/test/unit/org/openstreetmap/josm/MainTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/MainTest.java	(revision 14120)
+++ trunk/test/unit/org/openstreetmap/josm/MainTest.java	(revision 14121)
@@ -2,12 +2,7 @@
 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,5 +11,4 @@
 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,40 +34,4 @@
         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);
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/io/NetworkManagerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/NetworkManagerTest.java	(revision 14121)
+++ trunk/test/unit/org/openstreetmap/josm/io/NetworkManagerTest.java	(revision 14121)
@@ -0,0 +1,67 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link NetworkManager} class.
+ */
+public class NetworkManagerTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().platform().https().devAPI().main().projection();
+
+    /**
+     * Unit test of {@link NetworkManager#addNetworkError},
+     *              {@link NetworkManager#getNetworkErrors} and
+     *              {@link NetworkManager#clearNetworkErrors}.
+     * @throws MalformedURLException if any error occurs
+     */
+    @Test
+    public void testNetworkErrors() throws MalformedURLException {
+        NetworkManager.clearNetworkErrors();
+        assertTrue(NetworkManager.getNetworkErrors().isEmpty());
+        NetworkManager.addNetworkError("http://url1", new Exception("exception_1"));
+        NetworkManager.addNetworkError(new URL("http://url2"), new Exception("exception_2"));
+        Map<String, Throwable> errors = NetworkManager.getNetworkErrors();
+        assertEquals(2, errors.size());
+        assertEquals("exception_1", errors.get("http://url1").getMessage());
+        assertEquals("exception_2", errors.get("http://url2").getMessage());
+        NetworkManager.clearNetworkErrors();
+        assertTrue(NetworkManager.getNetworkErrors().isEmpty());
+    }
+
+    /**
+     * Unit test of {@link NetworkManager#setOffline} and {@link NetworkManager#getOfflineResources}.
+     */
+    @Test
+    public void testOfflineRessources() {
+        NetworkManager.setOnline(OnlineResource.ALL);
+        assertTrue(NetworkManager.getOfflineResources().isEmpty());
+        assertFalse(NetworkManager.isOffline(OnlineResource.JOSM_WEBSITE));
+        NetworkManager.setOffline(OnlineResource.JOSM_WEBSITE);
+        assertTrue(NetworkManager.isOffline(OnlineResource.JOSM_WEBSITE));
+        NetworkManager.setOnline(OnlineResource.JOSM_WEBSITE);
+        assertFalse(NetworkManager.isOffline(OnlineResource.JOSM_WEBSITE));
+        NetworkManager.setOffline(OnlineResource.ALL);
+        assertTrue(NetworkManager.isOffline(OnlineResource.JOSM_WEBSITE));
+        assertTrue(NetworkManager.isOffline(OnlineResource.OSM_API));
+        NetworkManager.setOnline(OnlineResource.ALL);
+    }
+}