commit c5ff86610a7474854a7e372a7c7d4efe6fee2394
author Fiona Campbell <flc@google.com> Thu Jun 22 16:21:50 2023 +0000
committer Fiona Campbell <flc@google.com> Tue Jun 27 11:43:45 2023 +0000
tree c14b0095d7531ba481ad3485bc9742430a8c7c88
parent b6629a268677f2a018c763927e72a2f103f8032c

Move display tests to DisplayServiceTests module

Migrate tests.
Add dependencies to build files.
Add permissions to manifest.

Additionally, LogicalDisplayTest#testDisplayInputFlags() has been marked
as @Ignore, with a TODO, and will be fixed in followup bug: 288880734

Also used the opportunity to correctly format the indentation in &
change some other minor aesthetic & style guide corrections in:
AmbientBrightnessStatsTrackerTest
AmbientLuxTest
BrightnessMappingStrategyTest
BrightnessThrottlerTest
BrightnessTrackerTest
ColorDisplayServiceTest
HighBrightnessModeControllerTest
PersistentDataStoreTest

Bug: 286043820
Test: atest DisplayServiceTests
Change-Id: Ib5235bcd184d35a7efec922606d4566b839d4a74

services/tests/displayservicetests/Android.bp

diff --git a/services/tests/displayservicetests/Android.bp b/services/tests/displayservicetests/Android.bp
index b242ec2..f1ff338 100644
--- a/services/tests/displayservicetests/Android.bp
+++ b/services/tests/displayservicetests/Android.bp
@@ -22,11 +22,20 @@
         "src/**/*.java",
     ],
 
+    libs: [
+        "android.test.mock",
+    ],
+
     static_libs: [
-        "services.core",
-        "androidx.test.runner",
-        "androidx.test.rules",
+        "androidx.test.ext.junit",
+        "display-core-libs",
+        "frameworks-base-testutils",
+        "junit",
+        "junit-params",
+        "platform-compat-test-rules",
         "platform-test-annotations",
+        "services.core",
+        "servicestests-utils",
     ],
 
     defaults: [
@@ -47,3 +56,10 @@
         enabled: false,
     },
 }
+
+java_library {
+    name: "display-core-libs",
+    srcs: [
+        "src/com/android/server/display/TestUtils.java",
+    ],
+}