Changeset 15362 in josm for trunk/test/unit/org/openstreetmap/josm/command/SplitWayCommandTest.java

Timestamp:

2019-09-19T16:01:03+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18088 - see #18006 - Allow splitting a connectivity/restriction relation with multiple via-ways

File:

• trunk/test/unit/org/openstreetmap/josm/command/SplitWayCommandTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/command/SplitWayCommandTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
 
@@ -38 +38 @@
 
     /**
-     * Unit test of {@link SplitWayCommand#findVia}.
+     * Unit test of {@link SplitWayCommand#findVias}.
      */
     @Test
-    public void testFindVia() {
+    public void testFindVias() {
         // empty relation
-        assertNull(SplitWayCommand.findVia(new Relation(), null));
+        assertTrue(SplitWayCommand.findVias(new Relation(), null).isEmpty());
         // restriction relation without via member
         Relation r = new Relation();
         r.addMember(new RelationMember("", new Node()));
-        assertNull(SplitWayCommand.findVia(r, "restriction"));
+        assertTrue(SplitWayCommand.findVias(r, "restriction").isEmpty());
         // restriction relation with via member
         r = new Relation();
         OsmPrimitive via = new Node();
         r.addMember(new RelationMember("via", via));
-        assertEquals(via, SplitWayCommand.findVia(r, "restriction"));
+        assertEquals(Collections.singletonList(via), SplitWayCommand.findVias(r, "restriction"));
         // destination_sign relation without sign nor intersection
         r = new Relation();
         r.addMember(new RelationMember("", new Node()));
-        assertNull(SplitWayCommand.findVia(r, "destination_sign"));
+        assertTrue(SplitWayCommand.findVias(r, "destination_sign").isEmpty());
         // destination_sign with sign
         r = new Relation();
         via = new Node();
         r.addMember(new RelationMember("sign", via));
-        assertEquals(via, SplitWayCommand.findVia(r, "destination_sign"));
+        assertEquals(Collections.singletonList(via), SplitWayCommand.findVias(r, "destination_sign"));
         // destination_sign with intersection
         r = new Relation();
         via = new Node();
         r.addMember(new RelationMember("intersection", via));
-        assertEquals(via, SplitWayCommand.findVia(r, "destination_sign"));
+        assertEquals(Collections.singletonList(via), SplitWayCommand.findVias(r, "destination_sign"));
     }