Changeset 10899 in josm for trunk/test

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

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• JOSMFixture.java (modified) (2 diffs)
• MainTest.java (modified) (4 diffs)
• testutils/JOSMTestRules.java (modified) (2 diffs)
• tools/LoggingTest.java (added)

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

@@ -22 +22 @@
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -99 +100 @@
         Main.platform.preStartupHook();
 
-        Main.logLevel = 3;
+        Logging.setLogLevel(Logging.LEVEL_INFO);
         Main.pref.init(false);
         String url = Main.pref.get("osm-server.url");

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;
     }
 }

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -20 +20 @@
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MemoryManagerTest;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -182 +183 @@
         TimeZone.setDefault(DateUtils.UTC);
         // Set log level to info
-        Main.logLevel = 3;
+        Logging.setLogLevel(Logging.LEVEL_INFO);
 
         // Set up i18n