Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.groovy	(revision 6573)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/HighwaysTest.groovy	(revision 6573)
@@ -0,0 +1,65 @@
+// License: GPL. See LICENSE file for details.
+package org.openstreetmap.josm.data.validation.tests
+
+import org.openstreetmap.josm.Main
+import org.openstreetmap.josm.data.coor.LatLon
+import org.openstreetmap.josm.data.osm.DataSet
+import org.openstreetmap.josm.data.osm.Way
+import org.openstreetmap.josm.data.projection.Projections
+
+class HighwaysTest extends GroovyTestCase {
+
+    @Override
+    void setUp() {
+        Main.initApplicationPreferences()
+        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+    }
+
+    public static Way createTestSetting(String highway, String highwayLink) {
+        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))
+
+        ds.addPrimitive(n00)
+        ds.addPrimitive(n10)
+        ds.addPrimitive(n20)
+        ds.addPrimitive(n01)
+        ds.addPrimitive(n11)
+        ds.addPrimitive(n21)
+
+        def major = new Way()
+        major.addNode(n00)
+        major.addNode(n10)
+        major.addNode(n20)
+        major.put("highway", highway)
+        def link = new Way()
+        link.addNode(n10)
+        link.addNode(n11)
+        link.put("highway", highwayLink)
+        def unclassified = new Way()
+        unclassified.addNode(n01)
+        unclassified.addNode(n11)
+        unclassified.addNode(n21)
+        unclassified.put("highway", "unclassified")
+
+        ds.addPrimitive(major)
+        ds.addPrimitive(link)
+        ds.addPrimitive(unclassified)
+
+        return link
+    }
+
+    void testCombinations() {
+        assert Highways.isHighwayLinkOkay(createTestSetting("primary", "primary_link"))
+        assert Highways.isHighwayLinkOkay(createTestSetting("primary", "primary"))
+        assert !Highways.isHighwayLinkOkay(createTestSetting("primary", "secondary_link"))
+        assert !Highways.isHighwayLinkOkay(createTestSetting("secondary", "primary_link"))
+        assert !Highways.isHighwayLinkOkay(createTestSetting("secondary", "tertiary_link"))
+        assert Highways.isHighwayLinkOkay(createTestSetting("residential", "residential"))
+    }
+}