Cleanup: removed ContentProviderUtils.getMarkers().

src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java

@@ -152,10 +152,16 @@ public class TestDataUtil {
     public static List<TrackPoint> getTrackPoints(ContentProviderUtils contentProviderUtils, Track.Id trackId) {
         try (AutoCloseableIterator<TrackPoint> trackPointIterator = contentProviderUtils.getTrackPointIterator(trackId, null)) {
             ArrayList<TrackPoint> trackPoints = new ArrayList<>();
-            while (trackPointIterator.hasNext()) {
+            trackPointIterator.forEachRemaining(trackPoints::add);
-                trackPoints.add(trackPointIterator.next());
-            }
             return trackPoints;
         }
     }
+
+    public static List<Marker> getMarkers(ContentProviderUtils contentProviderUtils, Track.Id trackId) {
+        try (AutoCloseableIterator<Marker> trackPointIterator = contentProviderUtils.getMarkerIterator(trackId)) {
+            ArrayList<Marker> markers = new ArrayList<>();
+            trackPointIterator.forEachRemaining(markers::add);
+            return markers;
+        }
+    }
 }

src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java

@@ -453,7 +453,7 @@ public class CustomContentProviderUtilsTest {
         contentProviderUtils.insertMarker(marker1);
 
         // Check insert was done.
-        assertEquals(1, contentProviderUtils.getMarkers(trackId).size());
+        assertEquals(1,  TestDataUtil.getMarkers(contentProviderUtils, trackId).size());
 
         // Get marker id that needs to delete.
         Marker.Id marker1Id = contentProviderUtils.insertMarker(marker1);
@@ -480,7 +480,7 @@ public class CustomContentProviderUtilsTest {
         contentProviderUtils.insertMarker(marker1);
 
         // Check insert was done.
-        assertEquals(1, contentProviderUtils.getMarkers(trackId).size());
+        assertEquals(1, TestDataUtil.getMarkers(contentProviderUtils, trackId).size());
 
         // Get marker id that needs to delete.
         Marker.Id marker1Id = contentProviderUtils.insertMarker(marker1);

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java

@@ -195,7 +195,7 @@ public class ExportImportTest {
 
         track = contentProviderUtils.getTrack(trackId);
         trackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, trackId);
-        markers = contentProviderUtils.getMarkers(trackId);
+        markers =  TestDataUtil.getMarkers(contentProviderUtils, trackId);
     }
 
     @LargeTest
@@ -532,9 +532,9 @@ public class ExportImportTest {
     }
 
     private void assertMarkers() {
-        assertEquals(markers.size(), contentProviderUtils.getMarkers(importTrackId).size());
+        List<Marker> importedMarkers = TestDataUtil.getMarkers(contentProviderUtils, importTrackId);
+        assertEquals(markers.size(),  importedMarkers.size());
 
-        List<Marker> importedMarkers = contentProviderUtils.getMarkers(importTrackId);
         for (int i = 0; i < markers.size(); i++) {
             Marker marker = markers.get(i);
             Marker importMarker = importedMarkers.get(i);

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java

@@ -79,7 +79,7 @@ public class KMLTrackImporterTest {
         assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType());
 
         // 2. markers
-        assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size());
+        assertEquals(0, TestDataUtil.getMarkers(contentProviderUtils, importTrackId).size());
 
         // 3. trackpoints
         List<TrackPoint> importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId);
@@ -135,7 +135,7 @@ public class KMLTrackImporterTest {
         assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType());
 
         // 2. markers
-        assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size());
+        assertEquals(0, TestDataUtil.getMarkers(contentProviderUtils, importTrackId).size());
 
         // 3. trackpoints
         List<TrackPoint> importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId);
@@ -176,7 +176,8 @@ public class KMLTrackImporterTest {
         assertEquals(ActivityType.UNKNOWN, importedTrack.getActivityType());
 
         // 2. markers
-        assertEquals(1, contentProviderUtils.getMarkers(importTrackId).size());
+        //TODO Check actual content (Marker should be record for this)
+        assertEquals(1, TestDataUtil.getMarkers(contentProviderUtils, importTrackId).size());
 
         // 3. trackpoints
         List<TrackPoint> importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId);

src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java

@@ -455,20 +455,6 @@ public class ContentProviderUtils {
         return getMarkerCursor(null, selection, selectionArgs, MarkerColumns._ID, maxCount);
     }
 
-    @Deprecated //TODO Move to test package
-    @VisibleForTesting
-    public List<Marker> getMarkers(Track.Id trackId) {
-        ArrayList<Marker> markers = new ArrayList<>();
-        try (Cursor cursor = getMarkerCursor(trackId)) {
-            if (cursor.moveToFirst()) {
-                do {
-                    markers.add(createMarker(cursor));
-                } while (cursor.moveToNext());
-            }
-        }
-        return markers;
-    }
-
     // TODO Merge with updateMarker
     public Marker.Id insertMarker(@NonNull Marker marker) {
         marker.setId(null);