Changeset 12620 in josm for trunk/test/unit/org/openstreetmap/josm/actions

Timestamp:

2017-08-22T22:26:32+02:00 (8 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate all Main logging methods and introduce suitable replacements in Logging for most of them

File:

• trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandlerTest.java

@@ -15 +15 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -120 +120 @@
     @Test
     public void testRunExceptionFuture() {
-        Main.clearLastErrorAndWarnings();
+        Logging.clearLastErrorAndWarnings();
         new PostDownloadHandler(null, newFuture("testRunExceptionFuture")).run();
-        assertTrue(Main.getLastErrorAndWarnings().toString(),
-                Main.getLastErrorAndWarnings().contains("E: java.util.concurrent.ExecutionException: testRunExceptionFuture"));
+        assertTrue(Logging.getLastErrorAndWarnings().toString(),
+                Logging.getLastErrorAndWarnings().contains("E: java.util.concurrent.ExecutionException: testRunExceptionFuture"));
     }
 
@@ -131 +131 @@
     @Test
     public void testRunNoError() {
-        Main.clearLastErrorAndWarnings();
+        Logging.clearLastErrorAndWarnings();
         new PostDownloadHandler(newTask(Collections.emptyList()), newFuture(null)).run();
-        assertTrue(Main.getLastErrorAndWarnings().toString(), Main.getLastErrorAndWarnings().isEmpty());
+        assertTrue(Logging.getLastErrorAndWarnings().toString(), Logging.getLastErrorAndWarnings().isEmpty());
     }
 
@@ -141 +141 @@
     @Test
     public void testRunOneError() {
-        Main.clearLastErrorAndWarnings();
+        Logging.clearLastErrorAndWarnings();
         new PostDownloadHandler(newTask(Collections.singletonList(new Object())), newFuture(null)).run();
-        assertTrue(Main.getLastErrorAndWarnings().toString(), Main.getLastErrorAndWarnings().isEmpty());
+        assertTrue(Logging.getLastErrorAndWarnings().toString(), Logging.getLastErrorAndWarnings().isEmpty());
     }
 
@@ -151 +151 @@
     @Test
     public void testRunMultipleErrors() {
-        Main.clearLastErrorAndWarnings();
+        Logging.clearLastErrorAndWarnings();
         new PostDownloadHandler(newTask(Arrays.asList("foo", new Exception("bar"), new Object())), newFuture(null)).run();
-        assertTrue(Main.getLastErrorAndWarnings().toString(),
-                Main.getLastErrorAndWarnings().contains("E: java.lang.Exception: bar"));
+        assertTrue(Logging.getLastErrorAndWarnings().toString(),
+                Logging.getLastErrorAndWarnings().contains("E: java.lang.Exception: bar"));
     }
 }