Changeset 8941 in josm for trunk/test

Timestamp:

2015-10-24T21:32:35+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #12004 - suggest to replace source:maxspeed=UK:* by source:maxspeed=GB:* as per ISO 3166-2

Location:

trunk/test

Files:

• config/unit-josm.home (modified) (1 prop)
• unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.groovy (modified) (3 diffs)

trunk/test/config/unit-josm.home

@@ -7 +7 @@
 elevation
 preferences.xml.bak
+plugins
+ebdirigo

@@ -7 +7 @@
 elevation
 preferences.xml.bak
+plugins
+ebdirigo

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.groovy

@@ -5 +5 @@
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
+import org.openstreetmap.josm.data.osm.Node
 import org.openstreetmap.josm.data.osm.Way
 
@@ -17 +18 @@
         def ds = new DataSet()
 
-        def n00 = new org.openstreetmap.josm.data.osm.Node(new LatLon(0, 0))
-        def n10 = new org.openstreetmap.josm.data.osm.Node(new LatLon(1, 0))
-        def n20 = new org.openstreetmap.josm.data.osm.Node(new LatLon(2, 0))
-        def n01 = new org.openstreetmap.josm.data.osm.Node(new LatLon(0, 1))
-        def n11 = new org.openstreetmap.josm.data.osm.Node(new LatLon(1, 1))
-        def n21 = new org.openstreetmap.josm.data.osm.Node(new LatLon(2, 1))
+        def n00 = new Node(new LatLon(0, 0))
+        def n10 = new Node(new LatLon(1, 0))
+        def n20 = new Node(new LatLon(2, 0))
+        def n01 = new Node(new LatLon(0, 1))
+        def n11 = new Node(new LatLon(1, 1))
+        def n21 = new Node(new LatLon(2, 1))
 
         ds.addPrimitive(n00)
@@ -61 +62 @@
         assert Highways.isHighwayLinkOkay(createTestSetting("residential", "residential"))
     }
+
+    void testSourceMaxSpeedUnitedKingdom() {
+        def link = createTestSetting("primary", "primary")
+        link.put("maxspeed", "60 mph")
+        link.put("source:maxspeed", "UK:nsl_single")
+        def test = new Highways()
+        test.visit(link)
+        assert test.errors.size() == 1
+        def error = test.errors.get(0)
+        assert error.isFixable()
+        assert error.getFix().executeCommand()
+        assert "GB:nsl_single".equals(link.get("source:maxspeed"))
+    }
 }

@@ -7 +7 @@
 elevation
 preferences.xml.bak
+plugins
+ebdirigo