From 3a0ce1930fabf2c9ab4510849553753453ea744c Mon Sep 17 00:00:00 2001 From: Marvin Ramin Date: Tue, 4 Mar 2025 14:46:15 +0100 Subject: Move MediaProjectionStoppingTest to internal instrumentation tests Bug: 400932931 Test: atest MediaProjectionStoppingTest Flag: TEST_ONLY Change-Id: I7df5bb1426c7f1f58b89d1704d03c25d14606a1f --- media/tests/projection/Android.bp | 8 +- media/tests/projection/AndroidManifest.xml | 2 + media/tests/projection/AndroidTest.xml | 9 + .../projection/MediaProjectionStoppingTest.java | 293 +++++++++++++++++++++ 4 files changed, 310 insertions(+), 2 deletions(-) create mode 100644 media/tests/projection/src/android/media/projection/MediaProjectionStoppingTest.java (limited to 'media/tests') diff --git a/media/tests/projection/Android.bp b/media/tests/projection/Android.bp index 94db2c02eb28..48621e4e2094 100644 --- a/media/tests/projection/Android.bp +++ b/media/tests/projection/Android.bp @@ -16,7 +16,6 @@ android_test { name: "MediaProjectionTests", srcs: ["**/*.java"], - libs: [ "android.test.base.stubs.system", "android.test.mock.stubs.system", @@ -30,6 +29,7 @@ android_test { "frameworks-base-testutils", "mockito-target-extended-minus-junit4", "platform-test-annotations", + "cts-mediaprojection-common", "testng", "testables", "truth", @@ -42,7 +42,11 @@ android_test { "libstaticjvmtiagent", ], - test_suites: ["device-tests"], + data: [ + ":CtsMediaProjectionTestCasesHelperApp", + ], + + test_suites: ["general-tests"], platform_apis: true, diff --git a/media/tests/projection/AndroidManifest.xml b/media/tests/projection/AndroidManifest.xml index 0c9760400ce0..514fb5f689c9 100644 --- a/media/tests/projection/AndroidManifest.xml +++ b/media/tests/projection/AndroidManifest.xml @@ -20,6 +20,8 @@ android:sharedUserId="com.android.uid.test"> + + diff --git a/media/tests/projection/AndroidTest.xml b/media/tests/projection/AndroidTest.xml index f64930a0eb3f..99b42d1cd263 100644 --- a/media/tests/projection/AndroidTest.xml +++ b/media/tests/projection/AndroidTest.xml @@ -22,6 +22,15 @@