Package structure: moved models and database.

Part of #963.

src/androidTest/java/de/dennisguse/opentracks/content/data/TestDataUtil.java

@@ -11,8 +11,13 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
-import de.dennisguse.opentracks.content.provider.ContentProviderUtils;
-import de.dennisguse.opentracks.content.provider.TrackPointIterator;
+import de.dennisguse.opentracks.data.ContentProviderUtils;
+import de.dennisguse.opentracks.data.TrackPointIterator;
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Marker;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.Track;
+import de.dennisguse.opentracks.data.models.TrackPoint;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.stats.TrackStatisticsUpdater;
 import de.dennisguse.opentracks.util.FileUtils;

src/androidTest/java/de/dennisguse/opentracks/content/data/TestSensorDataUtil.java

@@ -5,6 +5,10 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
+import de.dennisguse.opentracks.data.models.Distance;
+import de.dennisguse.opentracks.data.models.Speed;
+import de.dennisguse.opentracks.data.models.TrackPoint;
+
 public class TestSensorDataUtil {
 
     private final List<TrackPoint> trackPointList = new ArrayList<>();

src/androidTest/java/de/dennisguse/opentracks/content/data/TrackPointTest.java

@@ -1,56 +0,0 @@
-package de.dennisguse.opentracks.content.data;
-
-import org.junit.Test;
-
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class TrackPointTest {
-
-    @Test
-    public void isRecent_true() {
-        TrackPoint tp = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.now());
-
-        assertTrue(tp.isRecent());
-    }
-
-    @Test
-    public void isRecent_false() {
-        TrackPoint tp = new TrackPoint(TrackPoint.Type.SEGMENT_END_MANUAL, Instant.now().minus(2, ChronoUnit.MINUTES));
-
-        assertFalse(tp.isRecent());
-    }
-
-    @Test
-    public void distanceToPrevious() {
-        TrackPoint tp1 = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(0))
-                .setLatitude(0)
-                .setLongitude(0.0001);
-
-        TrackPoint tp2 = new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.ofEpochMilli(1))
-                .setLatitude(0)
-                .setLongitude(0.0002);
-
-        // without sensor distance
-        assertEquals(11.13, tp2.distanceToPrevious(tp1).toM(), 0.01);
-
-        // tp1 has sensor distance
-        tp1.setSensorDistance(Distance.of(5));
-        tp1.setSensorDistance(null);
-        assertEquals(11.13, tp2.distanceToPrevious(tp1).toM(), 0.01);
-
-        // tp2 has sensor distance
-        tp1.setSensorDistance(null);
-        tp2.setSensorDistance(Distance.of(5));
-        assertEquals(5, tp2.distanceToPrevious(tp1).toM(), 0.01);
-
-        // tp1 and tp2 have sensor distance
-        tp1.setSensorDistance(Distance.of(10));
-        tp2.setSensorDistance(Distance.of(5));
-        assertEquals(5, tp2.distanceToPrevious(tp1).toM(), 0.01);
-    }
-}

src/androidTest/java/de/dennisguse/opentracks/content/data/TrackSelectionTest.java

