Changeset 13564 in josm for trunk/test


Ignore:
Timestamp:
2018-03-25T18:53:04+02:00 (17 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java

    r13338 r13564  
    2424import org.openstreetmap.josm.gui.MainApplication;
    2525import org.openstreetmap.josm.gui.MapFrame;
    26 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
     26import org.openstreetmap.josm.gui.PrimitiveRenderer;
    2727import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    2828import org.openstreetmap.josm.testutils.JOSMTestRules;
     
    4444    /**
    4545     * Non regression test case for bug #12011.
    46      * Add a new node in the middle of way then undo. The rendering of the node, selected, must not cause any crash in OsmPrimitivRenderer.
     46     * Add a new node in the middle of way then undo. The rendering of the node, selected, must not cause any crash in PrimitiveRenderer.
    4747     * @throws SecurityException see {@link Class#getDeclaredField} for details
    4848     * @throws NoSuchFieldException see {@link Class#getDeclaredField} for details
     
    8282
    8383            JList<OsmPrimitive> lstPrimitives = new JList<>();
    84             OsmPrimitivRenderer renderer = new OsmPrimitivRenderer();
     84            PrimitiveRenderer renderer = new PrimitiveRenderer();
    8585
    8686            assertEquals(3, w.getNodesCount());
  • trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java

    r13413 r13564  
    6363        TaggingPresets.addTaggingPresets(TaggingPresetReader.readAll("http://localhost:" + wireMockRule.port() + "/" + source, true));
    6464
    65         Comparator<Relation> comparator = DefaultNameFormatter.getInstance().getRelationComparator();
     65        Comparator<IRelation> comparator = DefaultNameFormatter.getInstance().getRelationComparator();
    6666
    6767        try (InputStream is = TestUtils.getRegressionDataStream(9632, "data.osm.zip")) {
Note: See TracChangeset for help on using the changeset viewer.