Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/AddressesTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/AddressesTest.java	(revision 15043)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/AddressesTest.java	(revision 15043)
@@ -0,0 +1,116 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.openstreetmap.josm.data.coor.LatLon.NORTH_POLE;
+import static org.openstreetmap.josm.data.coor.LatLon.SOUTH_POLE;
+import static org.openstreetmap.josm.data.coor.LatLon.ZERO;
+
+import java.util.List;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+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.RelationMember;
+import org.openstreetmap.josm.data.validation.Severity;
+import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * JUnit Test of {@link Addresses} validation test.
+ */
+public class AddressesTest {
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
+
+    private static Node createAddressNode(String nodeTags, String wayTags, String relationTags) {
+        DataSet ds = new DataSet();
+        Node n = TestUtils.newNode(nodeTags);
+        ds.addPrimitive(n);
+        if (wayTags != null) {
+            ds.addPrimitive(TestUtils.newWay(wayTags, n));
+        }
+        if (relationTags != null) {
+            ds.addPrimitive(TestUtils.newRelation(relationTags, new RelationMember(null, n)));
+        }
+        return n;
+    }
+
+    private static TestError doTestHouseNumberWithoutStreet(String nodeTags, String wayTags, String relationTags) {
+        return new Addresses().checkHouseNumbersWithoutStreet(createAddressNode(nodeTags, wayTags, relationTags));
+    }
+
+    /**
+     * Unit test of {@link Addresses#HOUSE_NUMBER_WITHOUT_STREET}
+     */
+    @Test
+    public void testHouseNumberWithoutStreet() {
+        assertNull(doTestHouseNumberWithoutStreet(
+                "", null, null));
+        assertNotNull(doTestHouseNumberWithoutStreet(
+                "addr:housenumber=1", null, null));
+        assertNull(doTestHouseNumberWithoutStreet(
+                "addr:housenumber=1 addr:street=Foo", null, null));
+        assertNull(doTestHouseNumberWithoutStreet(
+                "addr:housenumber=1 addr:place=Foo", null, null));
+        assertNull(doTestHouseNumberWithoutStreet(
+                "addr:housenumber=1 addr:neighbourhood=Foo", null, null));
+        assertNotNull(doTestHouseNumberWithoutStreet(
+                "addr:housenumber=1", null, "type=enforcement"));
+        assertNull(doTestHouseNumberWithoutStreet(
+                "addr:housenumber=1", null, "type=associatedStreet"));
+        assertNotNull(doTestHouseNumberWithoutStreet(
+                "addr:housenumber=1", "building=yes", null));
+        assertNull(doTestHouseNumberWithoutStreet(
+                "addr:housenumber=1", "addr:interpolation=odd addr:street=Foo", null));
+    }
+
+    private static void doTestDuplicateHouseNumber(
+            String tags1, LatLon ll1, String tags2, LatLon ll2, Severity expected) {
+        DataSet ds = new DataSet();
+        Node n1 = TestUtils.newNode(tags1); n1.setCoor(ll1); ds.addPrimitive(n1);
+        Node n2 = TestUtils.newNode(tags2); n2.setCoor(ll2); ds.addPrimitive(n2);
+        List<TestError> errors = new Addresses().checkForDuplicate(n2);
+        assertEquals(expected != null ? 1 : 0, errors.size());
+        if (expected != null) {
+            assertEquals(expected, errors.get(0).getSeverity());
+        }
+    }
+
+    /**
+     * Unit test of {@link Addresses#DUPLICATE_HOUSE_NUMBER}
+     */
+    @Test
+    public void testDuplicateHouseNumber() {
+        String num1 = "addr:housenumber=1 addr:street=Foo ";
+        String num2 = "addr:housenumber=2 addr:street=Foo ";
+        String city1 = "addr:city=Gotham ";
+        String city2 = "addr:city=Metropolis ";
+        String suburb1 = "addr:suburb=Queens ";
+        String suburb2 = "addr:suburb=Bronx ";
+        // Warning for same addresses at close distance
+        doTestDuplicateHouseNumber(num1, ZERO, num1, ZERO, Severity.WARNING);
+        // Info for same addresses at long distance
+        doTestDuplicateHouseNumber(num1, SOUTH_POLE, num1, NORTH_POLE, Severity.OTHER);
+        // Nothing for different addresses
+        doTestDuplicateHouseNumber(num1, ZERO, num2, ZERO, null);
+        // Info for same address in different cities, warning if same city
+        doTestDuplicateHouseNumber(num1+city1, ZERO, num1+city2, ZERO, Severity.OTHER);
+        doTestDuplicateHouseNumber(num1+city1, ZERO, num1+city1, ZERO, Severity.WARNING);
+        // Info for same address in same city but different suburbs, warning if same suburb
+        doTestDuplicateHouseNumber(num1+city1+suburb1, ZERO, num1+city1+suburb2, ZERO, Severity.OTHER);
+        doTestDuplicateHouseNumber(num1+city1+suburb1, ZERO, num1+city1+suburb1, ZERO, Severity.WARNING);
+    }
+}
Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java	(revision 15042)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java	(revision 15043)
@@ -11,5 +11,5 @@
 
 /**
- * JUnit Test of coastline validation test.
+ * JUnit Test of {@link Coastlines} validation test.
  */
 public class CoastlinesTest {