Changeset 10899 in josm for trunk/test/unit/org/openstreetmap/josm/MainTest.java

Timestamp:

2016-08-25T23:21:10+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13318 - Clean up program startup (parameters, logging) - patch by michael2402 - gsoc-core

File:

• trunk/test/unit/org/openstreetmap/josm/MainTest.java (modified) (4 diffs)

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

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -12 +11 @@
 import org.junit.Test;
 import org.openstreetmap.josm.Main.DownloadParamType;
-import org.openstreetmap.josm.gui.MainApplication;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -43 +41 @@
 
     /**
-     * Unit test of {@code Main#preConstructorInit}.
-     */
-    @Test
-    public void testPreConstructorInit() {
-        Main.preConstructorInit(MainApplication.buildCommandLineArgumentMap(new String[0]));
-        Main.preConstructorInit(MainApplication.buildCommandLineArgumentMap(new String[]{"--geometry=400x300+10+5", "--no-maximize"}));
-        //assertEquals(new WindowGeometry(new Point(10, 5), new Dimension(400, 300)), Main.geometry); // FIXME see #12927
-    }
-
-    /**
      * Unit tests on log messages.
      */
@@ -78 +66 @@
         assertTrue(warnings.contains("W: Warning message on one line"));
         assertTrue(warnings.contains("W: First line of warning message on several lines"));
-
-        int defaultLevel = Main.logLevel;
-
-        // Check levels
-        Main.logLevel = 5;
-        assertTrue(Main.isTraceEnabled());
-        assertTrue(Main.isDebugEnabled());
-
-        Main.logLevel = 4;
-        assertFalse(Main.isTraceEnabled());
-        assertTrue(Main.isDebugEnabled());
-
-        Main.logLevel = 3;
-        assertFalse(Main.isTraceEnabled());
-        assertFalse(Main.isDebugEnabled());
-
-        Main.logLevel = defaultLevel;
     }
 }