Sensor data: separate aggregation and TTL explicitly.

Part of #1995.

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java

@@ -11,6 +11,7 @@ import android.location.Location;
 import android.net.Uri;
 import android.os.Looper;
 
+import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -58,12 +59,14 @@ import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.io.file.TrackFileFormat;
 import de.dennisguse.opentracks.io.file.exporter.TrackExporter;
+import de.dennisguse.opentracks.sensors.BluetoothHandlerManagerCyclingPower;
 import de.dennisguse.opentracks.sensors.sensorData.Aggregator;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorBarometer;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorCyclingCadence;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorCyclingDistanceSpeed;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorCyclingPower;
 import de.dennisguse.opentracks.sensors.sensorData.AggregatorHeartRate;
+import de.dennisguse.opentracks.sensors.sensorData.Raw;
 import de.dennisguse.opentracks.sensors.sensorData.SensorDataSet;
 import de.dennisguse.opentracks.services.TrackRecordingService;
 import de.dennisguse.opentracks.services.handlers.TrackPointCreator;
@@ -72,7 +75,7 @@ import de.dennisguse.opentracks.stats.TrackStatistics;
 /**
  * Export a track to {@link TrackFileFormat} and verify that the import is identical.
  * <p>
- * Note: those tests are affected by {@link Aggregator}.isRecent().
+ * Note: those tests are affected by {@link Aggregator}.isOutdated().
  * If the test device is too slow (like in a CI) these are likely to fail as the sensor data will be omitted from actual.
  */
 @RunWith(AndroidJUnit4.class)
@@ -548,23 +551,32 @@ public class ExportImportTest {
     private void mockSensorData(TrackPointCreator trackPointCreator, Float speed, Distance distance, float heartRate, float cadence, Float power, Float altitudeGain) {
         SensorDataSet sensorDataSet = trackPointCreator.getSensorManager().sensorDataSet;
 
-        AggregatorCyclingPower cyclingPower = Mockito.mock(AggregatorCyclingPower.class);
-        Mockito.when(cyclingPower.hasAggregatedValue()).thenReturn(true);
-        Mockito.when(cyclingPower.getAggregatedValue(Mockito.any())).thenReturn(Power.of(power));
+        AggregatorCyclingPower cyclingPower = new AggregatorCyclingPower("", "");
+        cyclingPower.add(new Raw<>(trackPointCreator.createNow(), new BluetoothHandlerManagerCyclingPower.Data(Power.of(power), null)));
         sensorDataSet.add(cyclingPower);
 
-        AggregatorHeartRate avgHeartRate = Mockito.mock(AggregatorHeartRate.class);
-        Mockito.when(avgHeartRate.getAggregatedValue(Mockito.any())).thenReturn(HeartRate.of(heartRate));
+
+        AggregatorHeartRate avgHeartRate = new AggregatorHeartRate("", "");
+        avgHeartRate.add(new Raw<>(trackPointCreator.createNow(), HeartRate.of(heartRate)));
         sensorDataSet.add(avgHeartRate);
 
-        AggregatorCyclingCadence cyclingCadence = Mockito.mock(AggregatorCyclingCadence.class);
-        Mockito.when(cyclingCadence.hasAggregatedValue()).thenReturn(true);
-        Mockito.when(cyclingCadence.getAggregatedValue(Mockito.any())).thenReturn(Cadence.of(cadence));
+        AggregatorCyclingCadence cyclingCadence = new AggregatorCyclingCadence("", "") {
+            @NonNull
+            @Override
+            public Cadence getAggregatedValue(Instant now) {
+                return Cadence.of(cadence);
+            }
+
+            @Override
+            public boolean hasReceivedData() {
+                return true;
+            }
+        };
         sensorDataSet.add(cyclingCadence);
 
         if (distance != null && speed != null) {
             AggregatorCyclingDistanceSpeed distanceSpeed = Mockito.mock(AggregatorCyclingDistanceSpeed.class);
-            Mockito.when(distanceSpeed.hasAggregatedValue()).thenReturn(true);
+            Mockito.when(distanceSpeed.hasReceivedData()).thenReturn(true);
             Mockito.when(distanceSpeed.getAggregatedValue(Mockito.any())).thenReturn(new AggregatorCyclingDistanceSpeed.Data(null, distance, Speed.of(speed)));
             sensorDataSet.add(distanceSpeed);
         } else {
@@ -581,7 +593,7 @@ public class ExportImportTest {
 
         if (altitudeGain != null) {
             AggregatorBarometer barometer = Mockito.mock(AggregatorBarometer.class);
-            Mockito.when(barometer.hasAggregatedValue()).thenReturn(true);
+            Mockito.when(barometer.hasReceivedData()).thenReturn(true);
             Mockito.when(barometer.getAggregatedValue(Mockito.any())).thenReturn(new AltitudeGainLoss(altitudeGain, altitudeGain));
             sensorDataSet.add(barometer);
         }  else {

src/androidTest/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataCyclingTest.java

@@ -66,7 +66,7 @@ public class SensorDataCyclingTest {
         current.add(new Raw<>(Instant.MIN, new BluetoothHandlerCyclingCadence.CrankData(2, 1024)));
 
         // then
-        assertFalse(current.hasAggregatedValue()); //TODO Cadence should be 0?
+        assertFalse(current.hasReceivedData()); //TODO Cadence should be 0?
     }
 
     @Test

src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceRecordingTest.java

@@ -149,12 +149,11 @@ public class TrackRecordingServiceRecordingTest {
         String gps1 = "2020-02-02T02:02:03Z";
         TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps1, 45.0, 35.0, 1, 15);
         String gps2 = "2020-02-02T02:02:04Z";
-
         TrackRecordingServiceTestUtils.sendGPSLocation(trackPointCreator, gps2, 45.0, 35.0, 1, 15);
 
         // when
         String idleTime = "2020-02-02T02:02:17Z";
-        trackPointCreator.setClock("2020-02-02T02:02:17Z");
+        trackPointCreator.setClock(idleTime);
         Thread.sleep(Duration.ofSeconds(15).toMillis());
 
         // then
@@ -722,14 +721,14 @@ public class TrackRecordingServiceRecordingTest {
                         .setLongitude(35)
                         .setHorizontalAccuracy(Distance.of(1))
                         .setSensorDistance(Distance.of(11))
-                        .setSpeed(Speed.of(5))
+                        .setSpeed(Speed.of(0)) //Sensor data is now outdated, but we do not fall back to GPS.
                         .setSensorDistance(Distance.of(0))
         ), TestDataUtil.getTrackPoints(contentProviderUtils, trackId));
     }
 
     private void mockAltitudeChange(TrackPointCreator trackPointCreator, float altitudeGain) {
         AggregatorBarometer barometer = Mockito.mock(AggregatorBarometer.class);
-        Mockito.when(barometer.hasAggregatedValue()).thenReturn(true);
+        Mockito.when(barometer.hasReceivedData()).thenReturn(true);
         Mockito.when(barometer.getAggregatedValue(Mockito.any())).thenReturn(new AltitudeGainLoss(altitudeGain, altitudeGain));
 
         trackPointCreator.getSensorManager().sensorDataSet.barometer = barometer;