From 28d49de0474fee0cf2499a0c634bd7ff84302742 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 26 Nov 2025 21:51:07 +0100 Subject: [PATCH] Cleanup: removed ContentProviderUtils.getMarkers(). --- .../opentracks/content/data/TestDataUtil.java | 12 +++++++++--- .../data/CustomContentProviderUtilsTest.java | 4 ++-- .../io/file/importer/ExportImportTest.java | 6 +++--- .../io/file/importer/KMLTrackImporterTest.java | 7 ++++--- .../opentracks/data/ContentProviderUtils.java | 14 -------------- 5 files changed, 18 insertions(+), 25 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java index c8f92bea3..e2e31ea18 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java @@ -152,10 +152,16 @@ public class TestDataUtil { public static List getTrackPoints(ContentProviderUtils contentProviderUtils, Track.Id trackId) { try (AutoCloseableIterator trackPointIterator = contentProviderUtils.getTrackPointIterator(trackId, null)) { ArrayList trackPoints = new ArrayList<>(); - while (trackPointIterator.hasNext()) { - trackPoints.add(trackPointIterator.next()); - } + trackPointIterator.forEachRemaining(trackPoints::add); return trackPoints; } } + + public static List getMarkers(ContentProviderUtils contentProviderUtils, Track.Id trackId) { + try (AutoCloseableIterator trackPointIterator = contentProviderUtils.getMarkerIterator(trackId)) { + ArrayList markers = new ArrayList<>(); + trackPointIterator.forEachRemaining(markers::add); + return markers; + } + } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java index f84b41204..c1b2c3197 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java +++ b/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); diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java index 93223efbc..5fa729537 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java +++ b/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 importedMarkers = TestDataUtil.getMarkers(contentProviderUtils, importTrackId); + assertEquals(markers.size(), importedMarkers.size()); - List importedMarkers = contentProviderUtils.getMarkers(importTrackId); for (int i = 0; i < markers.size(); i++) { Marker marker = markers.get(i); Marker importMarker = importedMarkers.get(i); diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java index b3e6c2dd3..f1487a514 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java +++ b/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 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 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 importedTrackPoints = TestDataUtil.getTrackPoints(contentProviderUtils, importTrackId); diff --git a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java b/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java index 5ecf279d1..bd221e536 100644 --- a/src/main/java/de/dennisguse/opentracks/data/ContentProviderUtils.java +++ b/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 getMarkers(Track.Id trackId) { - ArrayList 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);