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

Timestamp:

2018-08-05T21:43:31+02:00 (6 years ago)

Author:

Don-vip

Message:

drop unitils library. It was only added to avoid implementing hashCode/equals in template engine and search classes

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• plugins/PluginHandlerTestIT.java (modified) (2 diffs)
• tools/template_engine/TemplateParserTest.java (modified) (7 diffs)

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java

@@ -16 +16 @@
 import java.util.stream.Collectors;
 
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.junit.Rule;
 import org.junit.Test;
@@ -72 +71 @@
         }
 
-        MapUtils.debugPrint(System.out, null, invalidManifestEntries);
-        MapUtils.debugPrint(System.out, null, loadingExceptions);
-        MapUtils.debugPrint(System.out, null, layerExceptions);
+        debugPrint(invalidManifestEntries);
+        debugPrint(loadingExceptions);
+        debugPrint(layerExceptions);
         String msg = Arrays.toString(invalidManifestEntries.entrySet().toArray()) + '\n' +
                      Arrays.toString(loadingExceptions.entrySet().toArray()) + '\n' +
                      Arrays.toString(layerExceptions.entrySet().toArray());
         assertTrue(msg, invalidManifestEntries.isEmpty() && loadingExceptions.isEmpty() && layerExceptions.isEmpty());
+    }
+
+    private static void debugPrint(Map<String, ?> invalidManifestEntries) {
+        System.out.println(invalidManifestEntries.entrySet()
+                .stream()
+                .map(e -> e.getKey() + "=\"" + e.getValue() + "\"")
+                .collect(Collectors.joining(", ")));
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools.template_engine;
+
+import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
@@ -16 +18 @@
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
 import org.openstreetmap.josm.testutils.DatasetFactory;
-import org.unitils.reflectionassert.ReflectionAssert;
 
 /**
@@ -38 +39 @@
     public void testEmpty() throws ParseError {
         TemplateParser parser = new TemplateParser("");
-        ReflectionAssert.assertReflectionEquals(new StaticText(""), parser.parse());
+        assertEquals(new StaticText(""), parser.parse());
     }
 
@@ -48 +49 @@
     public void testVariable() throws ParseError {
         TemplateParser parser = new TemplateParser("abc{var}\\{ef\\$\\{g");
-        ReflectionAssert.assertReflectionEquals(CompoundTemplateEntry.fromArray(new StaticText("abc"),
+        assertEquals(CompoundTemplateEntry.fromArray(new StaticText("abc"),
                 new Variable("var"), new StaticText("{ef${g")), parser.parse());
     }
@@ -63 +64 @@
             new Variable("name"),
             new Variable("desc")));
-        ReflectionAssert.assertReflectionEquals(condition, parser.parse());
+        assertEquals(condition, parser.parse());
     }
 
@@ -77 +78 @@
                 new Variable("name"),
                 new Variable("desc")));
-        ReflectionAssert.assertReflectionEquals(condition, parser.parse());
+        assertEquals(condition, parser.parse());
     }
 
@@ -96 +97 @@
                 new SearchExpressionCondition(compile("admin_level = 4"), new StaticText("NUTS 2")),
                 new Variable("admin_level")));
-        ReflectionAssert.assertReflectionEquals(condition, parser.parse());
+        TemplateEntry parse = parser.parse();
+        assertEquals(condition, parse);
     }