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 10f4ced03..9dab0623c 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 androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.rule.GrantPermissionRule; import androidx.test.rule.ServiceTestRule; import org.junit.After; @@ -84,9 +83,6 @@ public class ExportImportTest { @Rule public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS); - @Rule - public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION); - //For csv_export_only() as we the timezone is hardcoded in the expectation. @Rule public TimezoneRule timezoneRule = new TimezoneRule(TimeZone.getTimeZone("Europe/Berlin")); diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestMarker.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestMarker.java index b883b541b..077336f78 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestMarker.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestMarker.java @@ -29,7 +29,6 @@ import android.os.Looper; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.MediumTest; -import androidx.test.rule.GrantPermissionRule; import androidx.test.rule.ServiceTestRule; import org.junit.After; @@ -57,9 +56,6 @@ public class TrackRecordingServiceTestMarker { @Rule public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS); - @Rule - public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION); - private final Context context = ApplicationProvider.getApplicationContext(); private ContentProviderUtils contentProviderUtils; @@ -128,7 +124,6 @@ public class TrackRecordingServiceTestMarker { public void recording_GPSfix_createsMarker() { // given TrackPointCreator trackPointCreator = service.getTrackPointCreator(); - trackPointCreator.stopGPS(); trackPointCreator.setClock("2020-02-02T02:02:02Z"); Track.Id trackId = service.startNewTrack(); diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java index 4f6b0b122..3901a9342 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestRecording.java @@ -11,7 +11,6 @@ import androidx.annotation.NonNull; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.MediumTest; -import androidx.test.rule.GrantPermissionRule; import androidx.test.rule.ServiceTestRule; import org.junit.After; @@ -53,9 +52,6 @@ public class TrackRecordingServiceTestRecording { @Rule public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS); - @Rule - public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION); - private final Context context = ApplicationProvider.getApplicationContext(); private ContentProviderUtils contentProviderUtils; @@ -95,7 +91,6 @@ public class TrackRecordingServiceTestRecording { PreferencesUtils.setString(R.string.idle_speed_key, R.string.idle_speed_default); service = startService(); - service.getTrackPointCreator().stopGPS(); } @After @@ -117,7 +112,6 @@ public class TrackRecordingServiceTestRecording { String startTime = "2020-02-02T02:02:02Z"; trackPointCreator.setClock(startTime); Track.Id trackId = service.startNewTrack(); - trackPointCreator.stopGPS(); trackPointCreator.setAltitudeSumManager(altitudeSumManager); // then @@ -155,7 +149,6 @@ public class TrackRecordingServiceTestRecording { trackPointCreator.setClock(startTime); Track.Id trackId = service.startNewTrack(); - trackPointCreator.stopGPS(); trackPointCreator.setAltitudeSumManager(altitudeSumManager); // when @@ -202,7 +195,6 @@ public class TrackRecordingServiceTestRecording { String starTime = "2020-02-02T02:02:02Z"; trackPointCreator.setClock(starTime); Track.Id trackId = service.startNewTrack(); - trackPointCreator.stopGPS(); trackPointCreator.setAltitudeSumManager(altitudeSumManager); String pauseTime = "2020-02-02T02:02:03Z"; @@ -235,7 +227,6 @@ public class TrackRecordingServiceTestRecording { trackPointCreator.setClock(startTime); Track.Id trackId = service.startNewTrack(); - trackPointCreator.stopGPS(); trackPointCreator.setAltitudeSumManager(altitudeSumManager); String stopTime = "2020-02-02T02:02:03Z"; @@ -246,7 +237,6 @@ public class TrackRecordingServiceTestRecording { String resumeTime = "2020-02-02T02:02:04Z"; trackPointCreator.setClock(resumeTime); service.resumeTrack(trackId); - trackPointCreator.stopGPS(); trackPointCreator.setAltitudeSumManager(altitudeSumManager); // then @@ -268,7 +258,6 @@ public class TrackRecordingServiceTestRecording { trackPointCreator.setClock(startTime); Track.Id trackId = service.startNewTrack(); - trackPointCreator.stopGPS(); trackPointCreator.setAltitudeSumManager(altitudeSumManager); BluetoothRemoteSensorManager remoteSensorManager = trackPointCreator.getRemoteSensorManager(); diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java index f6f5d6b95..9e8db772b 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManagerTest.java @@ -8,7 +8,6 @@ import android.os.Looper; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.rule.GrantPermissionRule; import androidx.test.rule.ServiceTestRule; import org.junit.AfterClass; @@ -31,9 +30,6 @@ public class VoiceAnnouncementManagerTest { @Rule public final ServiceTestRule mServiceRule = ServiceTestRule.withTimeout(5, TimeUnit.SECONDS); - @Rule - public GrantPermissionRule mRuntimePermissionRule = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION); - @BeforeClass public static void preSetUp() { // Prepare looper for Android's message queue diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java index ef0c7f211..cf560fa28 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java +++ b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java @@ -66,13 +66,6 @@ public class TrackPointCreator implements BluetoothRemoteSensorManager.SensorDat return context != null; } - @Deprecated - //There should be a cooler way to do this; we want to send fake locations without getting affected by real GPS data. - @VisibleForTesting - public void stopGPS() { - gpsHandler.onStop(); - } - public synchronized void reset() { if (remoteSensorManager == null || altitudeSumManager == null) { Log.d(TAG, "No recording running and no reset necessary.");