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

Timestamp:

2018-03-25T18:53:04+02:00 (7 years ago)

Author:

Don-vip

Message:

introduce PrimitiveRenderer to replace OsmPrimitivRenderer (now deprecated). Change NameFormatter API to support IPrimitive instead of OsmPrimitive. Enhances interfaces in consequence.

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/mapmode/DrawActionTest.java (modified) (3 diffs)
• data/osm/DefaultNameFormatterTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -44 +44 @@
     /**
      * Non regression test case for bug #12011.
-     * Add a new node in the middle of way then undo. The rendering of the node, selected, must not cause any crash in OsmPrimitivRenderer.
+     * Add a new node in the middle of way then undo. The rendering of the node, selected, must not cause any crash in PrimitiveRenderer.
      * @throws SecurityException see {@link Class#getDeclaredField} for details
      * @throws NoSuchFieldException see {@link Class#getDeclaredField} for details
@@ -82 +82 @@
 
             JList<OsmPrimitive> lstPrimitives = new JList<>();
-            OsmPrimitivRenderer renderer = new OsmPrimitivRenderer();
+            PrimitiveRenderer renderer = new PrimitiveRenderer();
 
             assertEquals(3, w.getNodesCount());

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

@@ -63 +63 @@
         TaggingPresets.addTaggingPresets(TaggingPresetReader.readAll("http://localhost:" + wireMockRule.port() + "/" + source, true));
 
-        Comparator<Relation> comparator = DefaultNameFormatter.getInstance().getRelationComparator();
+        Comparator<IRelation> comparator = DefaultNameFormatter.getInstance().getRelationComparator();
 
         try (InputStream is = TestUtils.getRegressionDataStream(9632, "data.osm.zip")) {