Changeset 33104 in osm for applications/editors

Timestamp:

2016-12-10T01:36:20+01:00 (8 years ago)

Author:

donvip

Message:

unit test fixes

Location:

applications/editors/josm/plugins/pt_assistant

Files:

• src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java (modified) (2 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java

@@ -360 +360 @@
         List<Way> resultList = new ArrayList<>();
 
-        List<OsmPrimitive> nodeReferrers = node.getReferrers();
-
-        for (OsmPrimitive referrer : nodeReferrers) {
-            if (referrer.getType().equals(OsmPrimitiveType.WAY)) {
-                Way neighborWay = (Way) referrer;
-                if (neighborWay != way && containsWay(neighborWay)) {
-                    resultList.add(neighborWay);
+        if (node != null) {
+            List<OsmPrimitive> nodeReferrers = node.getReferrers();
+
+            for (OsmPrimitive referrer : nodeReferrers) {
+                if (referrer.getType().equals(OsmPrimitiveType.WAY)) {
+                    Way neighborWay = (Way) referrer;
+                    if (neighborWay != way && containsWay(neighborWay)) {
+                        resultList.add(neighborWay);
+                    }
                 }
             }

applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/RoadTypeTestTest.java

@@ -11 +11 @@
 import org.junit.Test;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -39 +38 @@
         for (TestError e: errors) {
             assertEquals(e.getCode(), PTAssistantValidatorTest.ERROR_CODE_ROAD_TYPE);
-            @SuppressWarnings("unchecked")
-            List<OsmPrimitive> highlighted = (List<OsmPrimitive>) e.getHighlighted();
-            Way way = (Way) highlighted.get(0);
+            Way way = (Way) e.getHighlighted().iterator().next();
             assertTrue(way.getId() == 8169083 || way.getId() == 8034569);
         }