Changeset 12620 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation

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/data/validation

Files:

• routines/DomainValidatorTest.java (modified) (6 diffs)
• routines/DomainValidatorTestIT.java (modified) (2 diffs)
• routines/RegexValidatorTest.java (modified) (2 diffs)
• tests/MapCSSTagCheckerTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTest.java

@@ -30 +30 @@
 import org.junit.Before;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.validation.routines.DomainValidator.ArrayType;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -342 +342 @@
         } catch (IllegalArgumentException iae) {
             // expected
-            Main.debug(iae.getMessage());
+            Logging.debug(iae.getMessage());
         }
         try {
@@ -349 +349 @@
         } catch (IllegalArgumentException iae) {
             // expected
-            Main.debug(iae.getMessage());
+            Logging.debug(iae.getMessage());
         }
         try {
@@ -356 +356 @@
         } catch (IllegalArgumentException iae) {
             // expected
-            Main.debug(iae.getMessage());
+            Logging.debug(iae.getMessage());
         }
         try {
@@ -363 +363 @@
         } catch (IllegalArgumentException iae) {
             // expected
-            Main.debug(iae.getMessage());
+            Logging.debug(iae.getMessage());
         }
     }
@@ -431 +431 @@
         } catch (IllegalStateException ise) {
             // expected
-            Main.debug(ise.getMessage());
+            Logging.debug(ise.getMessage());
         }
     }

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java

@@ -48 +48 @@
 
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -84 +84 @@
             timestamp = download(txtFile, "http://data.iana.org/TLD/tlds-alpha-by-domain.txt", 0L);
         } catch (ConnectException e) {
-            Main.error(e);
+            Logging.error(e);
             // Try again one more time in case of random network issue
             timestamp = download(txtFile, "http://data.iana.org/TLD/tlds-alpha-by-domain.txt", 0L);

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/RegexValidatorTest.java

@@ -27 +27 @@
 
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -244 +244 @@
         } catch (PatternSyntaxException e) {
             // expected
-            Main.debug(e.getMessage());
+            Logging.debug(e.getMessage());
         }
     }

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -19 +19 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -38 +37 @@
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -185 +185 @@
         }
         for (String msg : assertionErrors) {
-            Main.error(msg);
+            Logging.error(msg);
         }
         assertTrue("not all assertions included in the tests are met", assertionErrors.isEmpty());