More tests executable (but not passing).

2019-08-12 18:47:38 +02:00
parent f749ddb5ae
commit e2cac6ee60
13 changed files with 469 additions and 618 deletions
@@ -19,21 +19,19 @@ package de.dennisguse.opentracks.content;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;

-import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;

-import de.dennisguse.opentracks.content.CustomContentProvider.DatabaseHelper;
-
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.Test;
+
+import de.dennisguse.opentracks.content.CustomContentProvider.DatabaseHelper;

 /**
 * Tests {@link CustomContentProvider}.
 *
 * @author Youtao Liu
 */
-@RunWith(AndroidJUnit4.class)
 public class CustomContentProviderTest {

    private static final String DATABASE_NAME = "test.db";
@@ -42,7 +40,7 @@ public class CustomContentProviderTest {
    private CustomContentProvider customContentProvider;

    @Before
-    protected void setUp() {
+    public void setUp() {
        InstrumentationRegistry.getInstrumentation().getContext().deleteDatabase(DATABASE_NAME);
        db = (new DatabaseHelper(InstrumentationRegistry.getInstrumentation().getContext(), DATABASE_NAME)).getWritableDatabase();
        customContentProvider = new CustomContentProvider();
@@ -51,6 +49,7 @@ public class CustomContentProviderTest {
    /**
     * Tests {@link CustomContentProvider.DatabaseHelper#onCreate(SQLiteDatabase)}.
     */
+    @Test
    public void testDatabaseHelper_OnCreate() {
        Assert.assertTrue(hasTable(TracksColumns.TABLE_NAME));
        Assert.assertTrue(hasTable(TrackPointsColumns.TABLE_NAME));
@@ -60,6 +59,7 @@ public class CustomContentProviderTest {
    /**
     * Tests {@link CustomContentProvider#onCreate(android.content.Context)}.
     */
+    @Test
    public void testOnCreate() {
        Assert.assertTrue(customContentProvider.onCreate(InstrumentationRegistry.getInstrumentation().getContext()));
    }
@@ -67,12 +67,11 @@ public class CustomContentProviderTest {
    /**
     * Tests {@link CustomContentProvider#getType(Uri)}.
     */
+    @Test
    public void testGetType() {
        Assert.assertEquals(TracksColumns.CONTENT_TYPE, customContentProvider.getType(TracksColumns.CONTENT_URI));
-        Assert.assertEquals(
-                TrackPointsColumns.CONTENT_TYPE, customContentProvider.getType(TrackPointsColumns.CONTENT_URI));
-        Assert.assertEquals(
-                WaypointsColumns.CONTENT_TYPE, customContentProvider.getType(WaypointsColumns.CONTENT_URI));
+        Assert.assertEquals(TrackPointsColumns.CONTENT_TYPE, customContentProvider.getType(TrackPointsColumns.CONTENT_URI));
+        Assert.assertEquals(WaypointsColumns.CONTENT_TYPE, customContentProvider.getType(WaypointsColumns.CONTENT_URI));
    }

    /**
@@ -20,65 +20,65 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.location.Location;
-import android.test.RenamingDelegatingContext;
-import android.test.mock.MockContentResolver;

-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import de.dennisguse.opentracks.content.ContentProviderUtils.LocationFactory;
-import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
-import de.dennisguse.opentracks.content.Waypoint.WaypointType;
-import de.dennisguse.opentracks.services.TrackRecordingServiceTest.MockContext;
-import de.dennisguse.opentracks.stats.TripStatistics;
-import com.google.android.testing.mocking.AndroidMock;
-import com.google.android.testing.mocking.UsesMocks;
+import androidx.test.core.app.ApplicationProvider;

 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;

 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 import java.util.concurrent.atomic.AtomicInteger;

+import de.dennisguse.opentracks.content.ContentProviderUtils.LocationFactory;
+import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator;
+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+import de.dennisguse.opentracks.stats.TripStatistics;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 /**
 * A unit test for {@link ContentProviderUtilsImpl}.
 *
 * @author Bartlomiej Niechwiej
 * @author Youtao Liu
 */
-@RunWith(AndroidJUnit4.class)
+@RunWith(MockitoJUnitRunner.class)
 public class CustomContentProviderUtilsImplTest {
    private static final String NAME_PREFIX = "test name";
    private static final String MOCK_DESC = "Mock Next Waypoint Desc!";
    private static final String TEST_DESC = "Test Desc!";
    private static final String TEST_DESC_NEW = "Test Desc new!";
-    private Context context;
+    private Context context = ApplicationProvider.getApplicationContext();
    private ContentProviderUtils providerUtils;
    private double INITIAL_LATITUDE = 37.0;
    private double INITIAL_LONGITUDE = -57.0;
    private double ALTITUDE_INTERVAL = 2.5;

-    @Before
-    protected void setUp() {
-        MockContentResolver mockContentResolver = new MockContentResolver();
-        RenamingDelegatingContext targetContext = new RenamingDelegatingContext(
-                getContext(), getContext(), "test.");
-        context = new MockContext(mockContentResolver, targetContext);
-        CustomContentProvider provider = new CustomContentProvider();
-        provider.attachInfo(context, null);
-        mockContentResolver.addProvider(ContentProviderUtils.AUTHORITY, provider);
-        setContext(context);
+    @Mock
+    private Cursor cursorMock;

+    @Mock
+    private ContentResolver contentResolverMock;
+
+    @Before
+    public void setUp() {
        providerUtils = ContentProviderUtils.Factory.get(context);
        providerUtils.deleteAllTracks(context);
    }

+    @Test
    public void testLocationIterator_noPoints() {
        testIterator(1, 0, 1, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
    }

+    @Test
    public void testLocationIterator_customFactory() {
        final Location location = new Location("test_location");
        final AtomicInteger counter = new AtomicInteger();
@@ -93,46 +93,50 @@ public class CustomContentProviderUtilsImplTest {
        Assert.assertEquals(15, counter.get());
    }

+    @Test
    public void testLocationIterator_nullFactory() {
        try {
            testIterator(1, 15, 4, false, null);
-            fail("Expecting IllegalArgumentException");
+            Assert.fail("Expecting IllegalArgumentException");
        } catch (IllegalArgumentException e) {
            // Expected.
        }
    }

+    @Test
    public void testLocationIterator_noBatchAscending() {
        testIterator(1, 50, 100, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
        testIterator(2, 50, 50, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
    }

+    @Test
    public void testLocationIterator_noBatchDescending() {
        testIterator(1, 50, 100, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
        testIterator(2, 50, 50, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
    }

+    @Test
    public void testLocationIterator_batchAscending() {
        testIterator(1, 50, 11, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
        testIterator(2, 50, 25, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
    }

+    @Test
    public void testLocationIterator_batchDescending() {
        testIterator(1, 50, 11, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
        testIterator(2, 50, 25, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
    }

+    @Test
    public void testLocationIterator_largeTrack() {
        testIterator(1, 20000, 2000, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
    }

-    private List<Location> testIterator(long trackId, int numPoints, int batchSize,
-                                        boolean descending, LocationFactory locationFactory) {
+    private List<Location> testIterator(long trackId, int numPoints, int batchSize, boolean descending, LocationFactory locationFactory) {
        long lastPointId = initializeTrack(trackId, numPoints);
        ((ContentProviderUtilsImpl) providerUtils).setDefaultCursorBatchSize(batchSize);
        List<Location> locations = new ArrayList<Location>(numPoints);
-        LocationIterator it = providerUtils.getTrackPointLocationIterator(
-                trackId, -1L, descending, locationFactory);
+        LocationIterator it = providerUtils.getTrackPointLocationIterator(trackId, -1L, descending, locationFactory);
        try {
            while (it.hasNext()) {
                Location loc = it.next();
@@ -172,8 +176,7 @@ public class CustomContentProviderUtilsImplTest {
        // Load all inserted locations.
        long lastPointId = -1;
        int counter = 0;
-        LocationIterator it = providerUtils.getTrackPointLocationIterator(id, -1L, false,
-                ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        LocationIterator it = providerUtils.getTrackPointLocationIterator(id, -1L, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
        try {
            while (it.hasNext()) {
                it.next();
@@ -194,37 +197,35 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#createTrack(Cursor)}.
     */
-    @UsesMocks(Cursor.class)
+    @Test
    public void testCreateTrack() {
-        Cursor cursorMock = AndroidMock.createNiceMock(Cursor.class);
        int startColumnIndex = 1;
        int columnIndex = startColumnIndex;
-        AndroidMock.expect(cursorMock.getColumnIndexOrThrow(TracksColumns._ID))
-                .andReturn(columnIndex++);
-        AndroidMock.expect(cursorMock.getColumnIndexOrThrow(TracksColumns.NAME)).andReturn(
-                columnIndex++);
+        when(cursorMock.getColumnIndexOrThrow(TracksColumns._ID)).thenReturn(columnIndex++);
+        when(cursorMock.getColumnIndexOrThrow(TracksColumns.NAME)).thenReturn(columnIndex++);
        columnIndex = startColumnIndex;
        // Id
-        AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
+        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
        // Name
-        AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
+        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
        long trackId = System.currentTimeMillis();
        columnIndex = startColumnIndex;
        // Id
-        AndroidMock.expect(cursorMock.getLong(columnIndex++)).andReturn(trackId);
+        when(cursorMock.getLong(columnIndex++)).thenReturn(trackId);
        // Name
        String name = NAME_PREFIX + trackId;
-        AndroidMock.expect(cursorMock.getString(columnIndex++)).andReturn(name);
-        AndroidMock.replay(cursorMock);
+        when(cursorMock.getString(columnIndex++)).thenReturn(name);
+
        Track track = providerUtils.createTrack(cursorMock);
        Assert.assertEquals(trackId, track.getId());
        Assert.assertEquals(name, track.getName());
-        AndroidMock.verify(cursorMock);
+        verify(cursorMock);
    }

    /**
     * Tests the method {@link ContentProviderUtilsImpl#deleteAllTracks(Context)}
     */
+    @Test
    public void testDeleteAllTracks() {
        // Insert track, points and waypoint at first.
        long trackId = System.currentTimeMillis();
@@ -233,32 +234,27 @@ public class CustomContentProviderUtilsImplTest {
        Waypoint waypoint = new Waypoint();
        providerUtils.insertWaypoint(waypoint);
        ContentResolver contentResolver = context.getContentResolver();
-        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null,
-                TracksColumns._ID);
+        Cursor tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
        Assert.assertEquals(1, tracksCursor.getCount());
-        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI, null, null,
-                null, TrackPointsColumns._ID);
+        Cursor tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI, null, null, null, TrackPointsColumns._ID);
        Assert.assertEquals(10, tracksPointsCursor.getCount());
-        Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null,
-                null, WaypointsColumns._ID);
+        Cursor waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
        Assert.assertEquals(1, waypointCursor.getCount());
        // Delete all.
        providerUtils.deleteAllTracks(context);
        // Check whether all have been deleted.
-        tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null,
-                TracksColumns._ID);
+        tracksCursor = contentResolver.query(TracksColumns.CONTENT_URI, null, null, null, TracksColumns._ID);
        Assert.assertEquals(0, tracksCursor.getCount());
-        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI, null, null,
-                null, TrackPointsColumns._ID);
+        tracksPointsCursor = contentResolver.query(TrackPointsColumns.CONTENT_URI, null, null, null, TrackPointsColumns._ID);
        Assert.assertEquals(0, tracksPointsCursor.getCount());
-        waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null,
-                null, WaypointsColumns._ID);
+        waypointCursor = contentResolver.query(WaypointsColumns.CONTENT_URI, null, null, null, WaypointsColumns._ID);
        Assert.assertEquals(0, waypointCursor.getCount());
    }

    /**
     * Tests the method {@link ContentProviderUtilsImpl#deleteTrack(Context, long)}.
     */
+    @Test
    public void testDeleteTrack() {
        // Insert three tracks, points of two tracks and way point of one track.
        long trackId = System.currentTimeMillis();
@@ -299,6 +295,7 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#getAllTracks()}
     */
+    @Test
    public void testGetAllTracks() {
        int initialTrackNumber = providerUtils.getAllTracks().size();
        long trackId = System.currentTimeMillis();
@@ -311,6 +308,7 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#getLastTrack()}
     */
+    @Test
    public void testGetLastTrack() {
        long trackId = System.currentTimeMillis();
        providerUtils.insertTrack(getTrack(trackId, 0));
@@ -320,6 +318,7 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#getTrack(long)}
     */
+    @Test
    public void testGetTrack() {
        long trackId = System.currentTimeMillis();
        providerUtils.insertTrack(getTrack(trackId, 0));
@@ -329,6 +328,7 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#updateTrack(Track)}
     */
+    @Test
    public void testUpdateTrack() {
        long trackId = System.currentTimeMillis();
        Track track = getTrack(trackId, 0);
@@ -345,6 +345,7 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#createContentValues(Waypoint)}.
     */
+    @Test
    public void testCreateContentValues_waypoint() {
        long trackId = System.currentTimeMillis();
        Track track = getTrack(trackId, 10);
@@ -380,8 +381,7 @@ public class CustomContentProviderUtilsImplTest {
        waypoint.setLocation(loc);
        providerUtils.insertWaypoint(waypoint);

-        ContentProviderUtilsImpl contentProviderUtils = new ContentProviderUtilsImpl(
-                new MockContentResolver());
+        ContentProviderUtilsImpl contentProviderUtils = new ContentProviderUtilsImpl(contentResolverMock);

        long waypointId = System.currentTimeMillis();
        waypoint.setId(waypointId);
@@ -396,40 +396,36 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#createWaypoint(Cursor)}.
     */
-    @UsesMocks(Cursor.class)
+    @Test
    public void testCreateWaypoint() {
-        Cursor cursorMock = AndroidMock.createNiceMock(Cursor.class);
        int startColumnIndex = 1;
        int columnIndex = startColumnIndex;
-        AndroidMock.expect(cursorMock.getColumnIndexOrThrow(WaypointsColumns._ID))
-                .andReturn(columnIndex++);
-        AndroidMock.expect(cursorMock.getColumnIndexOrThrow(WaypointsColumns.NAME)).andReturn(
-                columnIndex++);
-        AndroidMock.expect(cursorMock.getColumnIndexOrThrow(WaypointsColumns.TRACKID)).andReturn(
-                columnIndex++);
+        when(cursorMock.getColumnIndexOrThrow(WaypointsColumns._ID)).thenReturn(columnIndex++);
+        when(cursorMock.getColumnIndexOrThrow(WaypointsColumns.NAME)).thenReturn(columnIndex++);
+        when(cursorMock.getColumnIndexOrThrow(WaypointsColumns.TRACKID)).thenReturn(columnIndex++);
        columnIndex = startColumnIndex;
        // Id
-        AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
+        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
        // Name
-        AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
+        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
        // trackIdIndex
-        AndroidMock.expect(cursorMock.isNull(columnIndex++)).andReturn(false);
+        when(cursorMock.isNull(columnIndex++)).thenReturn(false);
        long id = System.currentTimeMillis();
        columnIndex = startColumnIndex;
        // Id
-        AndroidMock.expect(cursorMock.getLong(columnIndex++)).andReturn(id);
+        when(cursorMock.getLong(columnIndex++)).thenReturn(id);
        // Name
        String name = NAME_PREFIX + id;
-        AndroidMock.expect(cursorMock.getString(columnIndex++)).andReturn(name);
+        when(cursorMock.getString(columnIndex++)).thenReturn(name);
        // trackIdIndex
        long trackId = 11L;
-        AndroidMock.expect(cursorMock.getLong(columnIndex++)).andReturn(trackId);
-        AndroidMock.replay(cursorMock);
+        when(cursorMock.getLong(columnIndex++)).thenReturn(trackId);
+
        Waypoint waypoint = providerUtils.createWaypoint(cursorMock);
        Assert.assertEquals(id, waypoint.getId());
        Assert.assertEquals(name, waypoint.getName());
        Assert.assertEquals(trackId, waypoint.getTrackId());
-        AndroidMock.verify(cursorMock);
+        verify(cursorMock);
    }

    /**
@@ -437,6 +433,7 @@ public class CustomContentProviderUtilsImplTest {
     * {@link ContentProviderUtilsImpl#deleteWaypoint(Context, long, DescriptionGenerator)}
     * when there is only one waypoint in the track.
     */
+    @Test
    public void testDeleteWaypoint_onlyOneWayPoint() {
        long trackId = System.currentTimeMillis();
        Track track = getTrack(trackId, 10);
@@ -473,6 +470,7 @@ public class CustomContentProviderUtilsImplTest {
     * {@link ContentProviderUtilsImpl#deleteWaypoint(Context, long, DescriptionGenerator)}
     * when there is more than one waypoint in the track.
     */
+    @Test
    public void testDeleteWaypoint_hasNextWayPoint() {
        long trackId = System.currentTimeMillis();
        Track track = getTrack(trackId, 10);
@@ -528,6 +526,7 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#getFirstWaypointId(long)}.
     */
+    @Test
    public void testGetFirstWaypointId() {
        long trackId = System.currentTimeMillis();
        Track track = getTrack(trackId, 10);
@@ -547,6 +546,7 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#getNextWaypointNumber(long, WaypointType)}.
     */
+    @Test
    public void testGetNextWaypointNumber() {
        long trackId = System.currentTimeMillis();
        Track track = getTrack(trackId, 10);
@@ -577,6 +577,7 @@ public class CustomContentProviderUtilsImplTest {
     * Tests the method
     * {@link ContentProviderUtils#getLastWaypoint(long, WaypointType)}.
     */
+    @Test
    public void testGetLastStatisticsWaypoint() {
        long trackId = System.currentTimeMillis();
        Track track = getTrack(trackId, 10);
@@ -605,6 +606,7 @@ public class CustomContentProviderUtilsImplTest {
     * Tests the method {@link ContentProviderUtilsImpl#insertWaypoint(Waypoint)} and
     * {@link ContentProviderUtilsImpl#getWaypoint(long)}.
     */
+    @Test
    public void testInsertAndGetWaypoint() {
        long trackId = System.currentTimeMillis();
        Track track = getTrack(trackId, 10);
@@ -621,6 +623,7 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#updateWaypoint(Waypoint)}.
     */
+    @Test
    public void testUpdateWaypoint() {
        long trackId = System.currentTimeMillis();
        Track track = getTrack(trackId, 10);
@@ -639,9 +642,9 @@ public class CustomContentProviderUtilsImplTest {
    }

    /**
-     * Tests the method {@link ContentProviderUtilsImpl#bulkInsertTrackPoint(Location[],
-     * int, long)}.
+     * Tests the method {@link ContentProviderUtilsImpl#bulkInsertTrackPoint(Location[], int, long)}.
     */
+    @Test
    public void testBulkInsertTrackPoint() {
        // Insert track, point at first.
        long trackId = System.currentTimeMillis();
@@ -657,74 +660,68 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#createTrackPoint(Cursor)}.
     */
-    @UsesMocks(Cursor.class)
+    @Test
    public void testCreateTrackPoint() {
-        Cursor cursorMock = AndroidMock.createNiceMock(Cursor.class);
-
        // Set index.
        int index = 1;
        // Id
-        AndroidMock.expect(cursorMock.getColumnIndex(TrackPointsColumns._ID)).andReturn(index++);
+        when(cursorMock.getColumnIndex(TrackPointsColumns._ID)).thenReturn(index++);
        // Longitude
-        AndroidMock.expect(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.LONGITUDE)).andReturn(
-                index++);
+        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.LONGITUDE)).thenReturn(index++);
        // Latitude
-        AndroidMock.expect(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.LATITUDE)).andReturn(
-                index++);
+        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.LATITUDE)).thenReturn(index++);
        // Time
-        AndroidMock.expect(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.TIME))
-                .andReturn(index++);
+        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.TIME))
+                .thenReturn(index++);
        // Speed
-        AndroidMock.expect(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.SPEED)).andReturn(
-                index++);
+        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.SPEED)).thenReturn(index++);
        // Sensor
-        AndroidMock.expect(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.SENSOR_HEARTRATE)).andReturn(
-                index++);
+        when(cursorMock.getColumnIndexOrThrow(TrackPointsColumns.SENSOR_HEARTRATE)).thenReturn(index++);

        // Set return value of isNull().
        index = 2;
        // Longitude
-        AndroidMock.expect(cursorMock.isNull(index++)).andReturn(false);
+        when(cursorMock.isNull(index++)).thenReturn(false);
        // Latitude
-        AndroidMock.expect(cursorMock.isNull(index++)).andReturn(false);
+        when(cursorMock.isNull(index++)).thenReturn(false);
        // Time
-        AndroidMock.expect(cursorMock.isNull(index++)).andReturn(false);
+        when(cursorMock.isNull(index++)).thenReturn(false);
        // Speed
-        AndroidMock.expect(cursorMock.isNull(index++)).andReturn(false);
+        when(cursorMock.isNull(index++)).thenReturn(false);
        // Sensor
-        AndroidMock.expect(cursorMock.isNull(index++)).andReturn(false);
+        when(cursorMock.isNull(index++)).thenReturn(false);

        // Set return value of isNull().
        index = 2;
        // Longitude
        int longitude = 11;
-        AndroidMock.expect(cursorMock.getInt(index++)).andReturn(longitude * 1000000);
+        when(cursorMock.getInt(index++)).thenReturn(longitude * 1000000);
        // Latitude.
        int latitude = 22;
-        AndroidMock.expect(cursorMock.getInt(index++)).andReturn(latitude * 1000000);
+        when(cursorMock.getInt(index++)).thenReturn(latitude * 1000000);
        // Time
        long time = System.currentTimeMillis();
-        AndroidMock.expect(cursorMock.getLong(index++)).andReturn(time);
+        when(cursorMock.getLong(index++)).thenReturn(time);
        // Speed
        float speed = 2.2f;
-        AndroidMock.expect(cursorMock.getFloat(index++)).andReturn(speed);
+        when(cursorMock.getFloat(index++)).thenReturn(speed);
        // Sensor
        byte[] sensor = "Sensor state".getBytes();
-        AndroidMock.expect(cursorMock.getBlob(index++)).andReturn(sensor);
+        when(cursorMock.getBlob(index++)).thenReturn(sensor);

-        AndroidMock.replay(cursorMock);
        Location location = providerUtils.createTrackPoint(cursorMock);
-        Assert.assertEquals((double) longitude, location.getLongitude());
-        Assert.assertEquals((double) latitude, location.getLatitude());
-        Assert.assertEquals(time, location.getTime());
-        Assert.assertEquals(speed, location.getSpeed());
-        AndroidMock.verify(cursorMock);
+        Assert.assertEquals((double) longitude, location.getLongitude(), 0.01);
+        Assert.assertEquals((double) latitude, location.getLatitude(), 0.01);
+        Assert.assertEquals(time, location.getTime(), 0.01);
+        Assert.assertEquals(speed, location.getSpeed(), 0.01);
+        verify(cursorMock);
    }

    /**
     * Tests the method
     * {@link ContentProviderUtilsImpl#insertTrackPoint(Location, long)}.
     */
+    @Test
    public void testInsertTrackPoint() {
        // Insert track, point at first.
        long trackId = System.currentTimeMillis();
@@ -738,6 +735,7 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#getFirstTrackPointId(long)}.
     */
+    @Test
    public void testGetFirstTrackPointId() {
        // Insert track, point at first.
        long trackId = System.currentTimeMillis();
@@ -750,6 +748,7 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#getLastTrackPointId(long)}.
     */
+    @Test
    public void testGetLastTrackPointId() {
        // Insert track, point at first.
        long trackId = System.currentTimeMillis();
@@ -762,6 +761,7 @@ public class CustomContentProviderUtilsImplTest {
    /**
     * Tests the method {@link ContentProviderUtilsImpl#getLastValidTrackPoint(long)}.
     */
+    @Test
    public void testGetLastValidTrackPoint() {
        // Insert track, points at first.
        long trackId = System.currentTimeMillis();
@@ -777,6 +777,7 @@ public class CustomContentProviderUtilsImplTest {
     * {@link ContentProviderUtilsImpl#getTrackPointCursor(long, long, int, boolean)}
     * in descending.
     */
+    @Test
    public void testGetTrackPointCursor_desc() {
        // Insert track, points at first.
        long trackId = System.currentTimeMillis();
@@ -792,6 +793,7 @@ public class CustomContentProviderUtilsImplTest {
     * {@link ContentProviderUtilsImpl#getTrackPointCursor(long, long, int, boolean)}
     * in ascending.
     */
+    @Test
    public void testGetTrackPointCursor_asc() {
        // Insert track, points at first.
        long trackId = System.currentTimeMillis();
@@ -803,10 +805,9 @@ public class CustomContentProviderUtilsImplTest {
    }

    /**
-     * Tests the method
-     * {@link ContentProviderUtilsImpl#getTrackPointLocationIterator(long, long, boolean, LocationFactory)}
-     * in descending.
+     * Tests the method {@link ContentProviderUtilsImpl#getTrackPointLocationIterator(long, long, boolean, LocationFactory)} in descending.
     */
+    @Test
    public void testGetTrackPointLocationIterator_desc() {
        // Insert track, points at first.
        long trackId = System.currentTimeMillis();
@@ -815,8 +816,7 @@ public class CustomContentProviderUtilsImplTest {

        long startTrackPointId = 2L;

-        LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId,
-                startTrackPointId, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId, startTrackPointId, true, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
        for (int i = 1; i >= 0; i--) {
            Assert.assertTrue(locationIterator.hasNext());
            Location location = locationIterator.next();
@@ -831,6 +831,7 @@ public class CustomContentProviderUtilsImplTest {
     * {@link ContentProviderUtilsImpl#getTrackPointLocationIterator(long, long, boolean, LocationFactory)}
     * in ascending.
     */
+    @Test
    public void testGetTrackPointLocationIterator_asc() {
        // Insert track, point at first.
        long trackId = System.currentTimeMillis();
@@ -839,8 +840,7 @@ public class CustomContentProviderUtilsImplTest {

        long startTrackPointId = 2L;

-        LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId,
-                startTrackPointId, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);
+        LocationIterator locationIterator = providerUtils.getTrackPointLocationIterator(trackId, startTrackPointId, false, ContentProviderUtils.DEFAULT_LOCATION_FACTORY);

        for (int i = 1; i < 10; i++) {
            Assert.assertTrue(locationIterator.hasNext());
@@ -876,7 +876,6 @@ public class CustomContentProviderUtilsImplTest {
     * @return created location
     */
    private Location createLocation(int i) {
-
        Location loc = new Location("test");
        loc.setLatitude(INITIAL_LATITUDE + (double) i / 10000.0);
        loc.setLongitude(INITIAL_LONGITUDE - (double) i / 10000.0);
@@ -893,10 +892,10 @@ public class CustomContentProviderUtilsImplTest {
     * @param location the location to be checked
     */
    private void checkLocation(int i, Location location) {
-        Assert.assertEquals(INITIAL_LATITUDE + (double) i / 10000.0, location.getLatitude());
-        Assert.assertEquals(INITIAL_LONGITUDE - (double) i / 10000.0, location.getLongitude());
-        Assert.assertEquals((float) i / 100.0f, location.getAccuracy());
-        Assert.assertEquals(i * ALTITUDE_INTERVAL, location.getAltitude());
+        Assert.assertEquals(INITIAL_LATITUDE + (double) i / 10000.0, location.getLatitude(), 0.01);
+        Assert.assertEquals(INITIAL_LONGITUDE - (double) i / 10000.0, location.getLongitude(), 0.01);
+        Assert.assertEquals((float) i / 100.0f, location.getAccuracy(), 0.01);
+        Assert.assertEquals(i * ALTITUDE_INTERVAL, location.getAltitude(), 0.01);
    }

    /**
@@ -906,7 +905,6 @@ public class CustomContentProviderUtilsImplTest {
     */
    private void insertTrackWithLocations(Track track) {
        providerUtils.insertTrack(track);
-        providerUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), track
-                .getLocations().size(), track.getId());
+        providerUtils.bulkInsertTrackPoint(track.getLocations().toArray(new Location[0]), track.getLocations().size(), track.getId());
    }
 }
@@ -19,14 +19,15 @@ package de.dennisguse.opentracks.content;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;

-import de.dennisguse.opentracks.stats.TripStatistics;
-import de.dennisguse.opentracks.util.StringUtils;
-import de.dennisguse.opentracks.R;
-
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Test;
 import org.junit.runner.RunWith;

+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.stats.TripStatistics;
+import de.dennisguse.opentracks.util.StringUtils;
+
 /**
 * Tests for {@link DescriptionGeneratorImpl}.
 *
@@ -39,14 +40,14 @@ public class DescriptionGeneratorImplTest {
    private DescriptionGeneratorImpl descriptionGenerator;

    @Before
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
        descriptionGenerator = new DescriptionGeneratorImpl(InstrumentationRegistry.getInstrumentation().getContext());
    }

    /**
-     * Tests {@link DescriptionGeneratorImpl#generateTrackDescription(Track,
-     * java.util.Vector, java.util.Vector, boolean)}.
+     * Tests {@link DescriptionGeneratorImpl#generateTrackDescription(Track, java.util.Vector, java.util.Vector, boolean)}.
     */
+    @Test
    public void testGenerateTrackDescription() {
        Track track = new Track();
        TripStatistics stats = new TripStatistics();
@@ -88,6 +89,7 @@ public class DescriptionGeneratorImplTest {
    /**
     * Tests {@link DescriptionGeneratorImpl#generateWaypointDescription(TripStatistics)}.
     */
+    @Test
    public void testGenerateWaypointDescription() {
        Waypoint waypoint = new Waypoint();
        TripStatistics stats = new TripStatistics();
@@ -117,14 +119,14 @@ public class DescriptionGeneratorImplTest {
                + "Max grade: 42 %\n"
                + "Min grade: 11 %\n"
                + "Recorded: " + StringUtils.formatDateTime(InstrumentationRegistry.getInstrumentation().getContext(), START_TIME) + "\n";
-        Assert.assertEquals(
-                expected, descriptionGenerator.generateWaypointDescription(waypoint.getTripStatistics()));
+        Assert.assertEquals(expected, descriptionGenerator.generateWaypointDescription(waypoint.getTripStatistics()));
    }

    /**
     * Tests {@link DescriptionGeneratorImpl#writeDistance(double, StringBuilder,
     * int, String)}.
     */
+    @Test
    public void testWriteDistance() {
        StringBuilder builder = new StringBuilder();
        descriptionGenerator.writeDistance(1100, builder, R.string.description_total_distance, "<br>");
@@ -135,6 +137,7 @@ public class DescriptionGeneratorImplTest {
     * Tests {@link DescriptionGeneratorImpl#writeTime(long, StringBuilder, int,
     * String)}.
     */
+    @Test
    public void testWriteTime() {
        StringBuilder builder = new StringBuilder();
        descriptionGenerator.writeTime(1000, builder, R.string.description_total_time, "<br>");
@@ -145,6 +148,7 @@ public class DescriptionGeneratorImplTest {
     * Tests {@link DescriptionGeneratorImpl#writeSpeed(double, StringBuilder,
     * int, String)}.
     */
+    @Test
    public void testWriteSpeed() {
        StringBuilder builder = new StringBuilder();
        descriptionGenerator.writeSpeed(1.1, builder, R.string.description_average_speed, "\n");
@@ -155,6 +159,7 @@ public class DescriptionGeneratorImplTest {
     * Tests {@link DescriptionGeneratorImpl#writeElevation(double, StringBuilder,
     * int, String)}.
     */
+    @Test
    public void testWriteElevation() {
        StringBuilder builder = new StringBuilder();
        descriptionGenerator.writeElevation(4.2, builder, R.string.description_min_elevation, "<br>");
@@ -165,6 +170,7 @@ public class DescriptionGeneratorImplTest {
     * Tests {@link DescriptionGeneratorImpl#writePace(double, StringBuilder, int,
     * String)}.
     */
+    @Test
    public void testWritePace() {
        StringBuilder builder = new StringBuilder();
        descriptionGenerator.writePace(1.1, builder, R.string.description_average_pace_in_minute, "\n");
@@ -175,6 +181,7 @@ public class DescriptionGeneratorImplTest {
     * Tests {@link DescriptionGeneratorImpl#writeGrade(double, StringBuilder,
     * int, String)}.
     */
+    @Test
    public void testWriteGrade() {
        StringBuilder builder = new StringBuilder();
        descriptionGenerator.writeGrade(.042, builder, R.string.description_max_grade, "<br>");
@@ -185,6 +192,7 @@ public class DescriptionGeneratorImplTest {
     * Tests {@link DescriptionGeneratorImpl#writeGrade(double, StringBuilder,
     * int, String)} with a NaN.
     */
+    @Test
    public void testWriteGrade_nan() {
        StringBuilder builder = new StringBuilder();
        descriptionGenerator.writeGrade(Double.NaN, builder, R.string.description_max_grade, "<br>");
@@ -195,6 +203,7 @@ public class DescriptionGeneratorImplTest {
     * Tests {@link DescriptionGeneratorImpl#writeGrade(double, StringBuilder,
     * int, String)} with an infinite number.
     */
+    @Test
    public void testWriteGrade_infinite() {
        StringBuilder builder = new StringBuilder();
        descriptionGenerator.writeGrade(
@@ -17,26 +17,27 @@
 package de.dennisguse.opentracks.content;

 import android.content.ContentUris;
+import android.content.Context;
 import android.location.Location;
 import android.net.Uri;
-import android.test.RenamingDelegatingContext;
-import android.test.mock.MockContentResolver;

+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;

-import de.dennisguse.opentracks.content.SearchEngine.ScoredResult;
-import de.dennisguse.opentracks.content.SearchEngine.SearchQuery;
-import de.dennisguse.opentracks.services.TrackRecordingServiceTest.MockContext;
-import de.dennisguse.opentracks.stats.TripStatistics;
-
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Test;
 import org.junit.runner.RunWith;

 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

+import de.dennisguse.opentracks.content.SearchEngine.ScoredResult;
+import de.dennisguse.opentracks.content.SearchEngine.SearchQuery;
+import de.dennisguse.opentracks.stats.TripStatistics;
+
 /**
 * Tests for {@link SearchEngine}.
 * These are not meant to be quality tests, but instead feature-by-feature tests
@@ -53,24 +54,18 @@ public class SearchEngineTest {
    private ContentProviderUtils providerUtils;
    private SearchEngine engine;

-    @Before
-    protected void setUp() {
-        MockContentResolver mockContentResolver = new MockContentResolver();
-        RenamingDelegatingContext targetContext = new RenamingDelegatingContext(
-                getContext(), getContext(), "test.");
-        MockContext context = new MockContext(mockContentResolver, targetContext);
-        CustomContentProvider provider = new CustomContentProvider();
-        provider.attachInfo(context, null);
-        mockContentResolver.addProvider(ContentProviderUtils.AUTHORITY, provider);
-        setContext(context);
+    private Context context = ApplicationProvider.getApplicationContext();

+
+    @Before
+    public void setUp() {
        providerUtils = ContentProviderUtils.Factory.get(context);
        engine = new SearchEngine(providerUtils);
    }

    @After
-    protected void tearDown() throws Exception {
-        providerUtils.deleteAllTracks(getContext());
+    public void tearDown() throws Exception {
+        providerUtils.deleteAllTracks(context);
    }

    private long insertTrack(String title, String description, String category, double distance, long hoursAgo) {
@@ -141,6 +136,7 @@ public class SearchEngineTest {
        return insertWaypoint(title, "", "", 0.0, hoursAgo, trackId);
    }

+    @Test
    public void testSearchText() {
        // Insert 7 tracks (purposefully out of result order):
        // - one which won't match
@@ -162,11 +158,10 @@ public class SearchEngineTest {
        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));

        // Title > Description > Category.
-        assertTrackResults(results,
-                allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId,
-                categoryMatchId);
+        assertTrackResults(results, allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId, categoryMatchId);
    }

+    @Test
    public void testSearchWaypointText() {
        // Insert 7 waypoints (purposefully out of result order):
        // - one which won't match
@@ -188,11 +183,10 @@ public class SearchEngineTest {
        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));

        // Title > Description > Category.
-        assertWaypointResults(results,
-                allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId,
-                categoryMatchId);
+        assertWaypointResults(results, allMatchId, titleDescriptionMatchId, titleCategoryMatchId, titleMatchId, descriptionMatchId, categoryMatchId);
    }

+    @Test
    public void testSearchMixedText() {
        // Insert 5 entries (purposefully out of result order):
        // - one waypoint which will match by description
@@ -210,12 +204,13 @@ public class SearchEngineTest {
        ArrayList<ScoredResult> results = new ArrayList<ScoredResult>(engine.search(query));

        // Title > Description > Category.
-        assertEquals(results.toString(), 3, results.size());
+        Assert.assertEquals(results.toString(), 3, results.size());
        assertTrackResult(trackId, results.get(0));
        assertWaypointResult(titleWaypointId, results.get(1));
        assertWaypointResult(descriptionWaypointId, results.get(2));
    }

+    @Test
    public void testSearchTrackDistance() {
        // All results match text, but they're at difference distances from the user.
        long farFarAwayId = insertTrack("aa", 0.3);
@@ -229,6 +224,7 @@ public class SearchEngineTest {
        assertTrackResults(results, nearId, farId, farFarAwayId);
    }

+    @Test
    public void testSearchWaypointDistance() {
        // All results match text, but they're at difference distances from the user.
        long farFarAwayId = insertWaypoint("aa", 0.3);
@@ -255,6 +251,7 @@ public class SearchEngineTest {
        assertTrackResults(results, recentId, oldId, oldestId);
    }

+    @Test
    public void testSearchWaypointRecent() {
        // All results match text, but they're were recorded at different times.
        long oldestId = insertWaypoint("aa", 2);
@@ -268,6 +265,7 @@ public class SearchEngineTest {
        assertWaypointResults(results, recentId, oldId, oldestId);
    }

+    @Test
    public void testSearchCurrentTrack() {
        // All results match text, but one of them is the current track.
        long currentId = insertTrack("ab", 1);
@@ -280,6 +278,7 @@ public class SearchEngineTest {
        assertTrackResults(results, otherId, currentId);
    }

+    @Test
    public void testSearchCurrentTrackWaypoint() {
        // All results match text, but one of them is in the current track.
        long otherId = insertWaypoint("aa", 1, 456);
@@ -293,36 +292,36 @@ public class SearchEngineTest {
    }

    private void assertTrackResult(long trackId, ScoredResult result) {
-        assertNotNull("Not a track", result.track);
-        assertNull("Ambiguous result", result.waypoint);
-        assertEquals(trackId, result.track.getId());
+        Assert.assertNotNull("Not a track", result.track);
+        Assert.assertNull("Ambiguous result", result.waypoint);
+        Assert.assertEquals(trackId, result.track.getId());
    }

    private void assertTrackResults(List<ScoredResult> results, long... trackIds) {
        String errMsg = "Expected IDs=" + Arrays.toString(trackIds) + "; results=" + results;
-        assertEquals(results.size(), trackIds.length);
+        Assert.assertEquals(results.size(), trackIds.length);
        for (int i = 0; i < results.size(); i++) {
            ScoredResult result = results.get(i);
-            assertNotNull(errMsg, result.track);
-            assertNull(errMsg, result.waypoint);
-            assertEquals(errMsg, trackIds[i], result.track.getId());
+            Assert.assertNotNull(errMsg, result.track);
+            Assert.assertNull(errMsg, result.waypoint);
+            Assert.assertEquals(errMsg, trackIds[i], result.track.getId());
        }
    }

    private void assertWaypointResult(long waypointId, ScoredResult result) {
-        assertNotNull("Not a waypoint", result.waypoint);
-        assertNull("Ambiguous result", result.track);
-        assertEquals(waypointId, result.waypoint.getId());
+        Assert.assertNotNull("Not a waypoint", result.waypoint);
+        Assert.assertNull("Ambiguous result", result.track);
+        Assert.assertEquals(waypointId, result.waypoint.getId());
    }

    private void assertWaypointResults(List<ScoredResult> results, long... waypointIds) {
        String errMsg = "Expected IDs=" + Arrays.toString(waypointIds) + "; results=" + results;
-        assertEquals(results.size(), waypointIds.length);
+        Assert.assertEquals(results.size(), waypointIds.length);
        for (int i = 0; i < results.size(); i++) {
            ScoredResult result = results.get(i);
-            assertNotNull(errMsg, result.waypoint);
-            assertNull(errMsg, result.track);
-            assertEquals(errMsg, waypointIds[i], result.waypoint.getId());
+            Assert.assertNotNull(errMsg, result.waypoint);
+            Assert.assertNull(errMsg, result.track);
+            Assert.assertEquals(errMsg, waypointIds[i], result.waypoint.getId());
        }
    }
 }
@@ -19,11 +19,12 @@ import android.os.Parcel;

 import androidx.test.ext.junit.runners.AndroidJUnit4;

-import de.dennisguse.opentracks.content.Waypoint.WaypointType;
-
 import org.junit.Assert;
+import org.junit.Test;
 import org.junit.runner.RunWith;

+import de.dennisguse.opentracks.content.Waypoint.WaypointType;
+
 /**
 * Tests for the WaypointCreationRequest class.
 * {@link WaypointCreationRequest}
@@ -33,6 +34,7 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
 public class WaypointCreationRequestTest {

+    @Test
    public void testTypeParceling() {
        WaypointCreationRequest original = WaypointCreationRequest.DEFAULT_WAYPOINT;
        Parcel p = Parcel.obtain();
@@ -46,9 +48,9 @@ public class WaypointCreationRequestTest {
        Assert.assertNull(copy.getIconUrl());
    }

+    @Test
    public void testAllAttributesParceling() {
-        WaypointCreationRequest original = new WaypointCreationRequest(
-                WaypointType.WAYPOINT, false, "name", "category", "description", "img.png", null);
+        WaypointCreationRequest original = new WaypointCreationRequest(WaypointType.WAYPOINT, false, "name", "category", "description", "img.png", null);
        Parcel p = Parcel.obtain();
        original.writeToParcel(p, 0);
        p.setDataPosition(0);