Changeset 16657 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2020-06-16T18:58:46+02:00 (4 years ago)

Author:

simon04

Message:

Fix typos in Javadoc

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/osm/DataSetMergerTest.java (modified) (1 diff)
• testutils/JOSMTestRules.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

@@ -74 +74 @@
 
     /**
-     * two identical nodes, even in id and version. No confict expected.
+     * two identical nodes, even in id and version. No conflict expected.
      *
      * Can happen if data is loaded in two layers and then merged from one layer

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

@@ -490 +490 @@
         TimeZone.setDefault(DateUtils.UTC);
 
-        // Force log handers to reacquire reference to (junit's fake) stdout/stderr
+        // Force log handlers to reacquire reference to (junit's fake) stdout/stderr
         for (Handler handler : Logging.getLogger().getHandlers()) {
             if (handler instanceof Logging.ReacquiringConsoleHandler) {
@@ -700 +700 @@
 
     /**
-     * The junit timeout statement has problems when switchting timezones. This one does not.
+     * The junit timeout statement has problems when switching timezones. This one does not.
      * @author Michael Zangl
      */