diff --git a/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java b/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java index 02439159e..9a4587e5c 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java +++ b/src/androidTest/java/de/dennisguse/opentracks/TrackStubUtils.java @@ -32,14 +32,14 @@ public class TrackStubUtils { public static final double INITIAL_ALTITUDE = 22; public static final long INITIAL_TIME = 1000L; - static final String LOCATION_PROVIDER = "gps"; - static final double INITIAL_LATITUDE = 22; - static final double INITIAL_LONGITUDE = 22; - static final float INITIAL_ACCURACY = 5; - static final float INITIAL_SPEED = 10; - static final float INITIAL_BEARING = 3.0f; + private static final String LOCATION_PROVIDER = "gps"; + private static final double INITIAL_LATITUDE = 22; + private static final double INITIAL_LONGITUDE = 22; + private static final float INITIAL_ACCURACY = 5; + private static final float INITIAL_SPEED = 10; + private static final float INITIAL_BEARING = 3.0f; // Used to change the value of latitude, longitude, and altitude. - static final double DIFFERENCE = 0.01; + private static final double DIFFERENCE = 0.01; /** * Gets a a {@link Track} stub with specified number of locations. @@ -71,8 +71,7 @@ public class TrackStubUtils { * * @return a SensorDataSetLocation stub. */ - public static SensorDataSetLocation createSensorDataSetLocation(double latitude, double longitude, - double altitude) { + public static SensorDataSetLocation createSensorDataSetLocation(double latitude, double longitude, double altitude) { // Initial Location Location loc = new Location(LOCATION_PROVIDER); loc.setLatitude(latitude); @@ -82,7 +81,7 @@ public class TrackStubUtils { loc.setSpeed(INITIAL_SPEED); loc.setTime(INITIAL_TIME); loc.setBearing(INITIAL_BEARING); - SensorDataSet sd = new SensorDataSet(100, 100); + SensorDataSet sd = new SensorDataSet(Float.NaN, Float.NaN); return new SensorDataSetLocation(loc, sd); } diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/TrackDataHubTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/TrackDataHubTest.java index 08dda58c9..4a1cfbd87 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/TrackDataHubTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/TrackDataHubTest.java @@ -66,8 +66,6 @@ public class TrackDataHubTest { @Mock private DataSource dataSource; - private TrackDataManager trackDataManager; - private TrackDataHub trackDataHub; @Mock @@ -80,8 +78,7 @@ public class TrackDataHubTest { @Before public void setUp() { sharedPreferences = PreferencesUtils.getSharedPreferences(context); - trackDataManager = new TrackDataManager(); - trackDataHub = new TrackDataHub(context, trackDataManager, contentProviderUtils, TARGET_POINTS) { + trackDataHub = new TrackDataHub(context, new TrackDataManager(), contentProviderUtils, TARGET_POINTS) { @Override protected DataSource newDataSource() { return dataSource; @@ -307,8 +304,7 @@ public class TrackDataHubTest { // Unregister one listener and change track locationIterator = new FixedSizeLocationIterator(101, 10); - when(contentProviderUtils.getTrackPointLocationIterator( - eq(TRACK_ID + 1), eq(0L), eq(false), isA(LocationFactory.class))) + when(contentProviderUtils.getTrackPointLocationIterator(eq(TRACK_ID + 1), eq(0L), eq(false), isA(LocationFactory.class))) .thenReturn(locationIterator); when(contentProviderUtils.getLastTrackPointId(TRACK_ID + 1)).thenReturn(110L); trackDataListener2.clearTrackPoints(); @@ -387,8 +383,7 @@ public class TrackDataHubTest { trackDataHub.start(); trackDataHub.loadTrack(TRACK_ID); - trackDataHub.registerTrackDataListener( - trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE)); + trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE)); verifyAndReset(); // Unregister the listener @@ -400,11 +395,9 @@ public class TrackDataHubTest { verifyAndReset(); // Register the listener after a new track - dataSource.registerContentObserver( - eq(TrackPointsColumns.CONTENT_URI), observerCapture.capture()); + dataSource.registerContentObserver(eq(TrackPointsColumns.CONTENT_URI), observerCapture.capture()); locationIterator = new FixedSizeLocationIterator(1, 10); - when(contentProviderUtils.getTrackPointLocationIterator( - eq(TRACK_ID + 1), eq(0L), eq(false), isA(LocationFactory.class))) + when(contentProviderUtils.getTrackPointLocationIterator(eq(TRACK_ID + 1), eq(0L), eq(false), isA(LocationFactory.class))) .thenReturn(locationIterator); when(contentProviderUtils.getLastTrackPointId(TRACK_ID + 1)).thenReturn(10L); trackDataListener1.clearTrackPoints(); @@ -413,8 +406,7 @@ public class TrackDataHubTest { replay(); trackDataHub.loadTrack(TRACK_ID + 1); - trackDataHub.registerTrackDataListener( - trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE)); + trackDataHub.registerTrackDataListener(trackDataListener1, EnumSet.of(TrackDataType.SAMPLED_IN_TRACK_POINTS_TABLE)); verifyAndReset(); } @@ -532,8 +524,7 @@ public class TrackDataHubTest { when(trackDataListener2.onReportSpeedChanged(false)).thenReturn(false); replay(); - PreferencesUtils.setString( - context, R.string.stats_rate_key, context.getString(R.string.stats_rate_pace)); + PreferencesUtils.setString(context, R.string.stats_rate_key, context.getString(R.string.stats_rate_pace)); OnSharedPreferenceChangeListener listener = preferenceChangeListenerCapture.getValue(); listener.onSharedPreferenceChanged(sharedPreferences, PreferencesUtils.getKey(context, R.string.stats_rate_key)); verifyAndReset(); diff --git a/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java b/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java index 51324ff29..e1c0d7775 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java @@ -60,9 +60,9 @@ public class ChartFragmentTest { // No input. double[] point = fillDataPointTestHelper(sensorDataSetLocation); - Assert.assertEquals(Double.NaN, point[ChartView.HEART_RATE_SERIES + 1], 0.01); - Assert.assertEquals(Double.NaN, point[ChartView.CADENCE_SERIES + 1], 0.01); - Assert.assertEquals(Double.NaN, point[ChartView.POWER_SERIES + 1], 0.01); + Assert.assertEquals(Float.NaN, point[ChartView.HEART_RATE_SERIES + 1], 0.01); + Assert.assertEquals(Float.NaN, point[ChartView.CADENCE_SERIES + 1], 0.01); + Assert.assertEquals(Float.NaN, point[ChartView.POWER_SERIES + 1], 0.01); // Input incorrect state. // Creates SensorData. @@ -70,9 +70,9 @@ public class ChartFragmentTest { sensorDataSetLocation.setSensorDataSet(sensorDataSet); // Test. point = fillDataPointTestHelper(sensorDataSetLocation); - Assert.assertEquals(Double.NaN, point[ChartView.HEART_RATE_SERIES + 1], 0.01); - Assert.assertEquals(Double.NaN, point[ChartView.CADENCE_SERIES + 1], 0.01); - Assert.assertEquals(Double.NaN, point[ChartView.POWER_SERIES + 1], 0.01); + Assert.assertEquals(Float.NaN, point[ChartView.HEART_RATE_SERIES + 1], 0.01); + Assert.assertEquals(Float.NaN, point[ChartView.CADENCE_SERIES + 1], 0.01); + Assert.assertEquals(Float.NaN, point[ChartView.POWER_SERIES + 1], 0.01); } /** @@ -83,9 +83,9 @@ public class ChartFragmentTest { SensorDataSetLocation sensorDataSetLocation = TrackStubUtils.createSensorDataSetLocation(); // No input. double[] point = fillDataPointTestHelper(sensorDataSetLocation); - Assert.assertEquals(Double.NaN, point[ChartView.HEART_RATE_SERIES + 1], 0.01); - Assert.assertEquals(Double.NaN, point[ChartView.CADENCE_SERIES + 1], 0.01); - Assert.assertEquals(Double.NaN, point[ChartView.POWER_SERIES + 1], 0.01); + Assert.assertEquals(Float.NaN, point[ChartView.HEART_RATE_SERIES + 1], 0.01); + Assert.assertEquals(Float.NaN, point[ChartView.CADENCE_SERIES + 1], 0.01); + Assert.assertEquals(Float.NaN, point[ChartView.POWER_SERIES + 1], 0.01); // Creates SensorData. SensorDataSet sensorDataSet = new SensorDataSet(100, 101, 102); diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java index f3c73e8b4..f72ed7c7d 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/GpxFileTrackImporterTest.java @@ -96,7 +96,7 @@ public class GpxFileTrackImporterTest extends AbstractTestFileTrackImporter { expectFirstTrackPoint(location0, TRACK_ID_0, TRACK_POINT_ID_0); // A flush happens at the end - when(contentProviderUtils.bulkInsertTrackPoint(new Location[]{location1}, eq(1), eq(TRACK_ID_0))).thenReturn(1); + when(contentProviderUtils.bulkInsertTrackPoint((Location[]) any(), eq(1), eq(TRACK_ID_0))).thenReturn(1); when(contentProviderUtils.getLastTrackPointId(TRACK_ID_0)).thenReturn(TRACK_POINT_ID_1); when(contentProviderUtils.getTrack(PreferencesUtils.getLong(context, R.string.recording_track_id_key))).thenReturn(null); expectUpdateTrack(trackCaptor, true, TRACK_ID_0);