From 577b978a5ca6e93c8618311ed0a3d76273a1493f Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Fri, 25 Dec 2020 18:29:56 +0100 Subject: [PATCH] Cleanup. --- .../opentracks/content/data/TestDataUtil.java | 12 ++++---- .../CustomContentProviderUtilsTest.java | 28 +++++++++---------- .../io/file/importer/ExportImportTest.java | 7 ++--- .../util/AnnouncementUtilsTest.java | 3 +- .../viewmodels/IntervalStatisticsTest.java | 6 +--- .../opentracks/adapters/SensorsAdapter.java | 8 +++--- .../provider/ContentProviderUtils.java | 16 ----------- 7 files changed, 30 insertions(+), 50 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java index a5617943d..341738364 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java @@ -7,6 +7,8 @@ import android.util.Pair; import java.io.File; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import de.dennisguse.opentracks.content.provider.ContentProviderUtils; import de.dennisguse.opentracks.util.FileUtils; @@ -36,19 +38,19 @@ public class TestDataUtil { * @param trackId the trackId of the track * @param numPoints the trackPoints number in the track */ - public static Pair createTrack(Track.Id trackId, int numPoints) { + public static Pair> createTrack(Track.Id trackId, int numPoints) { Track track = createTrack(trackId); - TrackPoint[] trackPoints = new TrackPoint[numPoints]; + List trackPoints = new ArrayList<>(numPoints); for (int i = 0; i < numPoints; i++) { - trackPoints[i] = createTrackPoint(i); + trackPoints.add(createTrackPoint(i)); } return new Pair<>(track, trackPoints); } public static Track createTrackAndInsert(ContentProviderUtils contentProviderUtils, Track.Id trackId, int numPoints) { - Pair pair = createTrack(trackId, numPoints); + Pair> pair = createTrack(trackId, numPoints); insertTrackWithLocations(contentProviderUtils, pair.first, pair.second); @@ -83,7 +85,7 @@ public class TestDataUtil { * @param track track to be inserted * @param trackPoints trackPoints to be inserted */ - public static void insertTrackWithLocations(ContentProviderUtils contentProviderUtils, Track track, TrackPoint[] trackPoints) { + public static void insertTrackWithLocations(ContentProviderUtils contentProviderUtils, Track track, List trackPoints) { contentProviderUtils.insertTrack(track); contentProviderUtils.bulkInsertTrackPoint(trackPoints, track.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 026d85eba..29f82ff18 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/content/provider/CustomContentProviderUtilsTest.java @@ -34,7 +34,6 @@ import org.mockito.junit.MockitoJUnitRunner; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.UUID; @@ -64,6 +63,7 @@ import static org.mockito.Mockito.when; */ @RunWith(MockitoJUnitRunner.class) public class CustomContentProviderUtilsTest { + private static final String NAME_PREFIX = "test name"; private static final String MOCK_DESC = "Mock Next Marker Desc!"; private static final String TEST_DESC = "Test Desc!"; @@ -131,14 +131,14 @@ public class CustomContentProviderUtilsTest { track = contentProviderUtils.getTrack(id); assertNotNull(track); - TrackPoint[] trackPoints = new TrackPoint[numPoints]; + List trackPoints = new ArrayList<>(numPoints); for (int i = 0; i < numPoints; ++i) { Location loc = new Location("test"); loc.setLatitude(37.0 + (double) i / 10000.0); loc.setLongitude(57.0 - (double) i / 10000.0); loc.setAccuracy((float) i / 100.0f); loc.setAltitude(i * 2.5); - trackPoints[i] = new TrackPoint(loc); + trackPoints.add(new TrackPoint(loc)); } contentProviderUtils.bulkInsertTrackPoint(trackPoints, id); @@ -420,7 +420,7 @@ public class CustomContentProviderUtilsTest { @Test public void testCreateContentValues_marker() { Track.Id trackId = new Track.Id(System.currentTimeMillis()); - Pair track = TestDataUtil.createTrack(trackId, 10); + Pair> track = TestDataUtil.createTrack(trackId, 10); // Bottom long startTime = 1000L; @@ -439,7 +439,7 @@ public class CustomContentProviderUtilsTest { track.first.setTrackStatistics(statistics); contentProviderUtils.insertTrack(track.first); - Marker marker = new Marker(trackId, track.second[0]); + Marker marker = new Marker(trackId, track.second.get(0)); marker.setDescription(TEST_DESC); contentProviderUtils.insertMarker(marker); @@ -754,19 +754,19 @@ public class CustomContentProviderUtilsTest { } /** - * Tests the method {@link ContentProviderUtils#bulkInsertTrackPoint(TrackPoint[], Track.Id)}. + * Tests the method {@link ContentProviderUtils#bulkInsertTrackPoint(List, Track.Id)}. */ @Test public void testBulkInsertTrackPoint() { // given Track.Id trackId = new Track.Id(System.currentTimeMillis()); - Pair track = TestDataUtil.createTrack(trackId, 10); + Pair> track = TestDataUtil.createTrack(trackId, 10); TestDataUtil.insertTrackWithLocations(contentProviderUtils, track.first, track.second); // when / then contentProviderUtils.bulkInsertTrackPoint(track.second, trackId); assertEquals(20, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000).getCount()); - contentProviderUtils.bulkInsertTrackPoint(Arrays.copyOfRange(track.second, 0, 8), trackId); + contentProviderUtils.bulkInsertTrackPoint(track.second.subList(0, 8), trackId); assertEquals(28, contentProviderUtils.getTrackPointCursor(trackId, -1L, 1000).getCount()); } @@ -866,12 +866,12 @@ public class CustomContentProviderUtilsTest { public void testGetTrackPointCursor_asc() { // given Track.Id trackId = new Track.Id(System.currentTimeMillis()); - Pair track = TestDataUtil.createTrack(trackId, 10); + Pair> track = TestDataUtil.createTrack(trackId, 10); contentProviderUtils.insertTrack(track.first); - long[] trackpointIds = new long[track.second.length]; + long[] trackpointIds = new long[track.second.size()]; for (int i = 0; i < trackpointIds.length; i++) { - trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.second[i], track.first.getId())); + trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.second.get(i), track.first.getId())); } // when @@ -885,12 +885,12 @@ public class CustomContentProviderUtilsTest { public void testGetTrackPointLocationIterator_asc() { // given Track.Id trackId = new Track.Id(System.currentTimeMillis()); - Pair track = TestDataUtil.createTrack(trackId, 10); + Pair> track = TestDataUtil.createTrack(trackId, 10); contentProviderUtils.insertTrack(track.first); - long[] trackpointIds = new long[track.second.length]; + long[] trackpointIds = new long[track.second.size()]; for (int i = 0; i < trackpointIds.length; i++) { - trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.second[i], track.first.getId())); + trackpointIds[i] = ContentUris.parseId(contentProviderUtils.insertTrackPoint(track.second.get(i), track.first.getId())); } long startTrackPointId = trackpointIds[0]; diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java index 04e264e10..4da7ff529 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java @@ -18,7 +18,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import de.dennisguse.opentracks.R; @@ -62,7 +61,7 @@ public class ExportImportTest { @Before public void setUp() { - Pair track = TestDataUtil.createTrack(trackId, 10); + Pair> track = TestDataUtil.createTrack(trackId, 10); track.first.setIcon(TRACK_ICON); track.first.setCategory(TRACK_CATEGORY); track.first.setDescription(TRACK_DESCRIPTION); @@ -70,10 +69,10 @@ public class ExportImportTest { contentProviderUtils.bulkInsertTrackPoint(track.second, track.first.getId()); trackPoints.clear(); - trackPoints.addAll(Arrays.asList(track.second)); + trackPoints.addAll(track.second); for (int i = 0; i < 3; i++) { - Marker marker = new Marker(trackId, track.second[i].getLocation()); + Marker marker = new Marker(trackId, track.second.get(i).getLocation()); marker.setName("the marker " + i); marker.setDescription("the marker description " + i); marker.setCategory("the marker category" + i); diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java index 7b65be072..e7ba77a55 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java @@ -8,7 +8,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.Arrays; import java.util.List; import de.dennisguse.opentracks.R; @@ -50,7 +49,7 @@ public class AnnouncementUtilsTest { stats.setMaxSpeed(100); stats.setTotalElevationGain(6000); - List trackPoints = Arrays.asList(TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 10).second); + List trackPoints = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), 10).second; IntervalStatistics intervalStatistics = new IntervalStatistics(trackPoints, 1000); IntervalStatistics.Interval lastInterval = intervalStatistics.getIntervalList().get(intervalStatistics.getIntervalList().size() - 1); diff --git a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java index 68cea62b4..04d3b4d86 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/viewmodels/IntervalStatisticsTest.java @@ -1,12 +1,9 @@ package de.dennisguse.opentracks.viewmodels; -import android.util.Pair; - import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.util.Arrays; import java.util.List; import de.dennisguse.opentracks.content.data.TestDataUtil; @@ -24,8 +21,7 @@ public class IntervalStatisticsTest { private static final String TAG = IntervalStatisticsTest.class.getSimpleName(); private List buildTrackPoints(int numberOfTrackPoints) { - Pair pair = TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), numberOfTrackPoints); - return Arrays.asList(pair.second); + return TestDataUtil.createTrack(new Track.Id(System.currentTimeMillis()), numberOfTrackPoints).second; } private TrackStatistics buildTrackStatistics(List trackPoints) { diff --git a/src/main/java/de/dennisguse/opentracks/adapters/SensorsAdapter.java b/src/main/java/de/dennisguse/opentracks/adapters/SensorsAdapter.java index 960410c1b..77c460c05 100644 --- a/src/main/java/de/dennisguse/opentracks/adapters/SensorsAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/adapters/SensorsAdapter.java @@ -76,10 +76,10 @@ public class SensorsAdapter extends RecyclerView.Adapter trackPoints, Track.Id trackId) { ContentValues[] values = new ContentValues[trackPoints.size()];