diff --git a/src/androidTest/java/de/dennisguse/opentracks/EspressoDeleteTrackTest.java b/src/androidTest/java/de/dennisguse/opentracks/EspressoDeleteTrackTest.java index 3d3226970..6f0ab71d2 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/EspressoDeleteTrackTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/EspressoDeleteTrackTest.java @@ -32,11 +32,7 @@ public class EspressoDeleteTrackTest { public ActivityScenarioRule mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class); @Rule - public GrantPermissionRule mGrantPermissionRuleLocation = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION); - @Rule - public GrantPermissionRule mGrantPermissionRuleBluetooth = GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT); - @Rule - public GrantPermissionRule mGrantPermissionRuleNotifications = GrantPermissionRule.grant(Manifest.permission.POST_NOTIFICATIONS); + public GrantPermissionRule mGrantPermissionRule = TestUtil.createGrantPermissionRule(); @Test public void espressoDeleteTrackTest() { diff --git a/src/androidTest/java/de/dennisguse/opentracks/EspressoEditTrackRecordingTest.java b/src/androidTest/java/de/dennisguse/opentracks/EspressoEditTrackRecordingTest.java index fe82dec21..ef18249b5 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/EspressoEditTrackRecordingTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/EspressoEditTrackRecordingTest.java @@ -40,11 +40,7 @@ public class EspressoEditTrackRecordingTest { public ActivityScenarioRule mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class); @Rule - public GrantPermissionRule mGrantPermissionRuleLocation = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION); - @Rule - public GrantPermissionRule mGrantPermissionRuleBluetooth = GrantPermissionRule.grant(android.Manifest.permission.BLUETOOTH_CONNECT); - @Rule - public GrantPermissionRule mGrantPermissionRuleNotifications = GrantPermissionRule.grant(Manifest.permission.POST_NOTIFICATIONS); + public GrantPermissionRule mGrantPermissionRule = TestUtil.createGrantPermissionRule(); @LargeTest @Test diff --git a/src/androidTest/java/de/dennisguse/opentracks/EspressoUITest.java b/src/androidTest/java/de/dennisguse/opentracks/EspressoUITest.java index a5dd4439d..8a684b23e 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/EspressoUITest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/EspressoUITest.java @@ -33,12 +33,7 @@ public class EspressoUITest { public ActivityScenarioRule mActivityTestRule = new ActivityScenarioRule<>(TrackListActivity.class); @Rule - public GrantPermissionRule mGrantPermissionRuleLocation = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION); - @Rule - public GrantPermissionRule mGrantPermissionRuleBluetooth = GrantPermissionRule.grant(android.Manifest.permission.BLUETOOTH_CONNECT); - @Rule - public GrantPermissionRule mGrantPermissionRuleNotifications = GrantPermissionRule.grant(Manifest.permission.POST_NOTIFICATIONS); - + public GrantPermissionRule mGrantPermissionRule = TestUtil.createGrantPermissionRule(); @LargeTest @Test public void record_stop_resume_stop_finish() { diff --git a/src/androidTest/java/de/dennisguse/opentracks/TestUtil.java b/src/androidTest/java/de/dennisguse/opentracks/TestUtil.java new file mode 100644 index 000000000..d2bf9bdfc --- /dev/null +++ b/src/androidTest/java/de/dennisguse/opentracks/TestUtil.java @@ -0,0 +1,18 @@ +package de.dennisguse.opentracks; + +import android.Manifest; +import android.os.Build; + +import androidx.test.rule.GrantPermissionRule; + +import de.dennisguse.opentracks.test.BuildConfig; + +public class TestUtil { + + public static GrantPermissionRule createGrantPermissionRule() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT, Manifest.permission.POST_NOTIFICATIONS); + } + return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT); + } +}