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

Refactor Track.icon is now Track.activityTypeId.

Browse Source 
Part of #1608.
This commit is contained in:
Dennis Guse
2023-06-23 07:49:39 +02:00
parent f824b31891
commit 779681088c
14 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
+2 -2
View File
@@ -180,7 +180,7 @@ public class ExportImportTest {
service.endCurrentTrack();
Track track = contentProviderUtils.getTrack(trackId);
track.setIcon(TRACK_ICON);
track.setActivityTypeId(TRACK_ICON);
track.setActivityType(TRACK_ACTIVITY_TYPE);
track.setDescription(TRACK_DESCRIPTION);
contentProviderUtils.updateTrack(track);
@@ -219,7 +219,7 @@ public class ExportImportTest {
assertEquals(track.getActivityType(), importedTrack.getActivityType());
assertEquals(track.getDescription(), importedTrack.getDescription());
assertEquals(track.getName(), importedTrack.getName());
assertEquals(track.getIcon(), importedTrack.getIcon());
assertEquals(track.getActivityTypeId(), importedTrack.getActivityTypeId());
// 2. trackpoints
TrackPointAssert a = new TrackPointAssert();
src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GPXTrackImporterTest.java
+3 -3
View File
@@ -82,7 +82,7 @@ public class GPXTrackImporterTest {
assertEquals("the category", importedTrack.getActivityType());
assertEquals("the description", importedTrack.getDescription());
assertEquals("2021-01-07 22:51", importedTrack.getName());
assertEquals("UNKNOWN", importedTrack.getIcon());
assertEquals("UNKNOWN", importedTrack.getActivityTypeId());
//TODO Check trackstatistics
@@ -136,7 +136,7 @@ public class GPXTrackImporterTest {
assertEquals("", importedTrack.getActivityType());
assertEquals("", importedTrack.getDescription());
assertEquals("20210907_213924.gpx", importedTrack.getName());
assertEquals("", importedTrack.getIcon());
assertEquals("", importedTrack.getActivityTypeId());
// 3. trackstatistics
TrackStatistics trackStatistics = importedTrack.getTrackStatistics();
@@ -184,7 +184,7 @@ public class GPXTrackImporterTest {
assertEquals("", importedTrack.getActivityType());
assertEquals("", importedTrack.getDescription());
assertEquals("20210907_213924.gpx", importedTrack.getName());
assertEquals("", importedTrack.getIcon());
assertEquals("", importedTrack.getActivityTypeId());
// 3. trackstatistics
TrackStatistics trackStatistics = importedTrack.getTrackStatistics();
src/androidTest/java/de/dennisguse/opentracks/io/file/importer/KMLTrackImporterTest.java
+3 -3
View File
@@ -73,7 +73,7 @@ public class KMLTrackImporterTest {
assertEquals("", importedTrack.getActivityType());
assertEquals("", importedTrack.getDescription());
assertEquals("", importedTrack.getName());
assertEquals("", importedTrack.getIcon());
assertEquals("", importedTrack.getActivityTypeId());
// 2. markers
assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size());
@@ -122,7 +122,7 @@ public class KMLTrackImporterTest {
assertEquals("", importedTrack.getActivityType());
assertEquals("", importedTrack.getDescription());
assertEquals("", importedTrack.getName());
assertEquals("", importedTrack.getIcon());
assertEquals("", importedTrack.getActivityTypeId());
// 2. markers
assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size());
@@ -162,7 +162,7 @@ public class KMLTrackImporterTest {
assertEquals("unknown", importedTrack.getActivityType());
assertEquals("Test Track", importedTrack.getDescription());
assertEquals("2020-11-28 18:06", importedTrack.getName());
assertEquals("UNKNOWN", importedTrack.getIcon());
assertEquals("UNKNOWN", importedTrack.getActivityTypeId());
// 2. markers
assertEquals(0, contentProviderUtils.getMarkers(importTrackId).size());
src/androidTest/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsTest.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class AggregatedStatisticsTest {
statistics.setMinAltitude(1200.0); // Resulting min altitude
Track track = new Track();
track.setIcon(ActivityType.findByLocalizedString(context, category)
track.setActivityTypeId(ActivityType.findByLocalizedString(context, category)
.getId());
track.setActivityType(category);
track.setTrackStatistics(statistics);