From f45dad167bf08ce2d049871e27f26da6114d27fc Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Fri, 27 Feb 2026 22:08:10 +0100 Subject: [PATCH] Cleanup: ExportImportTest actually use implementation. --- .../io/file/importer/ExportImportTest.java | 30 +++++++++++++++--- src/androidTest/res/raw/csv_export.csv | 4 +-- .../opentracks/sensors/SensorManager.java | 31 ------------------- 3 files changed, 28 insertions(+), 37 deletions(-) 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 bac727e43..f137e2c68 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 @@ -199,7 +199,6 @@ public class ExportImportTest { )); trackPointCreator.setClock("2020-02-02T02:02:18Z"); - trackPointCreator.getSensorManager().clear(); service.endCurrentTrack(); trackPointCreator.setClock("2020-02-02T02:03:20Z"); @@ -214,7 +213,6 @@ public class ExportImportTest { sendLocation(trackPointCreator, "2020-02-02T02:03:50Z", 3.1234567, 16.001, 10, 27, 15, 999.123, 0f); - trackPointCreator.getSensorManager().clear(); trackPointCreator.setClock("2020-02-02T02:04:00Z"); service.endCurrentTrack(); @@ -298,7 +296,22 @@ public class ExportImportTest { Power.of(50), new AltitudeGainLoss(0, 0) ), - new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:02:18Z")), + new TrackPoint( + null, + TrackPoint.Type.SEGMENT_END_MANUAL, + new Position( + Instant.parse("2020-02-02T02:02:18Z"), + 3.123456, 14.001456, Distance.of(10), + Altitude.WGS84.of(1020.25), null, + null, + Speed.of(5)), + Distance.of(0), + HeartRate.of(69), + null, + Cadence.of(3), + Power.of(50), + new AltitudeGainLoss(0, 0) + ), new TrackPoint(TrackPoint.Type.SEGMENT_START_MANUAL, Instant.parse("2020-02-02T02:03:20Z")), new TrackPoint( null, @@ -356,7 +369,16 @@ public class ExportImportTest { null, null, new AltitudeGainLoss(0, 0)), - new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.parse("2020-02-02T02:04:00Z")) + new TrackPoint( + null, + TrackPoint.Type.SEGMENT_END_MANUAL, + Position.of(Instant.parse("2020-02-02T02:04:00Z")), + null, + null, + null, + null, + null, + new AltitudeGainLoss(0, 0)) ), actual); assertEquals(new Statistics( diff --git a/src/androidTest/res/raw/csv_export.csv b/src/androidTest/res/raw/csv_export.csv index eb1054f27..2ecb4d9e2 100644 --- a/src/androidTest/res/raw/csv_export.csv +++ b/src/androidTest/res/raw/csv_export.csv @@ -4,10 +4,10 @@ "2020-02-02T03:02:04+01:00","TRACKPOINT",,,,,,54,1,1,10,66,3,50 "2020-02-02T03:02:15+01:00","TRACKPOINT",,,,,,,,,,68,3,50 "2020-02-02T03:02:17+01:00","TRACKPOINT",3.123456,14.001456,1020.2,10,,18,0,0,2,69,3,50 -"2020-02-02T03:02:18+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,, +"2020-02-02T03:02:18+01:00","SEGMENT_END_MANUAL",3.123456,14.001456,1020.2,10,,18,0,0,0,69,3,50 "2020-02-02T03:03:20+01:00","SEGMENT_START_MANUAL",,,,,,,,,,,, "2020-02-02T03:03:21+01:00","TRACKPOINT",3.123456,14.002456,999.1,10,,54,0,0,,,, "2020-02-02T03:03:22+01:00","SEGMENT_START_AUTOMATIC",3.123456,16,999.1,10,,54,0,0,,,, "2020-02-02T03:03:30+01:00","IDLE",,,,,,,0,0,,,, "2020-02-02T03:03:50+01:00","TRACKPOINT",3.123456,16.001,999.1,10,,54,0,0,,,, -"2020-02-02T03:04:00+01:00","SEGMENT_END_MANUAL",,,,,,,,,,,, \ No newline at end of file +"2020-02-02T03:04:00+01:00","SEGMENT_END_MANUAL",,,,,,,0,0,,,, \ No newline at end of file diff --git a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java index d7c37ddbc..6be864574 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/SensorManager.java @@ -259,37 +259,6 @@ public class SensorManager implements SharedPreferences.OnSharedPreferenceChange ); } - @VisibleForTesting - public void clear() { - Log.i(TAG, "Removing all aggregators"); - - //TODO This is to ExportImportTest alive; refactor test. - if (this.altitudeChangeHandler != null) { - this.altitudeChangeHandler.setAggregator(null); - } - if (this.heartRateHandler != null) { - this.heartRateHandler.setAggregator(null); - } - if (this.temperatureHandler != null) { - this.temperatureHandler.setAggregator(null); - } - if (this.cyclingCadenceHandler != null) { - this.cyclingCadenceHandler.setAggregator(null); - } - if (cyclingDistanceSpeedHandler != null) { - cyclingDistanceSpeedHandler.setAggregator(null); - } - if (cyclingPowerHandler != null) { - cyclingPowerHandler.setAggregator(null); - } - if (runningSpeedCadenceDistanceHandler != null) { - runningSpeedCadenceDistanceHandler.setAggregator(null); - } - if (this.gpsHandler != null) { - this.gpsHandler.setAggregator(null); - } - } - private boolean isStarted() { return wakeLock != null; }