From ff5da97ac63ce8742047c5198491b61b0eb709eb Mon Sep 17 00:00:00 2001
From: Fiona Campbell <flc@google.com>
Date: Mon, 17 Jul 2023 13:27:31 +0000
Subject: [PATCH] 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
---
 services/tests/powerservicetests/Android.bp     |  6 ++++++
 .../tests/powerservicetests/AndroidManifest.xml | 17 +++++++++++++----
 .../power/LowPowerStandbyControllerTest.java    |  0
 .../com/android/server/power/NotifierTest.java  |  0
 .../android/server/power/PowerGroupTest.java    |  0
 .../server/power/PowerManagerServiceTest.java   |  0
 .../server/power/ShutdownCheckPointsTest.java   |  0
 .../server/power/ShutdownThreadTest.java        |  0
 .../android/server/power/WakeLockLogTest.java   |  0
 9 files changed, 19 insertions(+), 4 deletions(-)
 rename services/tests/{servicestests => powerservicetests}/src/com/android/server/power/LowPowerStandbyControllerTest.java (100%)
 rename services/tests/{servicestests => powerservicetests}/src/com/android/server/power/NotifierTest.java (100%)
 rename services/tests/{servicestests => powerservicetests}/src/com/android/server/power/PowerGroupTest.java (100%)
 rename services/tests/{servicestests => powerservicetests}/src/com/android/server/power/PowerManagerServiceTest.java (100%)
 rename services/tests/{servicestests => powerservicetests}/src/com/android/server/power/ShutdownCheckPointsTest.java (100%)
 rename services/tests/{servicestests => powerservicetests}/src/com/android/server/power/ShutdownThreadTest.java (100%)
 rename services/tests/{servicestests => powerservicetests}/src/com/android/server/power/WakeLockLogTest.java (100%)

diff --git a/services/tests/powerservicetests/Android.bp b/services/tests/powerservicetests/Android.bp
index 236f90c0c3e55..f6714a8615c3b 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 3ace9d512adcf..26d9eec21fb1b 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
similarity index 100%
rename from services/tests/servicestests/src/com/android/server/power/LowPowerStandbyControllerTest.java
rename to 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
similarity index 100%
rename from services/tests/servicestests/src/com/android/server/power/NotifierTest.java
rename to 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
similarity index 100%
rename from services/tests/servicestests/src/com/android/server/power/PowerGroupTest.java
rename to 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
similarity index 100%
rename from services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java
rename to 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
similarity index 100%
rename from services/tests/servicestests/src/com/android/server/power/ShutdownCheckPointsTest.java
rename to 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
similarity index 100%
rename from services/tests/servicestests/src/com/android/server/power/ShutdownThreadTest.java
rename to 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
similarity index 100%
rename from services/tests/servicestests/src/com/android/server/power/WakeLockLogTest.java
rename to services/tests/powerservicetests/src/com/android/server/power/WakeLockLogTest.java