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

Cleanup: SensorManager avoids instanceof for testing.

Browse Source
This commit is contained in:
Dennis Guse
2026-01-31 19:51:26 +01:00
parent a1a363698f
commit fa558c9ab7
3 changed files with 50 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
+6 -6
View File
@@ -664,12 +664,12 @@ public class ExportImportTest {
AggregatorCyclingPower cyclingPower = new AggregatorCyclingPower("", "");
cyclingPower.add(trackPointCreator.getNow(), new CyclingPowerBluetooth.Data(Power.of(power), null));
sensorManager.add(cyclingPower);
sensorManager.setAggregator(cyclingPower);
AggregatorHeartRate avgHeartRate = new AggregatorHeartRate("", "");
avgHeartRate.add(trackPointCreator.getNow(), HeartRate.of(heartRate));
sensorManager.add(avgHeartRate);
sensorManager.setAggregator(avgHeartRate);
AggregatorCyclingCadence cyclingCadence = new AggregatorCyclingCadence("", "") {
@NonNull
@@ -683,7 +683,7 @@ public class ExportImportTest {
return true;
}
};
sensorManager.add(cyclingCadence);
sensorManager.setAggregator(cyclingCadence);
if (distance != null && speed != null) {
AggregatorCyclingDistanceSpeed aggregatorCyclingDistanceSpeed = new AggregatorCyclingDistanceSpeed("", "") {
@@ -698,14 +698,14 @@ public class ExportImportTest {
return true;
}
};
sensorManager.add(aggregatorCyclingDistanceSpeed);
sensorManager.setAggregator(aggregatorCyclingDistanceSpeed);
} else {
sensorManager.add(new AggregatorCyclingDistanceSpeed("", ""));
sensorManager.setAggregator(new AggregatorCyclingDistanceSpeed("", ""));
}
mockAltitudeChange(trackPointCreator, altitudeGain);
sensorManager.add(new AggregatorTemperature("", "'") {
sensorManager.setAggregator(new AggregatorTemperature("", "'") {
@NonNull
@Override
public Temperature getAggregatedValue(Instant now) {
src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java
+2 -2
View File
@@ -341,7 +341,7 @@ public class TrackRecordingServiceRecordingTest {
trackPointCreator.setClock(sensor1);
AggregatorHeartRate avgHeartRate = new AggregatorHeartRate("", "");
sensorManager.add(avgHeartRate);
sensorManager.setAggregator(avgHeartRate);
//Should be ignored
avgHeartRate.add(trackPointCreator.getNow(), HeartRate.of(5));
@@ -812,7 +812,7 @@ public class TrackRecordingServiceRecordingTest {
AggregatorRunning aggregatorRunning = new AggregatorRunning("", "");
SensorManager sensorManager = trackPointCreator.getSensorManager();
sensorManager.add(aggregatorRunning);
sensorManager.setAggregator(aggregatorRunning);
// when
String sensor1 = "2020-02-02T02:02:03Z";