summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fiona Campbell <flc@google.com> 2023-07-17 13:27:31 +0000
committer Fiona Campbell <flc@google.com> 2023-07-17 17:01:16 +0000
commitff5da97ac63ce8742047c5198491b61b0eb709eb (patch)
tree9e9f52d6c89cd898b7b8bf47f0016c13af3bd03a
parent6df6883ad7b67e53bceea6b19fa6dbe59e77df76 (diff)
Migrate PowerManagerTests to PowerServiceTests
- Migrate power tests within servicestests/ to correct module - Add permissions and libraries needed for these tests. Bug: 290764236 Test: atest PowerServiceTests Change-Id: Ib63768225b39024153497d11cd4cb9bfef46617e
-rw-r--r--services/tests/powerservicetests/Android.bp6
-rw-r--r--services/tests/powerservicetests/AndroidManifest.xml17
-rw-r--r--services/tests/powerservicetests/src/com/android/server/power/LowPowerStandbyControllerTest.java (renamed from services/tests/servicestests/src/com/android/server/power/LowPowerStandbyControllerTest.java)0
-rw-r--r--services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java (renamed from services/tests/servicestests/src/com/android/server/power/NotifierTest.java)0
-rw-r--r--services/tests/powerservicetests/src/com/android/server/power/PowerGroupTest.java (renamed from services/tests/servicestests/src/com/android/server/power/PowerGroupTest.java)0
-rw-r--r--services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java (renamed from services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java)0
-rw-r--r--services/tests/powerservicetests/src/com/android/server/power/ShutdownCheckPointsTest.java (renamed from services/tests/servicestests/src/com/android/server/power/ShutdownCheckPointsTest.java)0
-rw-r--r--services/tests/powerservicetests/src/com/android/server/power/ShutdownThreadTest.java (renamed from services/tests/servicestests/src/com/android/server/power/ShutdownThreadTest.java)0
-rw-r--r--services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java (renamed from services/tests/servicestests/src/com/android/server/power/WakeLockLogTest.java)0
9 files changed, 19 insertions, 4 deletions
diff --git a/services/tests/powerservicetests/Android.bp b/services/tests/powerservicetests/Android.bp
index 236f90c0c3e5..f6714a8615c3 100644
--- a/services/tests/powerservicetests/Android.bp
+++ b/services/tests/powerservicetests/Android.bp
@@ -12,9 +12,15 @@ android_test {
static_libs: [
"frameworks-base-testutils",
+ "platform-compat-test-rules",
"platform-test-annotations",
"services.core",
"servicestests-utils",
+ "testables",
+ ],
+
+ libs: [
+ "android.test.mock",
],
platform_apis: true,
diff --git a/services/tests/powerservicetests/AndroidManifest.xml b/services/tests/powerservicetests/AndroidManifest.xml
index 3ace9d512adc..26d9eec21fb1 100644
--- a/services/tests/powerservicetests/AndroidManifest.xml
+++ b/services/tests/powerservicetests/AndroidManifest.xml
@@ -17,10 +17,19 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.frameworks.powerservicetests">
- <!--
- Insert permissions here. eg:
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
- -->
+ <!-- Permissions -->
+ <uses-permission android:name="android.permission.DEVICE_POWER"/>
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
+ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+ <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>
+ <uses-permission android:name="android.permission.READ_DREAM_STATE"/>
+ <uses-permission android:name="android.permission.READ_DREAM_SUPPRESSION"/>
+ <uses-permission android:name="android.permission.STATUS_BAR_SERVICE"/>
+ <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS"/>
+ <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS"/>
+ <uses-permission android:name="android.permission.WAKE_LOCK"/>
+ <uses-permission android:name="android.permission.WRITE_DREAM_STATE"/>
+
<application android:debuggable="true"
android:testOnly="true">
<uses-library android:name="android.test.mock" android:required="true" />
diff --git a/services/tests/servicestests/src/com/android/server/power/LowPowerStandbyControllerTest.java b/services/tests/powerservicetests/src/com/android/server/power/LowPowerStandbyControllerTest.java
index d3c0e354838b..d3c0e354838b 100644
--- a/services/tests/servicestests/src/com/android/server/power/LowPowerStandbyControllerTest.java
+++ b/services/tests/powerservicetests/src/com/android/server/power/LowPowerStandbyControllerTest.java
diff --git a/services/tests/servicestests/src/com/android/server/power/NotifierTest.java b/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java
index 2f039654ca7e..2f039654ca7e 100644
--- a/services/tests/servicestests/src/com/android/server/power/NotifierTest.java
+++ b/services/tests/powerservicetests/src/com/android/server/power/NotifierTest.java
diff --git a/services/tests/servicestests/src/com/android/server/power/PowerGroupTest.java b/services/tests/powerservicetests/src/com/android/server/power/PowerGroupTest.java
index fe31b9cbe558..fe31b9cbe558 100644
--- a/services/tests/servicestests/src/com/android/server/power/PowerGroupTest.java
+++ b/services/tests/powerservicetests/src/com/android/server/power/PowerGroupTest.java
diff --git a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java b/services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java
index c80ff45e7768..c80ff45e7768 100644
--- a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java
+++ b/services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java
diff --git a/services/tests/servicestests/src/com/android/server/power/ShutdownCheckPointsTest.java b/services/tests/powerservicetests/src/com/android/server/power/ShutdownCheckPointsTest.java
index fe6cc28f03d3..fe6cc28f03d3 100644
--- a/services/tests/servicestests/src/com/android/server/power/ShutdownCheckPointsTest.java
+++ b/services/tests/powerservicetests/src/com/android/server/power/ShutdownCheckPointsTest.java
diff --git a/services/tests/servicestests/src/com/android/server/power/ShutdownThreadTest.java b/services/tests/powerservicetests/src/com/android/server/power/ShutdownThreadTest.java
index 6041e916ffc0..6041e916ffc0 100644
--- a/services/tests/servicestests/src/com/android/server/power/ShutdownThreadTest.java
+++ b/services/tests/powerservicetests/src/com/android/server/power/ShutdownThreadTest.java
diff --git a/services/tests/servicestests/src/com/android/server/power/WakeLockLogTest.java b/services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java
index 7af4b3d87a3a..7af4b3d87a3a 100644
--- a/services/tests/servicestests/src/com/android/server/power/WakeLockLogTest.java
+++ b/services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java