Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.java	(revision 15745)
+++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/SimilarNamedWaysTest.java	(revision 15749)
@@ -4,16 +4,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
-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;
-import org.openstreetmap.josm.data.validation.TestError;
 
 /**
@@ -32,55 +24,4 @@
     }
 
-    private static List<TestError> testWays(String namea, String nameb) {
-        DataSet ds = new DataSet();
-
-        Node n00 = new Node(LatLon.ZERO);
-        Node n10 = new Node(new LatLon(1, 0));
-        Node n20 = new Node(new LatLon(2, 0));
-        Node n30 = new Node(new LatLon(3, 0));
-        Node n40 = new Node(new LatLon(4, 0));
-
-        ds.addPrimitive(n00);
-        ds.addPrimitive(n10);
-        ds.addPrimitive(n20);
-        ds.addPrimitive(n30);
-        ds.addPrimitive(n40);
-
-        Way waya = new Way();
-        waya.addNode(n00);
-        waya.addNode(n10);
-        waya.addNode(n20);
-        waya.put("name", namea);
-        Way wayb = new Way();
-        wayb.addNode(n20);
-        wayb.addNode(n30);
-        wayb.addNode(n40);
-        wayb.put("name", nameb);
-
-        ds.addPrimitive(waya);
-        ds.addPrimitive(wayb);
-
-        assertTrue(waya.isUsable());
-        assertTrue(wayb.isUsable());
-
-        SimilarNamedWays t = new SimilarNamedWays();
-        t.startTest(null);
-        t.visit(waya);
-        t.visit(wayb);
-        return t.getErrors();
-    }
-
-    @Test
-    public void testCombinations() {
-        assertTrue(testWays("Church Street", "Water Street").isEmpty());
-        assertFalse(testWays("Main Street", "Maim Street").isEmpty());
-        assertFalse(testWays("First Street", "Frist Street").isEmpty());
-
-        assertTrue(testWays("1st Street", "2nd Street").isEmpty());
-        assertTrue(testWays("First Avenue", "Second Avenue").isEmpty());
-        assertTrue(testWays("West Main Street", "East Main Street").isEmpty());
-        assertTrue(testWays("A Street", "B Street").isEmpty());
-    }
-
     private void checkSimilarity(String message, String name1, String name2, boolean expected) {
         boolean actual = test.similaryName(name1, name2);
@@ -96,8 +37,11 @@
         checkSimilarity("different case", "Testname", "TestName", true);
         checkSimilarity("typo", "Testname", "Testxame", true);
+        checkSimilarity("typo", "Main Street", "Maim Street", true);
+        checkSimilarity("typo", "First Street", "Frist Street", true);
         checkSimilarity("missing char", "Testname", "Testame", true);
         checkSimilarity("additional char", "Testname", "Testxname", true);
         checkSimilarity("2 changes", "Testname", "Tostxname", true);
         checkSimilarity("3 changes", "Testname", "Tostxnam", false);
+        checkSimilarity("many changes", "Church Street", "Water Street", false);
 
         // regular expression rule
@@ -116,4 +60,5 @@
         // synonyms
         checkSimilarity("east and west", "East Foothill Drive", "West Foothill Drive", false);
+        checkSimilarity("east and west", "East Main Street", "West Main Street", false);
         checkSimilarity("east and west case", "east Foothill Drive", "West Foothill Drive", true);
         checkSimilarity("first and second", "First Street", "Second Street", false);
@@ -123,4 +68,5 @@
         checkSimilarity("first and second 2 changes", "First Street", "Soconds Street", true);
         checkSimilarity("first and second 3 changes", "First Street", "Soconds Stret", false);
+        checkSimilarity("A and B", "A Street", "B Street", false);
 
         // case only, see #14858