Changeset 11886 in josm

Timestamp:

2017-04-11T23:41:13+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14635 - add a new unit test (not directly related to the bug)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java

@@ -135 +135 @@
     private int firstGroupIdx;
     private void makeLoopIfNeeded(final List<WayConnectionType> con, final int i) {
-        boolean loop;
+        boolean loop = false;
         if (i == firstGroupIdx) { //is primitive loop
             loop = determineDirection(i, FORWARD, i) == FORWARD;
-        } else {
+        } else if (i >= 0) {
             loop = determineDirection(i, con.get(i).direction, firstGroupIdx) == con.get(firstGroupIdx).direction;
         }

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java

@@ -5 +5 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -97 +98 @@
 
     @Test
+    public void testEmpty() {
+        String actual = getConnections(wayConnectionTypeCalculator.updateLinks(new ArrayList<>()));
+        Assert.assertEquals("[]", actual);
+    }
+
+    @Test
     public void testGeneric() {
         Relation relation = getRelation("generic");