karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: Marker.icon was not used anymore.

Browse Source
This commit is contained in:
Dennis Guse
2025-11-30 08:39:00 +01:00
committed by Dennis Guse
parent 0f356de2ca
commit 7956063598
14 changed files with 37 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java
+3 -4
View File
@@ -91,9 +91,9 @@ public class TestDataUtil {
);
List<Marker> markers = List.of(
new Marker(null, trackId, "Marker 1", "Marker description 1", "Marker category 3", "", trackPoints.get(1).getPosition(),null),
new Marker(null, trackId, "Marker 2", "Marker description 2", "Marker category 3", "", trackPoints.get(4).getPosition(), null),
new Marker(null, trackId, "Marker 3", "Marker description 3", "Marker category 3", "", trackPoints.get(5).getPosition(), null)
new Marker(null, trackId, "Marker 1", "Marker description 1", "Marker category 3", trackPoints.get(1).getPosition(),null),
new Marker(null, trackId, "Marker 2", "Marker description 2", "Marker category 3", trackPoints.get(4).getPosition(), null),
new Marker(null, trackId, "Marker 3", "Marker description 3", "Marker category 3", trackPoints.get(5).getPosition(), null)
);
return new TrackData(track, trackPoints, markers);
@@ -163,7 +163,6 @@ public class TestDataUtil {
"Marker name",
description,
"Marker category",
"",
trackPoint.getPosition(),
photoUri);
}
src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java
-9
View File
@@ -239,7 +239,6 @@ public class CustomContentProviderUtilsTest {
"",
"",
"",
"",
getLastValidTrackPoint(trackId).getPosition(),
null
));
@@ -303,7 +302,6 @@ public class CustomContentProviderUtilsTest {
"",
"",
"",
"",
getLastValidTrackPoint(trackId1).getPosition(),
null
));
@@ -477,7 +475,6 @@ public class CustomContentProviderUtilsTest {
"",
TEST_DESC,
"",
"",
getLastValidTrackPoint(trackId).getPosition(),
null
));
@@ -558,7 +555,6 @@ public class CustomContentProviderUtilsTest {
"",
MOCK_DESC,
"",
"",
getLastValidTrackPoint(trackId).getPosition(),
null
));
@@ -568,7 +564,6 @@ public class CustomContentProviderUtilsTest {
"",
MOCK_DESC,
"",
"",
getLastValidTrackPoint(trackId).getPosition(),
null
));
@@ -596,7 +591,6 @@ public class CustomContentProviderUtilsTest {
"",
MOCK_DESC,
"",
"",
getLastValidTrackPoint(trackId).getPosition(),
null
));
@@ -621,7 +615,6 @@ public class CustomContentProviderUtilsTest {
"",
TEST_DESC,
"",
"",
getLastValidTrackPoint(trackId).getPosition(),
null
));
@@ -645,7 +638,6 @@ public class CustomContentProviderUtilsTest {
"",
TEST_DESC,
"",
"",
getLastValidTrackPoint(trackId).getPosition(),
null
));
@@ -657,7 +649,6 @@ public class CustomContentProviderUtilsTest {
"",
TEST_DESC_NEW,
"",
"",
getLastValidTrackPoint(trackId).getPosition(),
null
));
src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
-4
View File
@@ -58,7 +58,6 @@ import de.dennisguse.opentracks.data.models.Cadence;
import de.dennisguse.opentracks.data.models.Distance;
import de.dennisguse.opentracks.data.models.HeartRate;
import de.dennisguse.opentracks.data.models.Marker;
import de.dennisguse.opentracks.data.models.MarkerBuilder;
import de.dennisguse.opentracks.data.models.Position;
import de.dennisguse.opentracks.data.models.Power;
import de.dennisguse.opentracks.data.models.Speed;
@@ -160,7 +159,6 @@ public class ExportImportTest {
"Marker 1",
"Marker 1 desc",
"Marker 1 category",
null,
service.getLastStoredTrackPointWithLocation().getPosition(),
null
));
@@ -184,7 +182,6 @@ public class ExportImportTest {
"Marker 2",
"Marker 2 desc",
"Marker 2 category",
null,
service.getLastStoredTrackPointWithLocation().getPosition(),
null
));
@@ -561,7 +558,6 @@ public class ExportImportTest {
Marker importMarker = importedMarkers.get(i);
assertEquals(marker.category(), importMarker.category());
assertEquals(marker.description(), importMarker.description());
// assertEquals(marker.getIcon(), importMarker.getIcon()); // TODO for KML
assertEquals(marker.name(), importMarker.name());
assertNull(importMarker.photoUrl());