Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java	(revision 12147)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java	(revision 12156)
@@ -6,7 +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,5 +15,4 @@
 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,10 +126,5 @@
         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());
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java	(revision 12147)
+++ trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java	(revision 12156)
@@ -47,7 +47,7 @@
     public void testMunich() throws Exception {
         final GpxData result = parseGpxData("data_nodist/munich.gpx");
-        assertEquals(2762, result.tracks.size());
-        assertEquals(0, result.routes.size());
-        assertEquals(903, result.waypoints.size());
+        assertEquals(2762, result.getTracks().size());
+        assertEquals(0, result.getRoutes().size());
+        assertEquals(903, result.getWaypoints().size());
 
         final WayPoint tenthWayPoint = ((List<WayPoint>) result.waypoints).get(10);