Changeset 12156 in josm for trunk/test/unit/org/openstreetmap/josm/gui

Timestamp:

2017-05-15T14:14:40+02:00 (7 years ago)

Author:

michael2402

Message:

See #14120: Don't make gpx tracks depend on the isChanged method, use a listener based approach instead.

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java

@@ -6 +6 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.junit.BeforeClass;
@@ -16 +15 @@
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.io.GpxReaderTest;
 import org.openstreetmap.josm.tools.ColorHelper;
@@ -128 +126 @@
         gdh.readPreferences(layerName);
         gdh.calculateColors();
-        final Iterator<WayPoint> wayPointIterator = data.tracks.iterator().next().getSegments().iterator().next().getWayPoints().iterator();
-        final List<String> colorCodes = new ArrayList<>(n);
-        while (colorCodes.size() < n) {
-            colorCodes.add(ColorHelper.color2html(wayPointIterator.next().customColoring));
-        }
-        return colorCodes;
+        return data.getTrackPoints().limit(n).map(p -> ColorHelper.color2html(p.customColoring)).collect(Collectors.toList());
     }
 }