DO NOT MERGE Remove unused ActivityTestRules
These "ActivityTestRule" rules:
- Are unused (exception: one rule is used by PermissionReviewTest, so
move it there)
- Add unnecessary latency to test startup
- Are causing intermittent "Could not launch intent" test failures
Bug: 274534036
Test: atest CtsPermission3TestCases
Change-Id: Ibb1ab341ec3bf8276402be10a813486735cd76fb
diff --git a/tests/tests/permission3/src/android/permission3/cts/BasePermissionTest.kt b/tests/tests/permission3/src/android/permission3/cts/BasePermissionTest.kt
index b818d68..5533063 100644
--- a/tests/tests/permission3/src/android/permission3/cts/BasePermissionTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/BasePermissionTest.kt
@@ -43,7 +43,6 @@
import android.util.Log
import androidx.test.core.app.ActivityScenario
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.ActivityTestRule
import androidx.test.uiautomator.By
import androidx.test.uiautomator.BySelector
import androidx.test.uiautomator.StaleObjectException
@@ -51,7 +50,6 @@
import androidx.test.uiautomator.UiObject2
import com.android.compatibility.common.util.DisableAnimationRule
import com.android.compatibility.common.util.FreezeRotationRule
-import com.android.compatibility.common.util.FutureResultActivity
import com.android.compatibility.common.util.SystemUtil.runShellCommand
import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
import com.android.compatibility.common.util.UiAutomatorUtils2
@@ -114,14 +112,8 @@
@get:Rule
val freezeRotationRule = FreezeRotationRule()
- @get:Rule
- val activityRule = ActivityTestRule(StartForFutureActivity::class.java, false, false)
-
var activityScenario: ActivityScenario<StartForFutureActivity>? = null
- @get:Rule
- val installDialogStarter = ActivityTestRule(FutureResultActivity::class.java)
-
data class SessionResult(val status: Int?)
/** If a status was received the value of the status, otherwise null */
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionReviewTest.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionReviewTest.kt
index c33711b..c0208e8 100644
--- a/tests/tests/permission3/src/android/permission3/cts/PermissionReviewTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionReviewTest.kt
@@ -26,6 +26,7 @@
import android.os.Looper
import android.os.ResultReceiver
import androidx.test.filters.SdkSuppress
+import androidx.test.rule.ActivityTestRule
import androidx.test.runner.AndroidJUnit4
import androidx.test.uiautomator.By
import java.util.concurrent.LinkedBlockingQueue
@@ -34,6 +35,7 @@
import org.junit.Assert.assertNull
import org.junit.Assume
import org.junit.Before
+import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -50,6 +52,9 @@
installPackage(APP_APK_PATH_22_CALENDAR_ONLY)
}
+ @get:Rule
+ val activityRule = ActivityTestRule(StartForFutureActivity::class.java, false, false)
+
@Test
fun testDenyCalendarDuringReview() {
startAppActivityAndAssertResultCode(Activity.RESULT_OK) {
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionTest30.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionTest30.kt
index 345f543..2e501d5 100644
--- a/tests/tests/permission3/src/android/permission3/cts/PermissionTest30.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionTest30.kt
@@ -30,6 +30,8 @@
@Test
fun testCantRequestFgAndBgAtOnce() {
+ // TODO(b/280542662): This delay is a temporary mitigation for an intermittent failure
+ Thread.sleep(500)
installPackage(APP_APK_PATH_30_WITH_BACKGROUND)
assertAppHasPermission(ACCESS_FINE_LOCATION, false)
assertAppHasPermission(ACCESS_BACKGROUND_LOCATION, false)
