Changeset 15502 in josm for trunk/test

Timestamp:

2019-11-03T22:11:11+01:00 (4 years ago)

Author:

Don-vip

Message:

see #16796 - use IGpxTrack in GpxData (patch by Bjoeni)

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/gpx/GpxDataTest.java (modified) (3 diffs)
• gui/layer/OsmDataLayerTest.java (modified) (2 diffs)
• io/nmea/NmeaReaderTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java

@@ -114 +114 @@
 
     /**
-     * Test method for {@link GpxData#getTracks()},  {@link GpxData#addTrack(GpxTrack)},  {@link GpxData#removeTrack(GpxTrack)}.
+     * Test method for {@link GpxData#getTracks()},  {@link GpxData#addTrack(IGpxTrack)},  {@link GpxData#removeTrack(IGpxTrack)}.
      */
     @Test
@@ -136 +136 @@
 
     /**
-     * Test method for {@link GpxData#addTrack(GpxTrack)}.
+     * Test method for {@link GpxData#addTrack(IGpxTrack)}.
      */
     @Test(expected = IllegalArgumentException.class)
@@ -146 +146 @@
 
     /**
-     * Test method for {@link GpxData#removeTrack(GpxTrack)}.
+     * Test method for {@link GpxData#removeTrack(IGpxTrack)}.
      */
     @Test(expected = IllegalArgumentException.class)

trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -240 +240 @@
         // Check that track is correct
         assertEquals(1, gpx.getTrackCount());
-        GpxTrack track = gpx.getTracks().iterator().next();
+        IGpxTrack track = gpx.getTracks().iterator().next();
         Collection<IGpxTrackSegment> segments = track.getSegments();
         assertEquals(1, segments.size());

trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.IGpxTrack;
 import org.openstreetmap.josm.data.gpx.IGpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -95 +95 @@
         assertEquals(1, gpx.tracks.size());
         assertEquals(1, in.data.tracks.size());
-        GpxTrack gpxTrack = gpx.tracks.iterator().next();
-        GpxTrack nmeaTrack = in.data.tracks.iterator().next();
+        IGpxTrack gpxTrack = gpx.tracks.iterator().next();
+        IGpxTrack nmeaTrack = in.data.tracks.iterator().next();
         assertEquals(gpxTrack.getBounds(), nmeaTrack.getBounds());
         int nTracks = gpxTrack.getSegments().size();