Cleanup: horizontal accuracy is now a Distance (and named consistently).

src/androidTest/java/de/dennisguse/opentracks/services/handlers/HandlerServerTest.java

@@ -11,6 +11,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 
 import static org.mockito.Mockito.verify;
@@ -48,13 +49,13 @@ public class HandlerServerTest {
     public void sendTrackPoint() throws InterruptedException {
         // given
         TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, null);
-        int accuracy = 50;
+        Distance horizontalAccuracyThreshold = Distance.of(50);
 
         // when
-        subject.onNewTrackPoint(trackPoint, accuracy);
+        subject.onNewTrackPoint(trackPoint, horizontalAccuracyThreshold);
 
         // then
         Thread.sleep(10); // Wait for executor service
-        verify(server).newTrackPoint(trackPoint, accuracy);
+        verify(server).newTrackPoint(trackPoint, horizontalAccuracyThreshold);
     }
 }

src/androidTest/java/de/dennisguse/opentracks/services/handlers/LocationHandlerTest.java

@@ -18,6 +18,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 
 import java.time.Instant;
 
+import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.util.PreferencesUtils;
 
@@ -66,7 +67,7 @@ public class LocationHandlerTest {
         locationHandler.onLocationChanged(createLocation(45f, 35f, 3, 5, System.currentTimeMillis()));
 
         // then
-        verify(handlerServer, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Integer.class));
+        verify(handlerServer, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
     }
 
     /**
@@ -82,7 +83,7 @@ public class LocationHandlerTest {
         locationHandler.onLocationChanged(createLocation(latitude, 35f, 3, 5, System.currentTimeMillis()));
 
         // then
-        verify(handlerServer, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Integer.class));
+        verify(handlerServer, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
     }
 
     /**
@@ -91,14 +92,14 @@ public class LocationHandlerTest {
     @Test
     public void testOnLocationChanged_poorAccuracy() {
         // given
-        int prefAccuracy = PreferencesUtils.getRecordingGPSAccuracy(sharedPreferences, context);
+        Distance prefAccuracy = PreferencesUtils.getThresholdHorizontalAccuracy(sharedPreferences, context);
 
         // when
-        locationHandler.onLocationChanged(createLocation(45f, 35f, prefAccuracy + 1, 5, System.currentTimeMillis()));
+        locationHandler.onLocationChanged(createLocation(45f, 35f, (float) (prefAccuracy.toM() + 1), 5, System.currentTimeMillis()));
 
         // then
         // no newTrackPoint called
-        verify(handlerServer, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Integer.class));
+        verify(handlerServer, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
     }
 
     @Test
@@ -111,7 +112,7 @@ public class LocationHandlerTest {
         locationHandler.onLocationChanged(createLocation(99.0, 35.0, Long.MAX_VALUE, 15, System.currentTimeMillis()));
 
         // then
-        verify(handlerServer, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Integer.class));
+        verify(handlerServer, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
     }
 
     /**