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

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/test/unit/org/openstreetmap/josm/gui

Files:

• conflict/pair/nodes/NodeListMergeModelTest.java (modified) (3 diffs)
• conflict/pair/tags/TagMergeItemTest.java (modified) (4 diffs)
• preferences/map/TaggingPresetPreferenceTestIT.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java

@@ -20 +20 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.testutils.DatasetFactory;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -360 +360 @@
         } catch (IllegalArgumentException e) {
             // OK
-            Main.trace(e);
+            Logging.trace(e);
         }
 
@@ -368 +368 @@
         } catch (IllegalArgumentException e) {
             // OK
-            Main.trace(e);
+            Logging.trace(e);
         }
     }

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java

@@ -8 +8 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -94 +94 @@
         } catch (IllegalArgumentException e) {
             // OK
-            Main.trace(e);
+            Logging.trace(e);
         }
     }
@@ -141 +141 @@
         } catch (IllegalStateException e) {
             // OK
-            Main.trace(e);
+            Logging.trace(e);
         }
     }
@@ -154 +154 @@
         } catch (IllegalArgumentException e) {
             // OK
-            Main.trace(e);
+            Logging.trace(e);
         }
     }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 import org.xml.sax.SAXException;
 
@@ -67 +68 @@
             } catch (IOException e) {
                 try {
-                    Main.warn(e);
+                    Logging.warn(e);
                     // try again in case of temporary network error
                     testPresets(allMessages, source);
@@ -95 +96 @@
         Collection<TaggingPreset> presets = TaggingPresetReader.readAll(source.url, true);
         assertFalse(presets.isEmpty());
-        Collection<String> errorsAndWarnings = Main.getLastErrorAndWarnings();
+        Collection<String> errorsAndWarnings = Logging.getLastErrorAndWarnings();
         boolean error = false;
         for (String message : errorsAndWarnings) {
@@ -108 +109 @@
         System.out.println(error ? " => KO" : " => OK");
         if (error) {
-            Main.clearLastErrorAndWarnings();
+            Logging.clearLastErrorAndWarnings();
         }
     }