diff --git a/src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java b/src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java index 6c4a48fa7..0f0c82cb1 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java @@ -19,13 +19,16 @@ import androidx.annotation.NonNull; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import de.dennisguse.opentracks.R; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Tests {@link ChartValueSeries}. * @@ -60,16 +63,16 @@ public class ChartValueSeriesTest { @Test public void testInitialConditions() { - Assert.assertEquals(1, series.getInterval()); - Assert.assertEquals(0, series.getMinMarkerValue()); - Assert.assertEquals(5, series.getMaxMarkerValue()); - Assert.assertTrue(series.isEnabled()); + assertEquals(1, series.getInterval()); + assertEquals(0, series.getMinMarkerValue()); + assertEquals(5, series.getMaxMarkerValue()); + assertTrue(series.isEnabled()); } @Test public void testEnabled() { series.setEnabled(false); - Assert.assertFalse(series.isEnabled()); + assertFalse(series.isEnabled()); } @Test @@ -77,9 +80,9 @@ public class ChartValueSeriesTest { series.update(new ChartPoint(0)); series.update(new ChartPoint(10)); series.updateDimension(); - Assert.assertEquals(100, series.getInterval()); - Assert.assertEquals(0, series.getMinMarkerValue()); - Assert.assertEquals(500, series.getMaxMarkerValue()); + assertEquals(100, series.getInterval()); + assertEquals(0, series.getMinMarkerValue()); + assertEquals(500, series.getMaxMarkerValue()); } @Test @@ -87,9 +90,9 @@ public class ChartValueSeriesTest { series.update(new ChartPoint(0)); series.update(new ChartPoint(901)); series.updateDimension(); - Assert.assertEquals(1000, series.getInterval()); - Assert.assertEquals(0, series.getMinMarkerValue()); - Assert.assertEquals(5000, series.getMaxMarkerValue()); + assertEquals(1000, series.getInterval()); + assertEquals(0, series.getMinMarkerValue()); + assertEquals(5000, series.getMaxMarkerValue()); } @Test @@ -97,8 +100,8 @@ public class ChartValueSeriesTest { series.update(new ChartPoint(220)); series.update(new ChartPoint(250)); series.updateDimension(); - Assert.assertEquals(100, series.getInterval()); - Assert.assertEquals(200, series.getMinMarkerValue()); - Assert.assertEquals(700, series.getMaxMarkerValue()); + assertEquals(100, series.getInterval()); + assertEquals(200, series.getMinMarkerValue()); + assertEquals(700, series.getMaxMarkerValue()); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java index 5d720c4b8..0b465801a 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/DescriptionGeneratorTest.java @@ -21,7 +21,6 @@ import android.content.Context; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,6 +30,8 @@ import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.StringUtils; +import static org.junit.Assert.assertEquals; + /** * Tests for {@link DescriptionGenerator}. * @@ -85,7 +86,7 @@ public class DescriptionGeneratorTest { + "Elevation gain: 6000 m (19685 ft)
" + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "
"; - Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true)); + assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true)); } @Test @@ -119,7 +120,7 @@ public class DescriptionGeneratorTest { + "Elevation gain: 6000 m (19685 ft)
" + "Recorded: " + StringUtils.formatDateTime(context, START_TIME) + "
"; - Assert.assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true)); + assertEquals(expected, descriptionGenerator.generateTrackDescription(track, true)); } @@ -130,7 +131,7 @@ public class DescriptionGeneratorTest { public void testWriteDistance() { StringBuilder builder = new StringBuilder(); descriptionGenerator.writeDistance(1100, builder, R.string.description_total_distance, "
"); - Assert.assertEquals("Total distance: 1.10 km (0.7 mi)
", builder.toString()); + assertEquals("Total distance: 1.10 km (0.7 mi)
", builder.toString()); } /** @@ -140,7 +141,7 @@ public class DescriptionGeneratorTest { public void testWriteTime() { StringBuilder builder = new StringBuilder(); descriptionGenerator.writeTime(1000, builder, R.string.description_total_time, "
"); - Assert.assertEquals("Total time: 00:01
", builder.toString()); + assertEquals("Total time: 00:01
", builder.toString()); } /** @@ -150,7 +151,7 @@ public class DescriptionGeneratorTest { public void testWriteSpeed() { StringBuilder builder = new StringBuilder(); descriptionGenerator.writeSpeed(1.1, builder, R.string.description_average_speed, "\n"); - Assert.assertEquals("Average speed: 3.96 km/h (2.5 mi/h)\n", builder.toString()); + assertEquals("Average speed: 3.96 km/h (2.5 mi/h)\n", builder.toString()); } /** @@ -160,7 +161,7 @@ public class DescriptionGeneratorTest { public void testWriteElevation() { StringBuilder builder = new StringBuilder(); descriptionGenerator.writeElevation(4.2, builder, R.string.description_min_elevation, "
"); - Assert.assertEquals("Min elevation: 4 m (14 ft)
", builder.toString()); + assertEquals("Min elevation: 4 m (14 ft)
", builder.toString()); } /** @@ -170,6 +171,6 @@ public class DescriptionGeneratorTest { public void testWritePace() { StringBuilder builder = new StringBuilder(); descriptionGenerator.writePace(1.1, builder, R.string.description_average_pace_in_minute, "\n"); - Assert.assertEquals("Average pace: 15:09 min/km (24:23 min/mi)\n", builder.toString()); + assertEquals("Average pace: 15:09 min/km (24:23 min/mi)\n", builder.toString()); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java index b3e7d126c..173915217 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/SearchEngineTest.java @@ -24,7 +24,6 @@ import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.rule.provider.ProviderTestRule; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -42,6 +41,10 @@ import de.dennisguse.opentracks.content.provider.CustomContentProvider; import de.dennisguse.opentracks.content.provider.CustomSQLiteOpenHelper; import de.dennisguse.opentracks.stats.TrackStatistics; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + /** * Tests for {@link SearchEngine}. * These are not meant to be quality tests, but instead feature-by-feature tests. @@ -200,7 +203,7 @@ public class SearchEngineTest { ArrayList results = new ArrayList<>(engine.search(query)); // Title > Description > Category. - Assert.assertEquals(results.toString(), 3, results.size()); + assertEquals(results.toString(), 3, results.size()); assertTrackResult(trackId, results.get(0)); assertWaypointResult(titleWaypointId, results.get(1)); assertWaypointResult(descriptionWaypointId, results.get(2)); @@ -274,9 +277,9 @@ public class SearchEngineTest { } private void assertTrackResult(Track.Id trackId, ScoredResult result) { - Assert.assertNotNull("Not a track", result.track); - Assert.assertNull("Ambiguous result", result.waypoint); - Assert.assertEquals(trackId, result.track.getId()); + assertNotNull("Not a track", result.track); + assertNull("Ambiguous result", result.waypoint); + assertEquals(trackId, result.track.getId()); } private void assertTrackResults(List results, Track.Id... trackIds) { @@ -286,19 +289,19 @@ public class SearchEngineTest { } String errMsg = "Expected IDs=" + Arrays.toString(longTrackIds) + "; results=" + results; - Assert.assertEquals(results.size(), trackIds.length); + assertEquals(results.size(), trackIds.length); for (int i = 0; i < results.size(); i++) { ScoredResult result = results.get(i); - Assert.assertNotNull(errMsg, result.track); - Assert.assertNull(errMsg, result.waypoint); - Assert.assertEquals(errMsg, trackIds[i], result.track.getId()); + assertNotNull(errMsg, result.track); + assertNull(errMsg, result.waypoint); + assertEquals(errMsg, trackIds[i], result.track.getId()); } } private void assertWaypointResult(Waypoint.Id waypointId, ScoredResult result) { - Assert.assertNotNull("Not a waypoint", result.waypoint); - Assert.assertNull("Ambiguous result", result.track); - Assert.assertEquals(waypointId, result.waypoint.getId()); + assertNotNull("Not a waypoint", result.waypoint); + assertNull("Ambiguous result", result.track); + assertEquals(waypointId, result.waypoint.getId()); } private void assertWaypointResults(List results, Waypoint.Id... waypointIds) { @@ -308,12 +311,12 @@ public class SearchEngineTest { } String errMsg = "Expected IDs=" + Arrays.toString(longWaypointIds) + "; results=" + results; - Assert.assertEquals(results.size(), waypointIds.length); + assertEquals(results.size(), waypointIds.length); for (int i = 0; i < results.size(); i++) { ScoredResult result = results.get(i); - Assert.assertNotNull(errMsg, result.waypoint); - Assert.assertNull(errMsg, result.track); - Assert.assertEquals(errMsg, waypointIds[i], result.waypoint.getId()); + assertNotNull(errMsg, result.waypoint); + assertNull(errMsg, result.track); + assertEquals(errMsg, waypointIds[i], result.waypoint.getId()); } } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java index bda72e3ba..4835b8811 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java @@ -25,7 +25,6 @@ import android.util.Pair; import androidx.test.core.app.ApplicationProvider; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -50,6 +49,11 @@ import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.FileUtils; import de.dennisguse.opentracks.util.UUIDUtils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; /** @@ -122,13 +126,13 @@ public class CustomContentProviderUtilsTest { try (TrackPointIterator it = contentProviderUtils.getTrackPointLocationIterator(trackId, -1L, descending)) { while (it.hasNext()) { TrackPoint loc = it.next(); - Assert.assertNotNull(loc); + assertNotNull(loc); locations.add(loc); // Make sure the IDs are returned in the right order. - Assert.assertEquals(descending ? lastPointId - locations.size() + 1 + assertEquals(descending ? lastPointId - locations.size() + 1 : lastPointId - numPoints + locations.size(), it.getTrackPointId()); } - Assert.assertEquals(numPoints, locations.size()); + assertEquals(numPoints, locations.size()); } } @@ -138,7 +142,7 @@ public class CustomContentProviderUtilsTest { track.setName("Test: " + id.getId()); contentProviderUtils.insertTrack(track); track = contentProviderUtils.getTrack(id); - Assert.assertNotNull(track); + assertNotNull(track); TrackPoint[] trackPoints = new TrackPoint[numPoints]; for (int i = 0; i < numPoints; ++i) { @@ -162,8 +166,8 @@ public class CustomContentProviderUtilsTest { } } - Assert.assertTrue(numPoints == 0 || lastPointId > 0); - Assert.assertEquals(numPoints, counter); + assertTrue(numPoints == 0 || lastPointId > 0); + assertEquals(numPoints, counter); return lastPointId; } @@ -195,8 +199,8 @@ public class CustomContentProviderUtilsTest { when(cursorMock.getString(columnIndex)).thenReturn(name); Track track = contentProviderUtils.createTrack(cursorMock); - Assert.assertEquals(trackId, track.getId()); - Assert.assertEquals(name, track.getName()); + assertEquals(trackId, track.getId()); + assertEquals(name, track.getName()); } /** @@ -213,20 +217,20 @@ public class CustomContentProviderUtilsTest { ContentResolver contentResolver = context.getContentResolver(); Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID); - Assert.assertEquals(1, tracksCursor.getCount()); + assertEquals(1, tracksCursor.getCount()); Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID); - Assert.assertEquals(10, tracksPointsCursor.getCount()); + assertEquals(10, tracksPointsCursor.getCount()); Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID); - Assert.assertEquals(1, waypointCursor.getCount()); + assertEquals(1, waypointCursor.getCount()); // Delete all. contentProviderUtils.deleteAllTracks(context); // Check whether all have been deleted. tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID); - Assert.assertEquals(0, tracksCursor.getCount()); + assertEquals(0, tracksCursor.getCount()); tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID); - Assert.assertEquals(0, tracksPointsCursor.getCount()); + assertEquals(0, tracksPointsCursor.getCount()); waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID); - Assert.assertEquals(0, waypointCursor.getCount()); + assertEquals(0, waypointCursor.getCount()); } /** @@ -244,27 +248,27 @@ public class CustomContentProviderUtilsTest { ContentResolver contentResolver = context.getContentResolver(); Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID); - Assert.assertEquals(1, tracksCursor.getCount()); + assertEquals(1, tracksCursor.getCount()); Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID); - Assert.assertEquals(10, tracksPointsCursor.getCount()); + assertEquals(10, tracksPointsCursor.getCount()); Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID); - Assert.assertEquals(1, waypointCursor.getCount()); + assertEquals(1, waypointCursor.getCount()); // Check waypoint has photo and it's in the external storage. - Assert.assertTrue(waypoint.hasPhoto()); + assertTrue(waypoint.hasPhoto()); File dir = FileUtils.getPhotoDir(context, trackId); - Assert.assertTrue(dir.isDirectory()); - Assert.assertEquals(1, dir.list().length); - Assert.assertTrue(dir.exists()); + assertTrue(dir.isDirectory()); + assertEquals(1, dir.list().length); + assertTrue(dir.exists()); // Delete all. contentProviderUtils.deleteAllTracks(context); // Check whether all have been deleted. tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID); - Assert.assertEquals(0, tracksCursor.getCount()); + assertEquals(0, tracksCursor.getCount()); tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID); - Assert.assertEquals(0, tracksPointsCursor.getCount()); + assertEquals(0, tracksPointsCursor.getCount()); waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID); - Assert.assertEquals(0, waypointCursor.getCount()); - Assert.assertFalse(dir.exists()); + assertEquals(0, waypointCursor.getCount()); + assertFalse(dir.exists()); } /** @@ -289,20 +293,20 @@ public class CustomContentProviderUtilsTest { ContentResolver contentResolver = context.getContentResolver(); Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID); - Assert.assertEquals(3, tracksCursor.getCount()); + assertEquals(3, tracksCursor.getCount()); Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID); - Assert.assertEquals(20, tracksPointsCursor.getCount()); + assertEquals(20, tracksPointsCursor.getCount()); Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID); - Assert.assertEquals(1, waypointCursor.getCount()); + assertEquals(1, waypointCursor.getCount()); // Delete one track. contentProviderUtils.deleteTrack(context, trackId1); // Check whether all data of a track has been deleted. tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID); - Assert.assertEquals(2, tracksCursor.getCount()); + assertEquals(2, tracksCursor.getCount()); tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID); - Assert.assertEquals(20, tracksPointsCursor.getCount()); + assertEquals(20, tracksPointsCursor.getCount()); waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID); - Assert.assertEquals(0, waypointCursor.getCount()); + assertEquals(0, waypointCursor.getCount()); } /** @@ -334,29 +338,29 @@ public class CustomContentProviderUtilsTest { // Check. ContentResolver contentResolver = context.getContentResolver(); Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID); - Assert.assertEquals(3, tracksCursor.getCount()); + assertEquals(3, tracksCursor.getCount()); Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID); - Assert.assertEquals(30, tracksPointsCursor.getCount()); + assertEquals(30, tracksPointsCursor.getCount()); Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID); - Assert.assertEquals(2, waypointCursor.getCount()); - Assert.assertTrue(waypoint1.hasPhoto()); - Assert.assertTrue(dir1.isDirectory()); - Assert.assertEquals(1, dir1.list().length); - Assert.assertTrue(dir1.exists()); - Assert.assertTrue(dir2.isDirectory()); - Assert.assertEquals(1, dir2.list().length); - Assert.assertTrue(dir2.exists()); + assertEquals(2, waypointCursor.getCount()); + assertTrue(waypoint1.hasPhoto()); + assertTrue(dir1.isDirectory()); + assertEquals(1, dir1.list().length); + assertTrue(dir1.exists()); + assertTrue(dir2.isDirectory()); + assertEquals(1, dir2.list().length); + assertTrue(dir2.exists()); // Delete one track. contentProviderUtils.deleteTrack(context, trackId1); // Check whether all data of a track has been deleted. tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID); - Assert.assertEquals(2, tracksCursor.getCount()); + assertEquals(2, tracksCursor.getCount()); tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI_BY_ID, null, null, null, TrackPointsColumns._ID); - Assert.assertEquals(20, tracksPointsCursor.getCount()); + assertEquals(20, tracksPointsCursor.getCount()); waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID); - Assert.assertEquals(1, waypointCursor.getCount()); - Assert.assertFalse(dir1.exists()); - Assert.assertTrue(dir2.exists()); + assertEquals(1, waypointCursor.getCount()); + assertFalse(dir1.exists()); + assertTrue(dir2.exists()); } /** @@ -373,8 +377,8 @@ public class CustomContentProviderUtilsTest { List allTracks = contentProviderUtils.getTracks(); // then - Assert.assertEquals(initialTrackNumber + 1, allTracks.size()); - Assert.assertEquals(trackId, allTracks.get(allTracks.size() - 1).getId()); + assertEquals(initialTrackNumber + 1, allTracks.size()); + assertEquals(trackId, allTracks.get(allTracks.size() - 1).getId()); } /** @@ -384,7 +388,7 @@ public class CustomContentProviderUtilsTest { public void testGetLastTrack() { Track.Id trackId = new Track.Id(System.currentTimeMillis()); contentProviderUtils.insertTrack(TestDataUtil.createTrack(trackId)); - Assert.assertEquals(trackId, contentProviderUtils.getLastTrack().getId()); + assertEquals(trackId, contentProviderUtils.getLastTrack().getId()); } /** @@ -397,7 +401,7 @@ public class CustomContentProviderUtilsTest { contentProviderUtils.insertTrack(TestDataUtil.createTrack(trackId)); // when / then - Assert.assertNotNull(contentProviderUtils.getTrack(trackId)); + assertNotNull(contentProviderUtils.getTrack(trackId)); } /** @@ -411,7 +415,7 @@ public class CustomContentProviderUtilsTest { contentProviderUtils.insertTrack(track); // when / then - Assert.assertNotNull(contentProviderUtils.getTrack(track.getUuid())); + assertNotNull(contentProviderUtils.getTrack(track.getUuid())); } /** @@ -428,10 +432,10 @@ public class CustomContentProviderUtilsTest { // when / then contentProviderUtils.insertTrack(track); - Assert.assertEquals(nameOld, contentProviderUtils.getTrack(trackId).getName()); + assertEquals(nameOld, contentProviderUtils.getTrack(trackId).getName()); track.setName(nameNew); contentProviderUtils.updateTrack(track); - Assert.assertEquals(nameNew, contentProviderUtils.getTrack(trackId).getName()); + assertEquals(nameNew, contentProviderUtils.getTrack(trackId).getName()); } /** @@ -468,9 +472,9 @@ public class CustomContentProviderUtilsTest { Waypoint.Id waypointId = new Waypoint.Id(System.currentTimeMillis()); waypoint.setId(waypointId); ContentValues contentValues = contentProviderUtils.createContentValues(waypoint); - Assert.assertEquals(waypointId.getId(), contentValues.get(WaypointsColumns._ID)); - Assert.assertEquals((int) (TestDataUtil.INITIAL_LONGITUDE * 1000000), contentValues.get(WaypointsColumns.LONGITUDE)); - Assert.assertEquals(TEST_DESC, contentValues.get(WaypointsColumns.DESCRIPTION)); + assertEquals(waypointId.getId(), contentValues.get(WaypointsColumns._ID)); + assertEquals((int) (TestDataUtil.INITIAL_LONGITUDE * 1000000), contentValues.get(WaypointsColumns.LONGITUDE)); + assertEquals(TEST_DESC, contentValues.get(WaypointsColumns.DESCRIPTION)); } /** @@ -502,9 +506,9 @@ public class CustomContentProviderUtilsTest { when(cursorMock.getLong(columnIndex++)).thenReturn(trackId); Waypoint waypoint = contentProviderUtils.createWaypoint(cursorMock); - Assert.assertEquals(id, waypoint.getId().getId()); - Assert.assertEquals(name, waypoint.getName()); - Assert.assertEquals(trackId, waypoint.getTrackId().getId()); + assertEquals(id, waypoint.getId().getId()); + assertEquals(name, waypoint.getName()); + assertEquals(trackId, waypoint.getTrackId().getId()); } /** @@ -524,7 +528,7 @@ public class CustomContentProviderUtilsTest { contentProviderUtils.insertWaypoint(waypoint1); // Check insert was done. - Assert.assertEquals(contentProviderUtils.getWaypointCount(trackId), 1); + assertEquals(contentProviderUtils.getWaypointCount(trackId), 1); // Get waypoint id that needs to delete. Waypoint.Id waypoint1Id = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint1))); @@ -532,7 +536,7 @@ public class CustomContentProviderUtilsTest { // Delete contentProviderUtils.deleteWaypoint(context, waypoint1Id); - Assert.assertNull(contentProviderUtils.getWaypoint(waypoint1Id)); + assertNull(contentProviderUtils.getWaypoint(waypoint1Id)); } /** @@ -551,24 +555,24 @@ public class CustomContentProviderUtilsTest { contentProviderUtils.insertWaypoint(waypoint1); // Check insert was done. - Assert.assertEquals(contentProviderUtils.getWaypointCount(trackId), 1); + assertEquals(contentProviderUtils.getWaypointCount(trackId), 1); // Get waypoint id that needs to delete. Waypoint.Id waypoint1Id = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint1))); // Check waypoint has photo and it's in the external storage. - Assert.assertTrue(waypoint1.hasPhoto()); + assertTrue(waypoint1.hasPhoto()); File dir = FileUtils.getPhotoDir(context, trackId); - Assert.assertTrue(dir.isDirectory()); - Assert.assertEquals(1, dir.list().length); - Assert.assertTrue(dir.exists()); + assertTrue(dir.isDirectory()); + assertEquals(1, dir.list().length); + assertTrue(dir.exists()); // Delete contentProviderUtils.deleteWaypoint(context, waypoint1Id); // Check waypoint doesn't exists and photo folder was deleted. - Assert.assertNull(contentProviderUtils.getWaypoint(waypoint1Id)); - Assert.assertFalse(dir.exists()); + assertNull(contentProviderUtils.getWaypoint(waypoint1Id)); + assertFalse(dir.exists()); } /** @@ -607,11 +611,11 @@ public class CustomContentProviderUtilsTest { Waypoint.Id waypoint2Id = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint2))); // Delete - Assert.assertNotNull(contentProviderUtils.getWaypoint(waypoint1Id)); + assertNotNull(contentProviderUtils.getWaypoint(waypoint1Id)); contentProviderUtils.deleteWaypoint(context, waypoint1Id); - Assert.assertNull(contentProviderUtils.getWaypoint(waypoint1Id)); + assertNull(contentProviderUtils.getWaypoint(waypoint1Id)); - Assert.assertEquals(MOCK_DESC, contentProviderUtils.getWaypoint(waypoint2Id).getDescription()); + assertEquals(MOCK_DESC, contentProviderUtils.getWaypoint(waypoint2Id).getDescription()); } /** @@ -635,7 +639,7 @@ public class CustomContentProviderUtilsTest { contentProviderUtils.insertWaypoint(waypoint3); contentProviderUtils.insertWaypoint(waypoint4); - Assert.assertEquals(4, contentProviderUtils.getNextWaypointNumber(trackId)); + assertEquals(4, contentProviderUtils.getNextWaypointNumber(trackId)); } /** @@ -652,7 +656,7 @@ public class CustomContentProviderUtilsTest { waypoint.setTrackId(trackId); Waypoint.Id waypointId = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint))); - Assert.assertEquals(TEST_DESC, contentProviderUtils.getWaypoint(waypointId).getDescription()); + assertEquals(TEST_DESC, contentProviderUtils.getWaypoint(waypointId).getDescription()); } /** @@ -674,7 +678,7 @@ public class CustomContentProviderUtilsTest { waypoint.setDescription(TEST_DESC_NEW); contentProviderUtils.updateWaypoint(context, waypoint); - Assert.assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription()); + assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription()); } /** @@ -695,9 +699,9 @@ public class CustomContentProviderUtilsTest { Waypoint.Id waypointId = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint))); File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.getId()); - Assert.assertTrue(dir.exists()); - Assert.assertTrue(dir.isDirectory()); - Assert.assertEquals(1, dir.list().length); + assertTrue(dir.exists()); + assertTrue(dir.isDirectory()); + assertEquals(1, dir.list().length); // Update waypoint = contentProviderUtils.getWaypoint(waypointId); @@ -705,12 +709,12 @@ public class CustomContentProviderUtilsTest { waypoint.setDescription(TEST_DESC_NEW); contentProviderUtils.updateWaypoint(context, waypoint); - Assert.assertEquals(TEST_NAME_NEW, contentProviderUtils.getWaypoint(waypointId).getName()); - Assert.assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription()); - Assert.assertTrue(waypoint.hasPhoto()); - Assert.assertTrue(dir.exists()); - Assert.assertTrue(dir.isDirectory()); - Assert.assertEquals(1, dir.list().length); + assertEquals(TEST_NAME_NEW, contentProviderUtils.getWaypoint(waypointId).getName()); + assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription()); + assertTrue(waypoint.hasPhoto()); + assertTrue(dir.exists()); + assertTrue(dir.isDirectory()); + assertEquals(1, dir.list().length); } /** @@ -731,9 +735,9 @@ public class CustomContentProviderUtilsTest { Waypoint.Id waypointId = new Waypoint.Id(ContentUris.parseId(contentProviderUtils.insertWaypoint(waypoint))); File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.getId()); - Assert.assertTrue(dir.exists()); - Assert.assertTrue(dir.isDirectory()); - Assert.assertEquals(1, dir.list().length); + assertTrue(dir.exists()); + assertTrue(dir.isDirectory()); + assertEquals(1, dir.list().length); // Update waypoint = contentProviderUtils.getWaypoint(waypointId); @@ -742,10 +746,10 @@ public class CustomContentProviderUtilsTest { waypoint.setPhotoUrl(null); contentProviderUtils.updateWaypoint(context, waypoint); - Assert.assertEquals(TEST_NAME_NEW, contentProviderUtils.getWaypoint(waypointId).getName()); - Assert.assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription()); - Assert.assertFalse(waypoint.hasPhoto()); - Assert.assertFalse(dir.exists()); + assertEquals(TEST_NAME_NEW, contentProviderUtils.getWaypoint(waypointId).getName()); + assertEquals(TEST_DESC_NEW, contentProviderUtils.getWaypoint(waypointId).getDescription()); + assertFalse(waypoint.hasPhoto()); + assertFalse(dir.exists()); } /** @@ -770,20 +774,20 @@ public class CustomContentProviderUtilsTest { contentProviderUtils.insertWaypoint(otherWaypoint); File dir = new File(FileUtils.getPhotoDir(context), "" + trackId.getId()); - Assert.assertTrue(dir.exists()); - Assert.assertTrue(dir.isDirectory()); - Assert.assertEquals(2, dir.list().length); + assertTrue(dir.exists()); + assertTrue(dir.isDirectory()); + assertEquals(2, dir.list().length); // Update one waypoint deleting photo. waypoint = contentProviderUtils.getWaypoint(waypointId); waypoint.setPhotoUrl(null); contentProviderUtils.updateWaypoint(context, waypoint); - Assert.assertEquals(TEST_DESC, contentProviderUtils.getWaypoint(waypointId).getDescription()); - Assert.assertFalse(waypoint.hasPhoto()); - Assert.assertTrue(dir.exists()); - Assert.assertTrue(dir.isDirectory()); - Assert.assertEquals(1, dir.list().length); + assertEquals(TEST_DESC, contentProviderUtils.getWaypoint(waypointId).getDescription()); + assertFalse(waypoint.hasPhoto()); + assertTrue(dir.exists()); + assertTrue(dir.isDirectory()); + assertEquals(1, dir.list().length); } /** @@ -798,9 +802,9 @@ public class CustomContentProviderUtilsTest { // when / then contentProviderUtils.bulkInsertTrackPoint(track.second, trackId); - Assert.assertEquals(20, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount()); + assertEquals(20, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount()); contentProviderUtils.bulkInsertTrackPoint(Arrays.copyOfRange(track.second, 0, 8), trackId); - Assert.assertEquals(28, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount()); + assertEquals(28, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000, false).getCount()); } /** @@ -839,11 +843,11 @@ public class CustomContentProviderUtilsTest { TrackPoint trackPoint = contentProviderUtils.createTrackPoint(cursorMock); // then - Assert.assertEquals(longitude, trackPoint.getLongitude(), 0.01); - Assert.assertEquals(latitude, trackPoint.getLatitude(), 0.01); - Assert.assertEquals(time, trackPoint.getTime(), 0.01); - Assert.assertEquals(speed, trackPoint.getSpeed(), 0.01); - Assert.assertFalse(trackPoint.hasHeartRate()); + assertEquals(longitude, trackPoint.getLongitude(), 0.01); + assertEquals(latitude, trackPoint.getLatitude(), 0.01); + assertEquals(time, trackPoint.getTime(), 0.01); + assertEquals(speed, trackPoint.getSpeed(), 0.01); + assertFalse(trackPoint.hasHeartRate()); } /** @@ -857,7 +861,7 @@ public class CustomContentProviderUtilsTest { Track track = TestDataUtil.createTrackAndInsert(contentProviderUtils, trackId, 10); contentProviderUtils.insertTrackPoint(TestDataUtil.createTrackPoint(22), trackId); - Assert.assertEquals(11, contentProviderUtils.getTrackPoints(trackId).size()); + assertEquals(11, contentProviderUtils.getTrackPoints(trackId).size()); } @Test @@ -876,10 +880,10 @@ public class CustomContentProviderUtilsTest { // then List trackPoints = contentProviderUtils.getTrackPoints(trackId); - Assert.assertTrue(trackPoints.get(10).hasHeartRate()); - Assert.assertEquals(trackPoint.getHeartRate_bpm(), trackPoints.get(10).getHeartRate_bpm(), 0.01); - Assert.assertEquals(trackPoint.getCyclingCadence_rpm(), trackPoints.get(10).getCyclingCadence_rpm(), 0.01); - Assert.assertEquals(trackPoint.getPower(), trackPoints.get(10).getPower(), 0.01); + assertTrue(trackPoints.get(10).hasHeartRate()); + assertEquals(trackPoint.getHeartRate_bpm(), trackPoints.get(10).getHeartRate_bpm(), 0.01); + assertEquals(trackPoint.getCyclingCadence_rpm(), trackPoints.get(10).getCyclingCadence_rpm(), 0.01); + assertEquals(trackPoint.getPower(), trackPoints.get(10).getPower(), 0.01); } /** @@ -914,7 +918,7 @@ public class CustomContentProviderUtilsTest { Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds[1], 5, true); // then - Assert.assertEquals(2, cursor.getCount()); + assertEquals(2, cursor.getCount()); } /** @@ -936,7 +940,7 @@ public class CustomContentProviderUtilsTest { Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds[8], 5, false); // then - Assert.assertEquals(2, cursor.getCount()); + assertEquals(2, cursor.getCount()); } /** @@ -960,12 +964,12 @@ public class CustomContentProviderUtilsTest { // then for (int i = 0; i < trackpointIds.length; i++) { - Assert.assertTrue(trackPointIterator.hasNext()); + assertTrue(trackPointIterator.hasNext()); TrackPoint trackPoint = trackPointIterator.next(); - Assert.assertEquals(startTrackPointId - i, trackPointIterator.getTrackPointId()); + assertEquals(startTrackPointId - i, trackPointIterator.getTrackPointId()); checkLocation((trackpointIds.length - 1) - i, trackPoint.getLocation()); } - Assert.assertFalse(trackPointIterator.hasNext()); + assertFalse(trackPointIterator.hasNext()); } /** @@ -990,13 +994,13 @@ public class CustomContentProviderUtilsTest { // then for (int i = 0; i < trackpointIds.length; i++) { - Assert.assertTrue(trackPointIterator.hasNext()); + assertTrue(trackPointIterator.hasNext()); TrackPoint trackPoint = trackPointIterator.next(); - Assert.assertEquals(startTrackPointId + i, trackPointIterator.getTrackPointId()); + assertEquals(startTrackPointId + i, trackPointIterator.getTrackPointId()); checkLocation(i, trackPoint.getLocation()); } - Assert.assertFalse(trackPointIterator.hasNext()); + assertFalse(trackPointIterator.hasNext()); } /** @@ -1006,16 +1010,16 @@ public class CustomContentProviderUtilsTest { * @param location the location to be checked */ private void checkLocation(int i, Location location) { - Assert.assertEquals(TestDataUtil.INITIAL_LATITUDE + (double) i / 10000.0, location.getLatitude(), 0.01); - Assert.assertEquals(TestDataUtil.INITIAL_LONGITUDE - (double) i / 10000.0, location.getLongitude(), 0.01); - Assert.assertEquals((float) i / 100.0f, location.getAccuracy(), 0.01); - Assert.assertEquals(i * TestDataUtil.ALTITUDE_INTERVAL, location.getAltitude(), 0.01); + assertEquals(TestDataUtil.INITIAL_LATITUDE + (double) i / 10000.0, location.getLatitude(), 0.01); + assertEquals(TestDataUtil.INITIAL_LONGITUDE - (double) i / 10000.0, location.getLongitude(), 0.01); + assertEquals((float) i / 100.0f, location.getAccuracy(), 0.01); + assertEquals(i * TestDataUtil.ALTITUDE_INTERVAL, location.getAltitude(), 0.01); } @Test public void testFormatIdListForUri() { - Assert.assertEquals("", ContentProviderUtils.formatIdListForUri()); - Assert.assertEquals("12", ContentProviderUtils.formatIdListForUri(new Track.Id(12))); - Assert.assertEquals("42,43,44", ContentProviderUtils.formatIdListForUri(new Track.Id(42), new Track.Id(43), new Track.Id(44))); + assertEquals("", ContentProviderUtils.formatIdListForUri()); + assertEquals("12", ContentProviderUtils.formatIdListForUri(new Track.Id(12))); + assertEquals("42,43,44", ContentProviderUtils.formatIdListForUri(new Track.Id(42), new Track.Id(43), new Track.Id(44))); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/provider/ShareContentProviderTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/provider/ShareContentProviderTest.java index bcd3e9577..83e231302 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/ShareContentProviderTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/provider/ShareContentProviderTest.java @@ -3,7 +3,6 @@ package de.dennisguse.opentracks.content.provider; import android.net.Uri; import android.util.Pair; -import org.junit.Assert; import org.junit.Test; import java.util.HashSet; @@ -12,17 +11,19 @@ import java.util.Set; import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.io.file.TrackFileFormat; +import static org.junit.Assert.assertEquals; + public class ShareContentProviderTest { @Test - public void testCreateandParseURI_invalid() { + public void testCreateAndParseURI_invalid() { Uri uri = Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/1"); - Assert.assertEquals(0, ShareContentProvider.parseURI(uri).size()); + assertEquals(0, ShareContentProvider.parseURI(uri).size()); } @Test - public void testCreateandParseURI_valid() { + public void testCreateAndParseURI_valid() { Set trackIds = new HashSet<>(); trackIds.add(new Track.Id(1)); trackIds.add(new Track.Id(3)); @@ -30,7 +31,7 @@ public class ShareContentProviderTest { Pair shareURIandMIME = ShareContentProvider.createURI(trackIds, "TrackName", TrackFileFormat.KML_ONLY_TRACK); - Assert.assertEquals(trackIds, ShareContentProvider.parseURI(shareURIandMIME.first)); + assertEquals(trackIds, ShareContentProvider.parseURI(shareURIandMIME.first)); } @Test @@ -39,6 +40,6 @@ public class ShareContentProviderTest { trackIds.add(new Track.Id(1)); Pair shareURIandMIME = ShareContentProvider.createURI(trackIds, "../../&1=1", TrackFileFormat.KML_ONLY_TRACK); - Assert.assertEquals(Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/kml_only_track/1/..%2F..%2F%261%3D1.kml"), shareURIandMIME.first); + assertEquals(Uri.parse("content://de.dennisguse.opentracks.debug.content/tracks/kml_only_track/1/..%2F..%2F%261%3D1.kml"), shareURIandMIME.first); } } \ No newline at end of file diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java b/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java index 198fd6370..169bed732 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/sensor/SensorDataCyclingTest.java @@ -2,12 +2,14 @@ package de.dennisguse.opentracks.content.sensor; import androidx.test.ext.junit.runners.AndroidJUnit4; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import de.dennisguse.opentracks.util.UintUtils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + @RunWith(AndroidJUnit4.class) public class SensorDataCyclingTest { @@ -21,7 +23,7 @@ public class SensorDataCyclingTest { current.compute(previous); // then - Assert.assertEquals(60, current.getCadence_rpm(), 0.01); + assertEquals(60, current.getCadence_rpm(), 0.01); } @Test @@ -34,7 +36,7 @@ public class SensorDataCyclingTest { current.compute(previous); // then - Assert.assertEquals(33.53, current.getCadence_rpm(), 0.01); + assertEquals(33.53, current.getCadence_rpm(), 0.01); } @Test @@ -47,7 +49,7 @@ public class SensorDataCyclingTest { current.compute(previous); // then - Assert.assertEquals(0, current.getCadence_rpm(), 0.01); + assertEquals(0, current.getCadence_rpm(), 0.01); } @@ -61,7 +63,7 @@ public class SensorDataCyclingTest { current.compute(previous); // then - Assert.assertFalse(current.hasCadence_rpm()); + assertFalse(current.hasCadence_rpm()); } @Test @@ -74,7 +76,7 @@ public class SensorDataCyclingTest { current.compute(previous); // then - Assert.assertEquals(60, current.getCadence_rpm(), 0.01); + assertEquals(60, current.getCadence_rpm(), 0.01); } @Test @@ -87,7 +89,7 @@ public class SensorDataCyclingTest { current.compute(previous); // then - Assert.assertEquals(60, current.getCadence_rpm(), 0.01); + assertEquals(60, current.getCadence_rpm(), 0.01); } @Test @@ -100,7 +102,7 @@ public class SensorDataCyclingTest { current.compute(previous, 2150); // then - Assert.assertEquals(1.20, current.getSpeed_mps(), 0.01); + assertEquals(1.20, current.getSpeed_mps(), 0.01); } @Test @@ -113,6 +115,6 @@ public class SensorDataCyclingTest { current.compute(previous, 2000); // then - Assert.assertEquals(2, current.getSpeed_mps(), 0.01); + assertEquals(2, current.getSpeed_mps(), 0.01); } } \ No newline at end of file diff --git a/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java b/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java index 5bd82dc6a..f728eac6a 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/fragments/ChartFragmentTest.java @@ -23,7 +23,6 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -35,6 +34,8 @@ import de.dennisguse.opentracks.chart.ChartView; import de.dennisguse.opentracks.content.data.TrackPoint; import de.dennisguse.opentracks.util.UnitConversions; +import static org.junit.Assert.assertEquals; + /** * Tests {@link ChartFragment}. * @@ -78,9 +79,9 @@ public class ChartFragmentTest { ChartPoint point = chartFragment.createPendingPoint(trackPoint); // then - Assert.assertEquals(Float.NaN, point.getHeartRate(), 0.01); - Assert.assertEquals(Float.NaN, point.getCadence(), 0.01); - Assert.assertEquals(Float.NaN, point.getPower(), 0.01); + assertEquals(Float.NaN, point.getHeartRate(), 0.01); + assertEquals(Float.NaN, point.getCadence(), 0.01); + assertEquals(Float.NaN, point.getPower(), 0.01); } /** @@ -98,9 +99,9 @@ public class ChartFragmentTest { ChartPoint point = chartFragment.createPendingPoint(trackPoint); // then - Assert.assertEquals(100.0, point.getHeartRate(), 0.01); - Assert.assertEquals(101.0, point.getCadence(), 0.01); - Assert.assertEquals(102.0, point.getPower(), 0.01); + assertEquals(100.0, point.getHeartRate(), 0.01); + assertEquals(101.0, point.getCadence(), 0.01); + assertEquals(102.0, point.getPower(), 0.01); } /** @@ -112,12 +113,12 @@ public class ChartFragmentTest { // Resets last location and writes first location. TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint(); ChartPoint point = chartFragment.createPendingPoint(trackPoint1); - Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01); + assertEquals(0.0, point.getTimeOrDistance(), 0.01); // The second is a same location, just different time. TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint(); point = chartFragment.createPendingPoint(trackPoint2); - Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01); + assertEquals(0.0, point.getTimeOrDistance(), 0.01); // The third location is a new location, and use metric. TrackPoint trackPoint3 = TrackStubUtils.createDefaultTrackPoint(); @@ -129,7 +130,7 @@ public class ChartFragmentTest { Location.distanceBetween(trackPoint2.getLatitude(), trackPoint2.getLongitude(), trackPoint3.getLatitude(), trackPoint3.getLongitude(), results); double distance1 = results[0] * UnitConversions.M_TO_KM; - Assert.assertEquals(distance1, point.getTimeOrDistance(), 0.01); + assertEquals(distance1, point.getTimeOrDistance(), 0.01); // The fourth location is a new location, and use metric. TrackPoint trackPoint4 = TrackStubUtils.createDefaultTrackPoint(); @@ -140,7 +141,7 @@ public class ChartFragmentTest { Location.distanceBetween(trackPoint3.getLatitude(), trackPoint3.getLongitude(), trackPoint4.getLatitude(), trackPoint4.getLongitude(), results); double distance2 = results[0] * UnitConversions.M_TO_KM; - Assert.assertEquals((distance1 + distance2), point.getTimeOrDistance(), 0.01); + assertEquals((distance1 + distance2), point.getTimeOrDistance(), 0.01); } /** @@ -156,7 +157,7 @@ public class ChartFragmentTest { // The first is a same location, just different time. TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint(); ChartPoint point = chartFragment.createPendingPoint(trackPoint1); - Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01); + assertEquals(0.0, point.getTimeOrDistance(), 0.01); // The second location is a new location, and use imperial. TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint(); @@ -170,7 +171,7 @@ public class ChartFragmentTest { float[] results = new float[4]; Location.distanceBetween(trackPoint1.getLatitude(), trackPoint1.getLongitude(), trackPoint2.getLatitude(), trackPoint2.getLongitude(), results); double distance1 = results[0] * UnitConversions.M_TO_KM * UnitConversions.KM_TO_MI; - Assert.assertEquals(distance1, point.getTimeOrDistance(), 0.01); + assertEquals(distance1, point.getTimeOrDistance(), 0.01); // The third location is a new location, and use imperial. TrackPoint trackPoint3 = TrackStubUtils.createDefaultTrackPoint(); @@ -183,7 +184,7 @@ public class ChartFragmentTest { */ Location.distanceBetween(trackPoint2.getLatitude(), trackPoint2.getLongitude(), trackPoint3.getLatitude(), trackPoint3.getLongitude(), results); double distance2 = results[0] * UnitConversions.M_TO_KM * UnitConversions.KM_TO_MI; - Assert.assertEquals(distance1 + distance2, point.getTimeOrDistance(), 0.01); + assertEquals(distance1 + distance2, point.getTimeOrDistance(), 0.01); } /** @@ -194,12 +195,12 @@ public class ChartFragmentTest { chartFragment.setChartByDistance(false); TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint(); ChartPoint point = chartFragment.createPendingPoint(trackPoint1); - Assert.assertEquals(0.0, point.getTimeOrDistance(), 0.01); + assertEquals(0.0, point.getTimeOrDistance(), 0.01); long timeSpan = 222; TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint(); trackPoint2.setTime(trackPoint1.getTime() + timeSpan); point = chartFragment.createPendingPoint(trackPoint2); - Assert.assertEquals((double) timeSpan, point.getTimeOrDistance(), 0.01); + assertEquals((double) timeSpan, point.getTimeOrDistance(), 0.01); } /** @@ -214,7 +215,7 @@ public class ChartFragmentTest { * Then only one value INITIAL_ALTITUDE in buffer. */ ChartPoint point = chartFragment.createPendingPoint(trackPoint1); - Assert.assertEquals(TrackStubUtils.INITIAL_ALTITUDE, point.getElevation(), 0.01); + assertEquals(TrackStubUtils.INITIAL_ALTITUDE, point.getElevation(), 0.01); /* * Send another value to buffer, now there are two values, INITIAL_ALTITUDE and INITIAL_ALTITUDE * 2. @@ -222,7 +223,7 @@ public class ChartFragmentTest { TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint(); trackPoint2.setAltitude(TrackStubUtils.INITIAL_ALTITUDE * 2); point = chartFragment.createPendingPoint(trackPoint2); - Assert.assertEquals((TrackStubUtils.INITIAL_ALTITUDE + TrackStubUtils.INITIAL_ALTITUDE * 2) / 2.0, point.getElevation(), 0.01); + assertEquals((TrackStubUtils.INITIAL_ALTITUDE + TrackStubUtils.INITIAL_ALTITUDE * 2) / 2.0, point.getElevation(), 0.01); } /** @@ -239,7 +240,7 @@ public class ChartFragmentTest { TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint(); trackPoint1.setSpeed(128.5f); ChartPoint point = chartFragment.createPendingPoint(trackPoint1); - Assert.assertEquals(0.0, point.getSpeed(), 0.01); + assertEquals(0.0, point.getSpeed(), 0.01); /* * Tests the logic when both metricUnits and reportSpeed are true. @@ -253,7 +254,7 @@ public class ChartFragmentTest { trackPoint2.setTime(trackPoint1.getTime() + 222); trackPoint2.setSpeed(130); point = chartFragment.createPendingPoint(trackPoint2); - Assert.assertEquals(130.0 * UnitConversions.MPS_TO_KMH, point.getSpeed(), 0.01); + assertEquals(130.0 * UnitConversions.MPS_TO_KMH, point.getSpeed(), 0.01); } /** @@ -267,7 +268,7 @@ public class ChartFragmentTest { TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint(); trackPoint1.setSpeed(100.0f); ChartPoint point = chartFragment.createPendingPoint(trackPoint1); - Assert.assertEquals(0.0, point.getSpeed(), 0.01); + assertEquals(0.0, point.getSpeed(), 0.01); TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint(); @@ -278,7 +279,7 @@ public class ChartFragmentTest { trackPoint2.setTime(trackPoint2.getTime() + 222); trackPoint2.setSpeed(102); point = chartFragment.createPendingPoint(trackPoint2); - Assert.assertEquals(102.0 * UnitConversions.MPS_TO_KMH * UnitConversions.KM_TO_MI, point.getSpeed(), 0.01); + assertEquals(102.0 * UnitConversions.MPS_TO_KMH * UnitConversions.KM_TO_MI, point.getSpeed(), 0.01); } /** @@ -292,7 +293,7 @@ public class ChartFragmentTest { TrackPoint trackPoint1 = TrackStubUtils.createDefaultTrackPoint(); trackPoint1.setSpeed(100.0f); ChartPoint point = chartFragment.createPendingPoint(trackPoint1); - Assert.assertEquals(0.0, point.getSpeed(), 0.01); + assertEquals(0.0, point.getSpeed(), 0.01); TrackPoint trackPoint2 = TrackStubUtils.createDefaultTrackPoint(); @@ -303,7 +304,7 @@ public class ChartFragmentTest { trackPoint2.setTime(trackPoint2.getTime() + 222); trackPoint2.setSpeed(102); point = chartFragment.createPendingPoint(trackPoint2); - Assert.assertEquals(HOURS_PER_UNIT / (102.0 * UnitConversions.MPS_TO_KMH), point.getPace(), 0.01); + assertEquals(HOURS_PER_UNIT / (102.0 * UnitConversions.MPS_TO_KMH), point.getPace(), 0.01); } /** @@ -315,6 +316,6 @@ public class ChartFragmentTest { TrackPoint trackPoint = TrackStubUtils.createDefaultTrackPoint(); trackPoint.setSpeed(0); ChartPoint point = chartFragment.createPendingPoint(trackPoint); - Assert.assertEquals(0.0, point.getPace(), 0.01); + assertEquals(0.0, point.getPace(), 0.01); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java index 694997db2..678f75557 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/AbstractTestFileTrackImporter.java @@ -24,7 +24,6 @@ import android.net.Uri; import androidx.test.core.app.ApplicationProvider; -import org.junit.Assert; import org.mockito.ArgumentCaptor; import org.mockito.Mock; @@ -39,6 +38,7 @@ import de.dennisguse.opentracks.content.data.TrackPoint; import de.dennisguse.opentracks.content.data.WaypointsColumns; import de.dennisguse.opentracks.content.provider.ContentProviderUtils; +import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.any; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.when; @@ -122,10 +122,10 @@ public abstract class AbstractTestFileTrackImporter { } protected void verifyTrack(Track track, String name, String description, long time) { - Assert.assertEquals(name, track.getName()); - Assert.assertEquals(description, track.getDescription()); + assertEquals(name, track.getName()); + assertEquals(description, track.getDescription()); if (time != -1L) { - Assert.assertEquals(time, track.getTrackStatistics().getStartTime_ms()); + assertEquals(time, track.getTrackStatistics().getStartTime_ms()); } } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicyTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicyTest.java index b7c677a0a..e06058212 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicyTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/AdaptiveLocationListenerPolicyTest.java @@ -15,7 +15,6 @@ */ package de.dennisguse.opentracks.services; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -23,6 +22,8 @@ import org.junit.runners.JUnit4; import de.dennisguse.opentracks.services.handlers.AdaptiveLocationListenerPolicy; +import static org.junit.Assert.assertEquals; + /** * Tests the {@link AdaptiveLocationListenerPolicy}. * @@ -57,17 +58,17 @@ public class AdaptiveLocationListenerPolicyTest { @Test public void testGetDesiredPollingInterval() { adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_BIG); - Assert.assertEquals(MAX, adaptiveLocationListenerPolicy.getDesiredPollingInterval()); + assertEquals(MAX, adaptiveLocationListenerPolicy.getDesiredPollingInterval()); adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_NORMAL); // First get the half of NEW_IDLE_TIME_NORMAL, and then round it to the nearest second. - Assert.assertEquals((NEW_IDLE_TIME_NORMAL / 2 / 1000) * 1000, adaptiveLocationListenerPolicy.getDesiredPollingInterval()); + assertEquals((NEW_IDLE_TIME_NORMAL / 2 / 1000) * 1000, adaptiveLocationListenerPolicy.getDesiredPollingInterval()); adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_SMALL); - Assert.assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval()); + assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval()); adaptiveLocationListenerPolicy.updateIdleTime(NEW_IDLE_TIME_LESS_THAN_MIN); - Assert.assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval()); + assertEquals(MIN, adaptiveLocationListenerPolicy.getDesiredPollingInterval()); } /** @@ -75,6 +76,6 @@ public class AdaptiveLocationListenerPolicyTest { */ @Test public void testGetMinDistance() { - Assert.assertEquals(MIN_DISTANCE, adaptiveLocationListenerPolicy.getMinDistance_m()); + assertEquals(MIN_DISTANCE, adaptiveLocationListenerPolicy.getMinDistance_m()); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java index 8106abb2d..792fe5a89 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java @@ -32,7 +32,6 @@ import androidx.test.rule.GrantPermissionRule; import androidx.test.rule.ServiceTestRule; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; @@ -54,6 +53,13 @@ import de.dennisguse.opentracks.content.provider.CustomContentProvider; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.PreferencesUtils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * Tests for the track recording service. * @@ -120,14 +126,14 @@ public class TrackRecordingServiceTest { @Test public void testStartable() throws TimeoutException { mServiceRule.startService(createStartIntent(context)); - Assert.assertNotNull(mServiceRule.bindService(createStartIntent(context))); + assertNotNull(mServiceRule.bindService(createStartIntent(context))); } @MediumTest @Test public void testBindable() throws TimeoutException { IBinder service = mServiceRule.bindService(createStartIntent(context)); - Assert.assertNotNull(service); + assertNotNull(service); } @MediumTest @@ -135,7 +141,7 @@ public class TrackRecordingServiceTest { public void testRecording_noTracks() throws Exception { // given List tracks = contentProviderUtils.getTracks(); - Assert.assertTrue(tracks.isEmpty()); + assertTrue(tracks.isEmpty()); // when Intent startIntent = createStartIntent(context); @@ -144,8 +150,8 @@ public class TrackRecordingServiceTest { // then // Test if we start in no-recording mode by default. - Assert.assertFalse(service.isRecording()); - Assert.assertNull(service.getRecordingTrackId()); + assertFalse(service.isRecording()); + assertNull(service.getRecordingTrackId()); } @MediumTest @@ -158,8 +164,8 @@ public class TrackRecordingServiceTest { TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context))); // then - Assert.assertFalse(service.isRecording()); - Assert.assertNull(service.getRecordingTrackId()); + assertFalse(service.isRecording()); + assertNull(service.getRecordingTrackId()); } @MediumTest @@ -172,7 +178,7 @@ public class TrackRecordingServiceTest { TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context))); // then - Assert.assertTrue(service.isRecording()); + assertTrue(service.isRecording()); } @MediumTest @@ -187,21 +193,21 @@ public class TrackRecordingServiceTest { service.pauseCurrentTrack(); // then - Assert.assertEquals(2, contentProviderUtils.getTrackPoints(trackId).size()); + assertEquals(2, contentProviderUtils.getTrackPoints(trackId).size()); //when service.resumeTrack(trackId); newTrackPoint(service); // then - Assert.assertTrue(service.isRecording()); - Assert.assertEquals(trackId, service.getRecordingTrackId()); + assertTrue(service.isRecording()); + assertEquals(trackId, service.getRecordingTrackId()); List trackPoints = contentProviderUtils.getTrackPoints(trackId); - Assert.assertEquals(5, trackPoints.size()); - Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01); - Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(2).getLatitude(), 0.01); - Assert.assertEquals(TrackPointsColumns.RESUME_LATITUDE, trackPoints.get(3).getLatitude(), 0.01); + assertEquals(5, trackPoints.size()); + assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01); + assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(2).getLatitude(), 0.01); + assertEquals(TrackPointsColumns.RESUME_LATITUDE, trackPoints.get(3).getLatitude(), 0.01); } @MediumTest @@ -213,20 +219,20 @@ public class TrackRecordingServiceTest { newTrackPoint(service); service.endCurrentTrack(); - Assert.assertEquals(1, contentProviderUtils.getTrackPoints(trackId).size()); + assertEquals(1, contentProviderUtils.getTrackPoints(trackId).size()); // when service.resumeTrack(trackId); newTrackPoint(service); // then - Assert.assertTrue(service.isRecording()); - Assert.assertEquals(trackId, service.getRecordingTrackId()); + assertTrue(service.isRecording()); + assertEquals(trackId, service.getRecordingTrackId()); List trackPoints = contentProviderUtils.getTrackPoints(trackId); - Assert.assertEquals(4, trackPoints.size()); - Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01); - Assert.assertEquals(TrackPointsColumns.RESUME_LATITUDE, trackPoints.get(2).getLatitude(), 0.01); + assertEquals(4, trackPoints.size()); + assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01); + assertEquals(TrackPointsColumns.RESUME_LATITUDE, trackPoints.get(2).getLatitude(), 0.01); } @FlakyTest(detail = "Sometimes fails on CI.") @@ -242,8 +248,8 @@ public class TrackRecordingServiceTest { PreferencesUtils.setLong(context, R.string.recording_track_id_key, 123L); // then - Assert.assertFalse(service.isRecording()); - Assert.assertNull(service.getRecordingTrackId()); + assertFalse(service.isRecording()); + assertNull(service.getRecordingTrackId()); } @MediumTest @@ -252,7 +258,7 @@ public class TrackRecordingServiceTest { // given TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context))); service.startNewTrack(); - Assert.assertTrue(service.isRecording()); + assertTrue(service.isRecording()); Track.Id trackId = service.getRecordingTrackId(); @@ -260,10 +266,10 @@ public class TrackRecordingServiceTest { Track.Id newTrackId = service.startNewTrack(); // then - Assert.assertNull(newTrackId); + assertNull(newTrackId); - Assert.assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context)); - Assert.assertEquals(trackId, service.getRecordingTrackId()); + assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context)); + assertEquals(trackId, service.getRecordingTrackId()); } @MediumTest @@ -271,15 +277,15 @@ public class TrackRecordingServiceTest { public void testEndCurrentTrack_noRecording() throws Exception { // given TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context))); - Assert.assertFalse(service.isRecording()); + assertFalse(service.isRecording()); // when // Ending the current track when there is no recording should not result in any error. service.endCurrentTrack(); // then - Assert.assertFalse(PreferencesUtils.isRecording(context)); - Assert.assertNull(service.getRecordingTrackId()); + assertFalse(PreferencesUtils.isRecording(context)); + assertNull(service.getRecordingTrackId()); } @MediumTest @@ -287,13 +293,13 @@ public class TrackRecordingServiceTest { public void testInsertWaypointMarker_noRecordingTrack() throws Exception { // given TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context))); - Assert.assertFalse(service.isRecording()); + assertFalse(service.isRecording()); // when Waypoint.Id waypointId = service.insertWaypoint(null, null, null, null); // then - Assert.assertNull(waypointId); + assertNull(waypointId); } @MediumTest @@ -302,7 +308,7 @@ public class TrackRecordingServiceTest { // given TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(createStartIntent(context))); service.startNewTrack(); - Assert.assertTrue(service.isRecording()); + assertTrue(service.isRecording()); newTrackPoint(service); Track.Id trackId = service.getRecordingTrackId(); @@ -310,21 +316,21 @@ public class TrackRecordingServiceTest { Waypoint.Id waypointId = service.insertWaypoint(null, null, null, null); // then - Assert.assertNotEquals(-1L, waypointId); + assertNotEquals(-1L, waypointId); Waypoint wpt = contentProviderUtils.getWaypoint(waypointId); - Assert.assertEquals(context.getString(R.string.marker_waypoint_icon_url), wpt.getIcon()); - Assert.assertEquals(context.getString(R.string.marker_name_format, 1), wpt.getName()); - Assert.assertEquals(trackId, wpt.getTrackId()); - Assert.assertEquals(0.0, wpt.getLength(), 0.01); - Assert.assertNotNull(wpt.getLocation()); + assertEquals(context.getString(R.string.marker_waypoint_icon_url), wpt.getIcon()); + assertEquals(context.getString(R.string.marker_name_format, 1), wpt.getName()); + assertEquals(trackId, wpt.getTrackId()); + assertEquals(0.0, wpt.getLength(), 0.01); + assertNotNull(wpt.getLocation()); service.endCurrentTrack(); } private void addTrack(Track track, boolean isRecording) { - Assert.assertTrue(track.getId().isValid()); + assertTrue(track.getId().isValid()); contentProviderUtils.insertTrack(track); - Assert.assertEquals(track.getId(), contentProviderUtils.getTrack(track.getId()).getId()); + assertEquals(track.getId(), contentProviderUtils.getTrack(track.getId()).getId()); PreferencesUtils.setLong(context, R.string.recording_track_id_key, isRecording ? track.getId().getId() : PreferencesUtils.RECORDING_TRACK_ID_DEFAULT); PreferencesUtils.setBoolean(context, R.string.recording_track_paused_key, !isRecording); } diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java index 644d3cc2e..393876d47 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java @@ -12,7 +12,6 @@ import androidx.test.rule.GrantPermissionRule; import androidx.test.rule.ServiceTestRule; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; @@ -33,6 +32,9 @@ import de.dennisguse.opentracks.content.sensor.SensorDataSet; import de.dennisguse.opentracks.services.sensors.BluetoothRemoteSensorManager; import de.dennisguse.opentracks.util.PreferencesUtils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + /** * Tests insert location. *

@@ -103,11 +105,11 @@ public class TrackRecordingServiceTestLocation { service.endCurrentTrack(); // then - Assert.assertFalse(service.isRecording()); + assertFalse(service.isRecording()); List trackPoints = contentProviderUtils.getTrackPoints(trackId); - Assert.assertEquals(6, trackPoints.size()); - Assert.assertEquals(45.0005, trackPoints.get(5).getLatitude(), 0.01); + assertEquals(6, trackPoints.size()); + assertEquals(45.0005, trackPoints.get(5).getLatitude(), 0.01); } @MediumTest @@ -127,11 +129,11 @@ public class TrackRecordingServiceTestLocation { service.endCurrentTrack(); // then - Assert.assertFalse(service.isRecording()); + assertFalse(service.isRecording()); List trackPoints = contentProviderUtils.getTrackPoints(trackId); - Assert.assertEquals(2, trackPoints.size()); - Assert.assertEquals(45.000005, trackPoints.get(1).getLatitude(), 0.01); + assertEquals(2, trackPoints.size()); + assertEquals(45.000005, trackPoints.get(1).getLatitude(), 0.01); } // @MediumTest @@ -169,13 +171,13 @@ public class TrackRecordingServiceTestLocation { service.endCurrentTrack(); // then - Assert.assertFalse(service.isRecording()); + assertFalse(service.isRecording()); List trackPoints = contentProviderUtils.getTrackPoints(trackId); - Assert.assertEquals(3, trackPoints.size()); - Assert.assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01); - Assert.assertEquals(2, trackPoints.get(1).getAccuracy(), 0.01); - Assert.assertEquals(6, trackPoints.get(2).getAccuracy(), 0.01); + assertEquals(3, trackPoints.size()); + assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01); + assertEquals(2, trackPoints.get(1).getAccuracy(), 0.01); + assertEquals(6, trackPoints.get(2).getAccuracy(), 0.01); } @MediumTest @@ -195,14 +197,14 @@ public class TrackRecordingServiceTestLocation { service.endCurrentTrack(); // then - Assert.assertFalse(service.isRecording()); + assertFalse(service.isRecording()); List trackPoints = contentProviderUtils.getTrackPoints(trackId); - Assert.assertEquals(4, trackPoints.size()); - Assert.assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01); - Assert.assertEquals(2, trackPoints.get(1).getAccuracy(), 0.01); - Assert.assertEquals(5, trackPoints.get(2).getAccuracy(), 0.01); //TODO Check why this trackPoint is inserted. - Assert.assertEquals(6, trackPoints.get(3).getAccuracy(), 0.01); + assertEquals(4, trackPoints.size()); + assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01); + assertEquals(2, trackPoints.get(1).getAccuracy(), 0.01); + assertEquals(5, trackPoints.get(2).getAccuracy(), 0.01); //TODO Check why this trackPoint is inserted. + assertEquals(6, trackPoints.get(3).getAccuracy(), 0.01); } @@ -238,16 +240,16 @@ public class TrackRecordingServiceTestLocation { service.endCurrentTrack(); // then - Assert.assertFalse(service.isRecording()); + assertFalse(service.isRecording()); List trackPoints = contentProviderUtils.getTrackPoints(trackId); - Assert.assertEquals(6, trackPoints.size()); - Assert.assertEquals(0, trackPoints.get(0).getAccuracy(), 0.01); - Assert.assertEquals(1, trackPoints.get(1).getAccuracy(), 0.01); - Assert.assertEquals(2, trackPoints.get(2).getAccuracy(), 0.01); - Assert.assertEquals(3, trackPoints.get(3).getAccuracy(), 0.01); - Assert.assertEquals(4, trackPoints.get(4).getAccuracy(), 0.01); - Assert.assertEquals(5, trackPoints.get(5).getAccuracy(), 0.01); + assertEquals(6, trackPoints.size()); + assertEquals(0, trackPoints.get(0).getAccuracy(), 0.01); + assertEquals(1, trackPoints.get(1).getAccuracy(), 0.01); + assertEquals(2, trackPoints.get(2).getAccuracy(), 0.01); + assertEquals(3, trackPoints.get(3).getAccuracy(), 0.01); + assertEquals(4, trackPoints.get(4).getAccuracy(), 0.01); + assertEquals(5, trackPoints.get(5).getAccuracy(), 0.01); } @MediumTest @@ -266,16 +268,16 @@ public class TrackRecordingServiceTestLocation { service.endCurrentTrack(); // then - Assert.assertFalse(service.isRecording()); + assertFalse(service.isRecording()); List trackPoints = contentProviderUtils.getTrackPoints(trackId); - Assert.assertEquals(7, trackPoints.size()); - Assert.assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01); - Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01); - Assert.assertEquals(2, trackPoints.get(2).getAccuracy(), 0.01); - Assert.assertEquals(3, trackPoints.get(3).getAccuracy(), 0.01); - Assert.assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(4).getLatitude(), 0.01); - Assert.assertEquals(4, trackPoints.get(5).getAccuracy(), 0.01); - Assert.assertEquals(5, trackPoints.get(6).getAccuracy(), 0.01); + assertEquals(7, trackPoints.size()); + assertEquals(1, trackPoints.get(0).getAccuracy(), 0.01); + assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(1).getLatitude(), 0.01); + assertEquals(2, trackPoints.get(2).getAccuracy(), 0.01); + assertEquals(3, trackPoints.get(3).getAccuracy(), 0.01); + assertEquals(TrackPointsColumns.PAUSE_LATITUDE, trackPoints.get(4).getLatitude(), 0.01); + assertEquals(4, trackPoints.get(5).getAccuracy(), 0.01); + assertEquals(5, trackPoints.get(6).getAccuracy(), 0.01); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java index e3e3f28b4..f0ba5cd28 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java @@ -13,7 +13,6 @@ import androidx.test.rule.ServiceTestRule; import org.junit.After; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; @@ -32,6 +31,12 @@ import de.dennisguse.opentracks.content.provider.CustomContentProvider; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.PreferencesUtils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * Tests for the track recording service, which require a {@link Looper}. * @@ -188,23 +193,23 @@ public class TrackRecordingServiceTestLooper { @Test public void testIntegration_completeRecordingSession() throws TimeoutException { List tracks = contentProviderUtils.getTracks(); - Assert.assertTrue(tracks.isEmpty()); + assertTrue(tracks.isEmpty()); fullRecordingSession(); } private void fullRecordingSession() throws TimeoutException { TrackRecordingServiceInterface service = ((TrackRecordingServiceInterface) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context))); - Assert.assertFalse(service.isRecording()); + assertFalse(service.isRecording()); // Start a track. Track.Id trackId = service.startNewTrack(); - Assert.assertTrue(trackId.isValid()); - Assert.assertTrue(service.isRecording()); + assertTrue(trackId.isValid()); + assertTrue(service.isRecording()); Track track = contentProviderUtils.getTrack(trackId); - Assert.assertNotNull(track); - Assert.assertEquals(trackId, track.getId()); - Assert.assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context)); - Assert.assertEquals(trackId, service.getRecordingTrackId()); + assertNotNull(track); + assertEquals(trackId, track.getId()); + assertEquals(trackId, PreferencesUtils.getRecordingTrackId(context)); + assertEquals(trackId, service.getRecordingTrackId()); // Insert a few points, markers and statistics. long startTime = System.currentTimeMillis(); @@ -227,14 +232,14 @@ public class TrackRecordingServiceTestLooper { // Stop the track. Validate if it has correct data. service.endCurrentTrack(); - Assert.assertFalse(service.isRecording()); - Assert.assertNull(service.getRecordingTrackId()); + assertFalse(service.isRecording()); + assertNull(service.getRecordingTrackId()); track = contentProviderUtils.getTrack(trackId); - Assert.assertNotNull(track); - Assert.assertEquals(trackId, track.getId()); + assertNotNull(track); + assertEquals(trackId, track.getId()); TrackStatistics trackStatistics = track.getTrackStatistics(); - Assert.assertNotNull(trackStatistics); - Assert.assertTrue(trackStatistics.getStartTime_ms() > 0); - Assert.assertTrue(trackStatistics.getStopTime_ms() >= trackStatistics.getStartTime_ms()); + assertNotNull(trackStatistics); + assertTrue(trackStatistics.getStartTime_ms() > 0); + assertTrue(trackStatistics.getStopTime_ms() >= trackStatistics.getStartTime_ms()); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java index b46670ef6..32f75b572 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java @@ -23,11 +23,12 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import static org.junit.Assert.assertTrue; + /** * Tests for {@link AnnouncementPeriodicTaskFactory}. * @@ -53,6 +54,6 @@ public class AnnouncementPeriodicTaskFactoryTest { public void testCreate() { PeriodicTaskFactory factory = new AnnouncementPeriodicTaskFactory(); PeriodicTask task = factory.create(context); - Assert.assertTrue(task instanceof AnnouncementPeriodicTask); + assertTrue(task instanceof AnnouncementPeriodicTask); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java index 111ee0a58..11bfd1239 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/stats/TrackStatisticsTest.java @@ -15,12 +15,13 @@ */ package de.dennisguse.opentracks.stats; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import static org.junit.Assert.assertEquals; + /** * Tests for {@link TrackStatistics}. * This only tests non-trivial pieces of that class. @@ -61,28 +62,28 @@ public class TrackStatisticsTest { statistics.merge(statistics2); - Assert.assertEquals(1000L, statistics.getStartTime_ms()); - Assert.assertEquals(4000L, statistics.getStopTime_ms()); - Assert.assertEquals(2500L, statistics.getTotalTime()); - Assert.assertEquals(1300L, statistics.getMovingTime()); - Assert.assertEquals(1100.0, statistics.getTotalDistance(), 0.001); - Assert.assertEquals(900.0, statistics.getTotalElevationGain(), 0.001); - Assert.assertEquals(statistics.getTotalDistance() / (statistics.getMovingTime() / 1000.0), statistics.getMaxSpeed(), 0.001); - Assert.assertEquals(1200.0, statistics.getMinElevation(), 0.001); - Assert.assertEquals(3575.0, statistics.getMaxElevation(), 0.001); + assertEquals(1000L, statistics.getStartTime_ms()); + assertEquals(4000L, statistics.getStopTime_ms()); + assertEquals(2500L, statistics.getTotalTime()); + assertEquals(1300L, statistics.getMovingTime()); + assertEquals(1100.0, statistics.getTotalDistance(), 0.001); + assertEquals(900.0, statistics.getTotalElevationGain(), 0.001); + assertEquals(statistics.getTotalDistance() / (statistics.getMovingTime() / 1000.0), statistics.getMaxSpeed(), 0.001); + assertEquals(1200.0, statistics.getMinElevation(), 0.001); + assertEquals(3575.0, statistics.getMaxElevation(), 0.001); } @Test public void testGetAverageSpeed() { statistics.setTotalDistance(1000.0); statistics.setTotalTime(50000); // in milliseconds - Assert.assertEquals(20.0, statistics.getAverageSpeed(), 0.001); + assertEquals(20.0, statistics.getAverageSpeed(), 0.001); } @Test public void testGetAverageMovingSpeed() { statistics.setTotalDistance(1000.0); statistics.setMovingTime(20000); // in milliseconds - Assert.assertEquals(50.0, statistics.getAverageMovingSpeed(), 0.001); + assertEquals(50.0, statistics.getAverageMovingSpeed(), 0.001); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java index cda4c40b6..b22900992 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java @@ -5,7 +5,6 @@ import android.content.Context; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -19,6 +18,8 @@ import de.dennisguse.opentracks.content.data.TrackPoint; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.viewmodels.IntervalStatistics; +import static org.junit.Assert.assertEquals; + @RunWith(AndroidJUnit4.class) public class AnnouncementUtilsTest { @@ -37,7 +38,7 @@ public class AnnouncementUtilsTest { String announcement = AnnouncementUtils.getAnnouncement(context, stats, "airplane", null); // then - Assert.assertEquals("OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour", announcement); + assertEquals("OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour", announcement); } @Test @@ -65,7 +66,7 @@ public class AnnouncementUtilsTest { String announcement = AnnouncementUtils.getAnnouncement(context, stats, "airplane", lastInterval); // then - Assert.assertEquals(msg, announcement); + assertEquals(msg, announcement); } private int getQuantityCount(double d) { diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/BluetoothUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/BluetoothUtilsTest.java index 2ff661487..30cf4dcc1 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/BluetoothUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/BluetoothUtilsTest.java @@ -2,11 +2,13 @@ package de.dennisguse.opentracks.util; import android.bluetooth.BluetoothGattCharacteristic; -import org.junit.Assert; import org.junit.Test; import de.dennisguse.opentracks.content.sensor.SensorDataCycling; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + public class BluetoothUtilsTest { @Test @@ -19,7 +21,7 @@ public class BluetoothUtilsTest { int heartRate = BluetoothUtils.parseHeartRate(characteristic); // then - Assert.assertEquals(60, heartRate); + assertEquals(60, heartRate); } @Test @@ -32,7 +34,7 @@ public class BluetoothUtilsTest { int heartRate = BluetoothUtils.parseHeartRate(characteristic); // then - Assert.assertEquals(257, heartRate); + assertEquals(257, heartRate); } @Test @@ -44,8 +46,8 @@ public class BluetoothUtilsTest { SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic); // then - Assert.assertEquals(200, sensor.getCadence().getCrankRevolutionsCount()); - Assert.assertNull(sensor.getSpeed()); + assertEquals(200, sensor.getCadence().getCrankRevolutionsCount()); + assertNull(sensor.getSpeed()); } @Test @@ -57,8 +59,8 @@ public class BluetoothUtilsTest { SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic); // then - Assert.assertNull(sensor.getCadence()); - Assert.assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount()); + assertNull(sensor.getCadence()); + assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount()); } @Test @@ -70,7 +72,7 @@ public class BluetoothUtilsTest { SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic); // then - Assert.assertEquals(200, sensor.getCadence().getCrankRevolutionsCount()); - Assert.assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount()); + assertEquals(200, sensor.getCadence().getCrankRevolutionsCount()); + assertEquals(225, sensor.getSpeed().getWheelRevolutionsCount()); } } \ No newline at end of file diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java index 956d9c7d5..9609fc9db 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/FileUtilsTest.java @@ -15,7 +15,6 @@ */ package de.dennisguse.opentracks.util; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -23,6 +22,8 @@ import org.junit.runners.JUnit4; import java.io.File; import java.util.Arrays; +import static org.junit.Assert.assertEquals; + /** * Tests for {@link FileUtils}. * @@ -37,7 +38,7 @@ public class FileUtilsTest { @Test public void testBuildUniqueFileName_new() { String filename = FileUtils.buildUniqueFileName(new File("/dir"), "Filename", "ext"); - Assert.assertEquals("Filename.ext", filename); + assertEquals("Filename.ext", filename); } /** @@ -47,7 +48,7 @@ public class FileUtilsTest { public void testBuildUniqueFileName_exist() { // Expect "/default.prop" to exist on the phone/emulator String filename = FileUtils.buildUniqueFileName(new File("/"), "default", "prop"); - Assert.assertEquals("default(1).prop", filename); + assertEquals("default(1).prop", filename); } /** @@ -58,13 +59,13 @@ public class FileUtilsTest { public void testSanitizeFileName() { String name = "Swim\10ming-^across:/the/ pacific (ocean)."; String expected = "Swim_ming-^across_the_ pacific (ocean)."; - Assert.assertEquals(expected, FileUtils.sanitizeFileName(name)); + assertEquals(expected, FileUtils.sanitizeFileName(name)); } @Test public void testSanitizeFileNameWithSuffix() { String name = "FileName.jpeg"; - Assert.assertEquals(name, FileUtils.sanitizeFileName(name)); + assertEquals(name, FileUtils.sanitizeFileName(name)); } /** @@ -75,7 +76,7 @@ public class FileUtilsTest { public void testSanitizeFileName_i18n() { String name = "您好-привет"; String expected = "您好-привет"; - Assert.assertEquals(expected, FileUtils.sanitizeFileName(name)); + assertEquals(expected, FileUtils.sanitizeFileName(name)); } /** @@ -86,7 +87,7 @@ public class FileUtilsTest { public void testSanitizeFileName_special_characters() { String name = "$%'-_@~`!(){}^#&+,;=[] "; String expected = "$%'-_@~`!(){}^#&+,;=[] "; - Assert.assertEquals(expected, FileUtils.sanitizeFileName(name)); + assertEquals(expected, FileUtils.sanitizeFileName(name)); } /** @@ -97,7 +98,7 @@ public class FileUtilsTest { public void testSanitizeFileName_collapse() { String name = "hello//there"; String expected = "hello_there"; - Assert.assertEquals(expected, FileUtils.sanitizeFileName(name)); + assertEquals(expected, FileUtils.sanitizeFileName(name)); } /** @@ -114,8 +115,8 @@ public class FileUtilsTest { String truncated = FileUtils.truncateFileName(directory, nameString, suffix); for (int i = 0; i < truncated.length(); i++) { - Assert.assertEquals('a', truncated.charAt(i)); + assertEquals('a', truncated.charAt(i)); } - Assert.assertEquals(FileUtils.MAX_FAT32_PATH_LENGTH, new File(directory, truncated + suffix).getPath().length()); + assertEquals(FileUtils.MAX_FAT32_PATH_LENGTH, new File(directory, truncated + suffix).getPath().length()); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/PreferencesUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/PreferencesUtilsTest.java index 46b9a3af6..32ce97004 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/PreferencesUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/PreferencesUtilsTest.java @@ -6,13 +6,14 @@ import android.content.SharedPreferences; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.io.file.TrackFileFormat; +import static org.junit.Assert.assertEquals; + @RunWith(AndroidJUnit4.class) public class PreferencesUtilsTest { @@ -29,7 +30,7 @@ public class PreferencesUtilsTest { TrackFileFormat trackFileFormat = PreferencesUtils.getExportTrackFileFormat(context); // then - Assert.assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL, trackFileFormat); + assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL, trackFileFormat); } @Test @@ -43,7 +44,7 @@ public class PreferencesUtilsTest { TrackFileFormat trackFileFormat = PreferencesUtils.getExportTrackFileFormat(context); // then - Assert.assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat); + assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat); } @Test @@ -57,6 +58,6 @@ public class PreferencesUtilsTest { TrackFileFormat trackFileFormat = PreferencesUtils.getExportTrackFileFormat(context); // then - Assert.assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat); + assertEquals(TrackFileFormat.KMZ_WITH_TRACKDETAIL_AND_SENSORDATA, trackFileFormat); } } \ No newline at end of file diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java index cd976837f..7ba8b9e7e 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java @@ -21,13 +21,15 @@ import android.content.Context; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import java.util.GregorianCalendar; import java.util.TimeZone; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * Tests for {@link StringUtils}. * @@ -44,7 +46,7 @@ public class StringUtilsTest { */ @Test public void testFormatDateTimeIso8601() { - Assert.assertEquals("1970-01-01T00:00:12.345Z", StringUtils.formatDateTimeIso8601(12345)); + assertEquals("1970-01-01T00:00:12.345Z", StringUtils.formatDateTimeIso8601(12345)); } /** @@ -53,19 +55,19 @@ public class StringUtilsTest { @Test public void testformatElapsedTime() { // 1 second - Assert.assertEquals("00:01", StringUtils.formatElapsedTime(1000)); + assertEquals("00:01", StringUtils.formatElapsedTime(1000)); // 10 seconds - Assert.assertEquals("00:10", StringUtils.formatElapsedTime(10000)); + assertEquals("00:10", StringUtils.formatElapsedTime(10000)); // 1 minute - Assert.assertEquals("01:00", StringUtils.formatElapsedTime(60000)); + assertEquals("01:00", StringUtils.formatElapsedTime(60000)); // 10 minutes - Assert.assertEquals("10:00", StringUtils.formatElapsedTime(600000)); + assertEquals("10:00", StringUtils.formatElapsedTime(600000)); // 1 hour - Assert.assertEquals("1:00:00", StringUtils.formatElapsedTime(3600000)); + assertEquals("1:00:00", StringUtils.formatElapsedTime(3600000)); // 10 hours - Assert.assertEquals("10:00:00", StringUtils.formatElapsedTime(36000000)); + assertEquals("10:00:00", StringUtils.formatElapsedTime(36000000)); // 100 hours - Assert.assertEquals("100:00:00", StringUtils.formatElapsedTime(360000000)); + assertEquals("100:00:00", StringUtils.formatElapsedTime(360000000)); } /** @@ -74,19 +76,19 @@ public class StringUtilsTest { @Test public void testformatElapsedTimeWithHour() { // 1 second - Assert.assertEquals("0:00:01", StringUtils.formatElapsedTimeWithHour(1000)); + assertEquals("0:00:01", StringUtils.formatElapsedTimeWithHour(1000)); // 10 seconds - Assert.assertEquals("0:00:10", StringUtils.formatElapsedTimeWithHour(10000)); + assertEquals("0:00:10", StringUtils.formatElapsedTimeWithHour(10000)); // 1 minute - Assert.assertEquals("0:01:00", StringUtils.formatElapsedTimeWithHour(60000)); + assertEquals("0:01:00", StringUtils.formatElapsedTimeWithHour(60000)); // 10 minutes - Assert.assertEquals("0:10:00", StringUtils.formatElapsedTimeWithHour(600000)); + assertEquals("0:10:00", StringUtils.formatElapsedTimeWithHour(600000)); // 1 hour - Assert.assertEquals("1:00:00", StringUtils.formatElapsedTimeWithHour(3600000)); + assertEquals("1:00:00", StringUtils.formatElapsedTimeWithHour(3600000)); // 10 hours - Assert.assertEquals("10:00:00", StringUtils.formatElapsedTimeWithHour(36000000)); + assertEquals("10:00:00", StringUtils.formatElapsedTimeWithHour(36000000)); // 100 hours - Assert.assertEquals("100:00:00", StringUtils.formatElapsedTimeWithHour(360000000)); + assertEquals("100:00:00", StringUtils.formatElapsedTimeWithHour(360000000)); } /** @@ -96,13 +98,13 @@ public class StringUtilsTest { @Test public void testFormatDistance() { // A large number in metric - Assert.assertEquals("5.00 km", StringUtils.formatDistance(context, 5000, true)); + assertEquals("5.00 km", StringUtils.formatDistance(context, 5000, true)); // A large number in imperial - Assert.assertEquals("3.11 mi", StringUtils.formatDistance(context, 5000, false)); + assertEquals("3.11 mi", StringUtils.formatDistance(context, 5000, false)); // A small number in metric - Assert.assertEquals("100.00 m", StringUtils.formatDistance(context, 100, true)); + assertEquals("100.00 m", StringUtils.formatDistance(context, 100, true)); // A small number in imperial - Assert.assertEquals("328.08 ft", StringUtils.formatDistance(context, 100, false)); + assertEquals("328.08 ft", StringUtils.formatDistance(context, 100, false)); } /** @@ -110,8 +112,8 @@ public class StringUtilsTest { */ @Test public void testFormatCData() { - Assert.assertEquals("", StringUtils.formatCData("hello")); - Assert.assertEquals("there]]>", StringUtils.formatCData("hello]]>there")); + assertEquals("", StringUtils.formatCData("hello")); + assertEquals("there]]>", StringUtils.formatCData("hello]]>there")); } /** @@ -168,7 +170,7 @@ public class StringUtilsTest { // This comparision tends to be flaky (difference of 1ms) // Assert.assertEquals(calendar.getTimeInMillis(), StringUtils.parseTime(xmlDateTime)); - Assert.assertTrue(calendar.getTimeInMillis() + " vs. " + StringUtils.parseTime(xmlDateTime), Math.abs(calendar.getTimeInMillis() - StringUtils.parseTime(xmlDateTime)) <= 1); + assertTrue(calendar.getTimeInMillis() + " vs. " + StringUtils.parseTime(xmlDateTime), Math.abs(calendar.getTimeInMillis() - StringUtils.parseTime(xmlDateTime)) <= 1); } /** @@ -177,9 +179,9 @@ public class StringUtilsTest { @Test public void testGetTimeParts_positive() { int[] parts = StringUtils.getTimeParts(61000); - Assert.assertEquals(1, parts[0]); - Assert.assertEquals(1, parts[1]); - Assert.assertEquals(0, parts[2]); + assertEquals(1, parts[0]); + assertEquals(1, parts[1]); + assertEquals(0, parts[2]); } /** @@ -188,40 +190,40 @@ public class StringUtilsTest { @Test public void testGetTimeParts_negative() { int[] parts = StringUtils.getTimeParts(-61000); - Assert.assertEquals(-1, parts[0]); - Assert.assertEquals(-1, parts[1]); - Assert.assertEquals(0, parts[2]); + assertEquals(-1, parts[0]); + assertEquals(-1, parts[1]); + assertEquals(0, parts[2]); } @Test public void testFormatDecimal() { - Assert.assertEquals("0", StringUtils.formatDecimal(0.0, 0)); - Assert.assertEquals("0", StringUtils.formatDecimal(0.1, 0)); - Assert.assertEquals("1", StringUtils.formatDecimal(1.1, 0)); - Assert.assertEquals("10", StringUtils.formatDecimal(10, 0)); - Assert.assertEquals("10", StringUtils.formatDecimal(10.1, 0)); - Assert.assertEquals("0", StringUtils.formatDecimal(-0.1, 0)); + assertEquals("0", StringUtils.formatDecimal(0.0, 0)); + assertEquals("0", StringUtils.formatDecimal(0.1, 0)); + assertEquals("1", StringUtils.formatDecimal(1.1, 0)); + assertEquals("10", StringUtils.formatDecimal(10, 0)); + assertEquals("10", StringUtils.formatDecimal(10.1, 0)); + assertEquals("0", StringUtils.formatDecimal(-0.1, 0)); - Assert.assertEquals("0", StringUtils.formatDecimal(0.0, 2)); - Assert.assertEquals("0.1", StringUtils.formatDecimal(0.1, 2)); - Assert.assertEquals("1.1", StringUtils.formatDecimal(1.1, 2)); - Assert.assertEquals("10", StringUtils.formatDecimal(10, 2)); - Assert.assertEquals("10.1", StringUtils.formatDecimal(10.1, 2)); - Assert.assertEquals("10.11", StringUtils.formatDecimal(10.111, 2)); - Assert.assertEquals("-0.1", StringUtils.formatDecimal(-0.1, 2)); + assertEquals("0", StringUtils.formatDecimal(0.0, 2)); + assertEquals("0.1", StringUtils.formatDecimal(0.1, 2)); + assertEquals("1.1", StringUtils.formatDecimal(1.1, 2)); + assertEquals("10", StringUtils.formatDecimal(10, 2)); + assertEquals("10.1", StringUtils.formatDecimal(10.1, 2)); + assertEquals("10.11", StringUtils.formatDecimal(10.111, 2)); + assertEquals("-0.1", StringUtils.formatDecimal(-0.1, 2)); - Assert.assertEquals("1", StringUtils.formatDecimal(0.99, 1)); + assertEquals("1", StringUtils.formatDecimal(0.99, 1)); } @Test public void testGetSpeedParts() { - Assert.assertEquals("4:59", StringUtils.getSpeedParts(context, 3.34, true, false).first); - Assert.assertEquals("5:00", StringUtils.getSpeedParts(context, 3.33, true, false).first); + assertEquals("4:59", StringUtils.getSpeedParts(context, 3.34, true, false).first); + assertEquals("5:00", StringUtils.getSpeedParts(context, 3.33, true, false).first); - Assert.assertEquals("11.99", StringUtils.getSpeedParts(context, 3.33, true, true).first); - Assert.assertEquals("7.45", StringUtils.getSpeedParts(context, 3.33, false, true).first); + assertEquals("11.99", StringUtils.getSpeedParts(context, 3.33, true, true).first); + assertEquals("7.45", StringUtils.getSpeedParts(context, 3.33, false, true).first); - Assert.assertEquals("min/km", StringUtils.getSpeedParts(context, 0, true, false).second); - Assert.assertEquals("min/mi", StringUtils.getSpeedParts(context, 0, false, false).second); + assertEquals("min/km", StringUtils.getSpeedParts(context, 0, true, false).second); + assertEquals("min/mi", StringUtils.getSpeedParts(context, 0, false, false).second); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java index 868bffa33..d9ba10020 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/TrackNameUtilsTest.java @@ -21,7 +21,6 @@ import android.content.Context; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +31,8 @@ import java.util.Locale; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.data.Track; +import static org.junit.Assert.assertEquals; + /** * Tests {@link TrackNameUtils}. * @@ -51,7 +52,7 @@ public class TrackNameUtilsTest { @Test public void testTrackName_date_local() { PreferencesUtils.setString(CONTEXT, R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_date_local_value)); - Assert.assertEquals(StringUtils.formatDateTime(CONTEXT, START_TIME), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME)); + assertEquals(StringUtils.formatDateTime(CONTEXT, START_TIME), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME)); } /** @@ -61,7 +62,7 @@ public class TrackNameUtilsTest { public void testTrackName_date_iso_8601() { PreferencesUtils.setString(CONTEXT, R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_date_iso_8601_value)); SimpleDateFormat simpleDateFormat = new SimpleDateFormat(TrackNameUtils.ISO_8601_FORMAT, Locale.US); - Assert.assertEquals(simpleDateFormat.format(new Date(START_TIME)), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME)); + assertEquals(simpleDateFormat.format(new Date(START_TIME)), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME)); } /** @@ -70,6 +71,6 @@ public class TrackNameUtilsTest { @Test public void testTrackName_number() { PreferencesUtils.setString(CONTEXT, R.string.track_name_key, CONTEXT.getString(R.string.settings_recording_track_name_number_value)); - Assert.assertEquals("Track " + TRACK_ID.getId(), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME)); + assertEquals("Track " + TRACK_ID.getId(), TrackNameUtils.getTrackName(CONTEXT, TRACK_ID, START_TIME)); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/TrackPointUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/TrackPointUtilsTest.java index 725470e02..b01136820 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/TrackPointUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/TrackPointUtilsTest.java @@ -1,10 +1,11 @@ package de.dennisguse.opentracks.util; -import org.junit.Assert; import org.junit.Test; import de.dennisguse.opentracks.content.data.TrackPoint; +import static org.junit.Assert.assertEquals; + public class TrackPointUtilsTest { @Test @@ -18,7 +19,7 @@ public class TrackPointUtilsTest { TrackPointUtils.fixTime(trackPoint); // then - Assert.assertEquals(time, trackPoint.getTime()); + assertEquals(time, trackPoint.getTime()); } @Test @@ -32,7 +33,7 @@ public class TrackPointUtilsTest { TrackPointUtils.fixTime(trackPoint); // then - Assert.assertEquals(time, trackPoint.getTime(), 1000); + assertEquals(time, trackPoint.getTime(), 1000); } @Test @@ -46,7 +47,7 @@ public class TrackPointUtilsTest { TrackPointUtils.fixTime(trackPoint); // then - Assert.assertEquals(time, trackPoint.getTime()); + assertEquals(time, trackPoint.getTime()); } } \ No newline at end of file diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/UUIDUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/UUIDUtilsTest.java index daf1a5bdf..87c8edc7a 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/UUIDUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/UUIDUtilsTest.java @@ -2,12 +2,13 @@ package de.dennisguse.opentracks.util; import androidx.test.ext.junit.runners.AndroidJUnit4; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import java.util.UUID; +import static org.junit.Assert.assertEquals; + @RunWith(AndroidJUnit4.class) public class UUIDUtilsTest { @@ -18,6 +19,6 @@ public class UUIDUtilsTest { byte[] bytes = UUIDUtils.toBytes(uuid); UUID output = UUIDUtils.fromBytes(bytes); - Assert.assertEquals(uuid, output); + assertEquals(uuid, output); } } \ No newline at end of file diff --git a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/AggregatedStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/AggregatedStatisticsTest.java index 9b78b7652..b6148d3a4 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/AggregatedStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/AggregatedStatisticsTest.java @@ -4,7 +4,6 @@ import android.content.Context; import androidx.test.core.app.ApplicationProvider; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -14,6 +13,9 @@ import de.dennisguse.opentracks.content.data.Track; import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.util.TrackIconUtils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + @RunWith(JUnit4.class) public class AggregatedStatisticsTest { @@ -59,13 +61,13 @@ public class AggregatedStatisticsTest { aggregatedStatistics.aggregate(track); // then - Assert.assertEquals(1, aggregatedStatistics.getCount()); - Assert.assertNotNull(aggregatedStatistics.get(biking)); - Assert.assertEquals(1, aggregatedStatistics.get(biking).getCountTracks()); + assertEquals(1, aggregatedStatistics.getCount()); + assertNotNull(aggregatedStatistics.get(biking)); + assertEquals(1, aggregatedStatistics.get(biking).getCountTracks()); TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics(); - Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0); - Assert.assertEquals(totalTime, statistics2.getMovingTime()); + assertEquals(totalDistance, statistics2.getTotalDistance(), 0); + assertEquals(totalTime, statistics2.getMovingTime()); } @Test @@ -82,7 +84,7 @@ public class AggregatedStatisticsTest { aggregatedStatistics.aggregate(track); // then - Assert.assertNotNull(aggregatedStatistics.get(mountainBiking)); + assertNotNull(aggregatedStatistics.get(mountainBiking)); } @Test @@ -99,7 +101,7 @@ public class AggregatedStatisticsTest { aggregatedStatistics.aggregate(track); // then - Assert.assertNotNull(aggregatedStatistics.get(trailRunning)); + assertNotNull(aggregatedStatistics.get(trailRunning)); } @Test @@ -120,13 +122,13 @@ public class AggregatedStatisticsTest { aggregatedStatistics.aggregate(tracks[1]); // biking activity 2. // then - Assert.assertEquals(1, aggregatedStatistics.getCount()); - Assert.assertNotNull(aggregatedStatistics.get(biking)); - Assert.assertEquals(2, aggregatedStatistics.get(biking).getCountTracks()); + assertEquals(1, aggregatedStatistics.getCount()); + assertNotNull(aggregatedStatistics.get(biking)); + assertEquals(2, aggregatedStatistics.get(biking).getCountTracks()); TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics(); - Assert.assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0); - Assert.assertEquals(totalTime * 2L, statistics2.getMovingTime()); + assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0); + assertEquals(totalTime * 2L, statistics2.getMovingTime()); } @Test @@ -152,30 +154,30 @@ public class AggregatedStatisticsTest { aggregatedStatistics.aggregate(tracks[2]); // biking activity 3. // then - Assert.assertEquals(3, aggregatedStatistics.getCount()); - Assert.assertNotNull(aggregatedStatistics.get(biking)); - Assert.assertNotNull(aggregatedStatistics.get(running)); - Assert.assertNotNull(aggregatedStatistics.get(walking)); - Assert.assertEquals(1, aggregatedStatistics.get(biking).getCountTracks()); - Assert.assertEquals(1, aggregatedStatistics.get(running).getCountTracks()); - Assert.assertEquals(1, aggregatedStatistics.get(walking).getCountTracks()); + assertEquals(3, aggregatedStatistics.getCount()); + assertNotNull(aggregatedStatistics.get(biking)); + assertNotNull(aggregatedStatistics.get(running)); + assertNotNull(aggregatedStatistics.get(walking)); + assertEquals(1, aggregatedStatistics.get(biking).getCountTracks()); + assertEquals(1, aggregatedStatistics.get(running).getCountTracks()); + assertEquals(1, aggregatedStatistics.get(walking).getCountTracks()); { TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics(); - Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0); - Assert.assertEquals(totalTime, statistics2.getMovingTime()); + assertEquals(totalDistance, statistics2.getTotalDistance(), 0); + assertEquals(totalTime, statistics2.getMovingTime()); } { TrackStatistics statistics2 = aggregatedStatistics.get(running).getTrackStatistics(); - Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0); - Assert.assertEquals(totalTime, statistics2.getMovingTime()); + assertEquals(totalDistance, statistics2.getTotalDistance(), 0); + assertEquals(totalTime, statistics2.getMovingTime()); } { TrackStatistics statistics2 = aggregatedStatistics.get(walking).getTrackStatistics(); - Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0); - Assert.assertEquals(totalTime, statistics2.getMovingTime()); + assertEquals(totalDistance, statistics2.getTotalDistance(), 0); + assertEquals(totalTime, statistics2.getMovingTime()); } } @@ -212,46 +214,46 @@ public class AggregatedStatisticsTest { // then // 4 sports. - Assert.assertEquals(4, aggregatedStatistics.getCount()); + assertEquals(4, aggregatedStatistics.getCount()); // There is a map for every sport. - Assert.assertNotNull(aggregatedStatistics.get(biking)); - Assert.assertNotNull(aggregatedStatistics.get(running)); - Assert.assertNotNull(aggregatedStatistics.get(walking)); - Assert.assertNotNull(aggregatedStatistics.get(driving)); + assertNotNull(aggregatedStatistics.get(biking)); + assertNotNull(aggregatedStatistics.get(running)); + assertNotNull(aggregatedStatistics.get(walking)); + assertNotNull(aggregatedStatistics.get(driving)); // Number of tracks by sport. - Assert.assertEquals(5, aggregatedStatistics.get(biking).getCountTracks()); // Biking. - Assert.assertEquals(2, aggregatedStatistics.get(running).getCountTracks()); // Running. - Assert.assertEquals(2, aggregatedStatistics.get(walking).getCountTracks()); // Walking. - Assert.assertEquals(1, aggregatedStatistics.get(driving).getCountTracks()); // Driving. + assertEquals(5, aggregatedStatistics.get(biking).getCountTracks()); // Biking. + assertEquals(2, aggregatedStatistics.get(running).getCountTracks()); // Running. + assertEquals(2, aggregatedStatistics.get(walking).getCountTracks()); // Walking. + assertEquals(1, aggregatedStatistics.get(driving).getCountTracks()); // Driving. // Biking. { TrackStatistics statistics2 = aggregatedStatistics.get(biking).getTrackStatistics(); - Assert.assertEquals(totalDistance * 5, statistics2.getTotalDistance(), 0); - Assert.assertEquals(totalTime * 5, statistics2.getMovingTime()); + assertEquals(totalDistance * 5, statistics2.getTotalDistance(), 0); + assertEquals(totalTime * 5, statistics2.getMovingTime()); } // Running. { TrackStatistics statistics2 = aggregatedStatistics.get(running).getTrackStatistics(); - Assert.assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0); - Assert.assertEquals(totalTime * 2, statistics2.getMovingTime()); + assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0); + assertEquals(totalTime * 2, statistics2.getMovingTime()); } // Walking. { TrackStatistics statistics2 = aggregatedStatistics.get(walking).getTrackStatistics(); - Assert.assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0); - Assert.assertEquals(totalTime * 2, statistics2.getMovingTime()); + assertEquals(totalDistance * 2, statistics2.getTotalDistance(), 0); + assertEquals(totalTime * 2, statistics2.getMovingTime()); } // Driving. { TrackStatistics statistics2 = aggregatedStatistics.get(driving).getTrackStatistics(); - Assert.assertEquals(totalDistance, statistics2.getTotalDistance(), 0); - Assert.assertEquals(totalTime, statistics2.getMovingTime()); + assertEquals(totalDistance, statistics2.getTotalDistance(), 0); + assertEquals(totalTime, statistics2.getMovingTime()); } } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java index 44edae733..0f053ca66 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java @@ -1,10 +1,10 @@ package de.dennisguse.opentracks.viewmodels; import android.util.Pair; + import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import org.junit.Assert; import java.util.Arrays; import java.util.List; @@ -16,12 +16,14 @@ import de.dennisguse.opentracks.stats.TrackStatistics; import de.dennisguse.opentracks.stats.TrackStatisticsUpdater; import de.dennisguse.opentracks.util.UnitConversions; +import static org.junit.Assert.assertEquals; + @RunWith(JUnit4.class) public class IntervalStatisticsTest { - private static final String TAG = IntervalStatisticsTest.class.getSimpleName(); + private static final String TAG = IntervalStatisticsTest.class.getSimpleName(); - private List buildTrackPoints(int numberOfTrackPoints) { + private List buildTrackPoints(int numberOfTrackPoints) { Pair pair = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), numberOfTrackPoints); return Arrays.asList(pair.second); } @@ -130,13 +132,13 @@ public class IntervalStatisticsTest { } // then - Assert.assertEquals(trackStatistics.getTotalDistance(), totalDistance, 0.01); - Assert.assertEquals(trackStatistics.getTotalTime() * UnitConversions.MS_TO_S, totalTime * UnitConversions.MS_TO_S, 0.1); - Assert.assertEquals(intervalList.size(), (int) Math.ceil(trackStatistics.getTotalDistance() / distanceInterval)); + assertEquals(trackStatistics.getTotalDistance(), totalDistance, 0.01); + assertEquals(trackStatistics.getTotalTime() * UnitConversions.MS_TO_S, totalTime * UnitConversions.MS_TO_S, 0.1); + assertEquals(intervalList.size(), (int) Math.ceil(trackStatistics.getTotalDistance() / distanceInterval)); for (int i = 0; i < intervalList.size() - 1; i++) { - Assert.assertEquals(intervalList.get(i).getDistance_m(), distanceInterval, 0.001); + assertEquals(intervalList.get(i).getDistance_m(), distanceInterval, 0.001); totalDistance -= intervalList.get(i).getDistance_m(); } - Assert.assertEquals(intervalList.get(intervalList.size() - 1).getDistance_m(), totalDistance, 0.01); + assertEquals(intervalList.get(intervalList.size() - 1).getDistance_m(), totalDistance, 0.01); } } \ No newline at end of file diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java index bec0346a4..796372c5a 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java @@ -76,10 +76,7 @@ public class KmzTrackExporter implements TrackExporter { @Override public boolean writeTrack(Track[] tracks, @NonNull OutputStream outputStream) { - ZipOutputStream zipOutputStream = null; - try { - zipOutputStream = new ZipOutputStream(outputStream); - + try (ZipOutputStream zipOutputStream = new ZipOutputStream(outputStream)) { // Add kml file ZipEntry zipEntry = new ZipEntry(KMZ_KML_FILE); zipOutputStream.putNextEntry(zipEntry); @@ -97,14 +94,6 @@ public class KmzTrackExporter implements TrackExporter { } catch (InterruptedException | IOException e) { Log.e(TAG, "Unable to write track", e); return false; - } finally { - if (zipOutputStream != null) { - try { - zipOutputStream.close(); - } catch (IOException e) { - Log.e(TAG, "Unable to close zip input stream", e); - } - } } }