@@ -1,205 +0,0 @@
-package de.dennisguse.opentracks.content.data;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.time.Instant;
-
-import de.dennisguse.opentracks.content.provider.SelectionData;
-
-@RunWith(AndroidJUnit4.class)
-public class TrackSelectionTest extends TestCase {
-    @Test
-    public void testFilterBuildSelection_empty() {
-        // given
-        TrackSelection filter = new TrackSelection();
-
-        // when
-        SelectionData selection = filter.buildSelection();
-
-        // Then
-        assertNull(selection.getSelection());
-        assertNull(selection.getSelectionArgs());
-    }
-
-    @Test
-    public void testFilterBuildSelection_onlyOneTrackId() {
-        // given
-        Track.Id trackId = new Track.Id(1);
-        TrackSelection filter = new TrackSelection().addTrackId(trackId);
-
-        // when
-        SelectionData selection = filter.buildSelection();
-
-        // Then
-        assertEquals(selection.getSelection(), "_id IN (?)");
-        assertEquals(selection.getSelectionArgs().length, 1);
-        assertEquals(selection.getSelectionArgs()[0], "1");
-    }
-
-    @Test
-    public void testFilterBuildSelection_severalTracksId() {
-        // given
-        Track.Id trackId1 = new Track.Id(1);
-        Track.Id trackId2 = new Track.Id(2);
-        Track.Id trackId3 = new Track.Id(3);
-        TrackSelection filter = new TrackSelection()
-                .addTrackId(trackId1)
-                .addTrackId(trackId2)
-                .addTrackId(trackId3);
-
-        // when
-        SelectionData selection = filter.buildSelection();
-
-        // Then
-        assertEquals(selection.getSelection(), "_id IN (?,?,?)");
-        assertEquals(selection.getSelectionArgs().length, 3);
-        assertEquals(selection.getSelectionArgs()[0], "1");
-        assertEquals(selection.getSelectionArgs()[1], "2");
-        assertEquals(selection.getSelectionArgs()[2], "3");
-    }
-
-    @Test
-    public void testFilterBuildSelection_onlyOneCategory() {
-        // given
-        TrackSelection filter = new TrackSelection().addCategory("running");
-
-        // when
-        SelectionData selection = filter.buildSelection();
-
-        // Then
-        assertEquals(selection.getSelection(), "category IN (?)");
-        assertEquals(selection.getSelectionArgs().length, 1);
-        assertEquals(selection.getSelectionArgs()[0], "running");
-    }
-
-    @Test
-    public void testFilterBuildSelection_severalCategories() {
-        // given
-        TrackSelection filter = new TrackSelection()
-                .addCategory("running")
-                .addCategory("road biking")
-                .addCategory("mountain biking")
-                .addCategory("trail walking");
-
-        // when
-        SelectionData selection = filter.buildSelection();
-
-        // Then
-        assertEquals(selection.getSelection(), "category IN (?,?,?,?)");
-        assertEquals(selection.getSelectionArgs().length, 4);
-        assertEquals(selection.getSelectionArgs()[0], "running");
-        assertEquals(selection.getSelectionArgs()[1], "road biking");
-        assertEquals(selection.getSelectionArgs()[2], "mountain biking");
-        assertEquals(selection.getSelectionArgs()[3], "trail walking");
-    }
-
-    @Test
-    public void testFilterBuildSelection_onlyDateRange() {
-        // given
-        Instant instant = Instant.now();
-        long oneDay = 24 * 60 * 60 * 1000;
-        TrackSelection filterWrong1 = new TrackSelection().addDateRange(instant, null);
-        TrackSelection filterWrong2 = new TrackSelection().addDateRange(null, instant);
-        TrackSelection filterOk = new TrackSelection().addDateRange(instant, instant.plusMillis(oneDay));
-
-        // when
-        SelectionData selectionWrong1 = filterWrong1.buildSelection();
-        SelectionData selectionWrong2 = filterWrong2.buildSelection();
-        SelectionData selectionOk = filterOk.buildSelection();
-
-        // Then
-        assertNull(selectionWrong1.getSelection());
-        assertNull(selectionWrong1.getSelectionArgs());
-
-        assertNull(selectionWrong2.getSelection());
-        assertNull(selectionWrong2.getSelectionArgs());
-
-        assertEquals(selectionOk.getSelection(), "starttime BETWEEN ? AND ?");
-        assertEquals(selectionOk.getSelectionArgs().length, 2);
-        assertEquals(selectionOk.getSelectionArgs()[0], Long.toString(instant.toEpochMilli()));
-        assertEquals(selectionOk.getSelectionArgs()[1], Long.toString(instant.toEpochMilli() + oneDay));
-    }
-
-    @Test
-    public void testFilterBuildSelection_tracksId_and_categories() {
-        // given
-        Track.Id trackId1 = new Track.Id(1);
-        Track.Id trackId2 = new Track.Id(2);
-        Track.Id trackId3 = new Track.Id(3);
-        TrackSelection filter = new TrackSelection()
-                .addTrackId(trackId1)
-                .addTrackId(trackId2)
-                .addTrackId(trackId3)
-                .addCategory("running")
-                .addCategory("road biking");
-
-        // when
-        SelectionData selection = filter.buildSelection();
-
-        // Then
-        assertEquals(selection.getSelection(), "_id IN (?,?,?) AND category IN (?,?)");
-        assertEquals(selection.getSelectionArgs().length, 5);
-        assertEquals(selection.getSelectionArgs()[0], "1");
-        assertEquals(selection.getSelectionArgs()[1], "2");
-        assertEquals(selection.getSelectionArgs()[2], "3");
-        assertEquals(selection.getSelectionArgs()[3], "running");
-        assertEquals(selection.getSelectionArgs()[4], "road biking");
-    }
-
-    @Test
-    public void testFilterBuildSelection_tracksId_and_dateRange() {
-        // given
-        Instant instant = Instant.now();
-        long oneDay = 24 * 60 * 60 * 1000;
-
-        Track.Id trackId1 = new Track.Id(1);
-        Track.Id trackId2 = new Track.Id(2);
-        Track.Id trackId3 = new Track.Id(3);
-
-        TrackSelection filter = new TrackSelection()
-                .addTrackId(trackId1)
-                .addTrackId(trackId2)
-                .addTrackId(trackId3)
-                .addDateRange(instant, instant.plusMillis(oneDay));
-
-        // when
-        SelectionData selection = filter.buildSelection();
-
-        // Then
-        assertEquals(selection.getSelection(), "_id IN (?,?,?) AND starttime BETWEEN ? AND ?");
-        assertEquals(selection.getSelectionArgs().length, 5);
-        assertEquals(selection.getSelectionArgs()[0], "1");
-        assertEquals(selection.getSelectionArgs()[1], "2");
-        assertEquals(selection.getSelectionArgs()[2], "3");
-        assertEquals(selection.getSelectionArgs()[3], Long.toString(instant.toEpochMilli()));
-        assertEquals(selection.getSelectionArgs()[4], Long.toString(instant.toEpochMilli() + oneDay));
-    }
-
-    @Test
-    public void testFilterBuildSelection_categories_and_dateRange() {
-        // given
-        Instant instant = Instant.now();
-        long oneDay = 24 * 60 * 60 * 1000;
-
-        TrackSelection filter = new TrackSelection()
-                .addCategory("running")
-                .addCategory("road biking")
-                .addDateRange(instant, instant.plusMillis(oneDay));
-
-        // when
-        SelectionData selection = filter.buildSelection();
-
-        // Then
-        assertEquals(selection.getSelection(), "category IN (?,?) AND starttime BETWEEN ? AND ?");
-        assertEquals(selection.getSelectionArgs().length, 4);
-        assertEquals(selection.getSelectionArgs()[0], "running");
-        assertEquals(selection.getSelectionArgs()[1], "road biking");
-        assertEquals(selection.getSelectionArgs()[2], Long.toString(instant.toEpochMilli()));
-        assertEquals(selection.getSelectionArgs()[3], Long.toString(instant.toEpochMilli() + oneDay));
-    }
-}