commit d790d2dbf5f9ba874bb48ce0414a76a98cc57ae7
author Fiona Campbell <flc@google.com> Mon Jul 10 10:42:46 2023 +0000
committer Fiona Campbell <flc@google.com> Mon Jul 17 14:42:39 2023 +0000
tree 39561b03eae9b9a3c212389f497eb872f7c82c2b
parent 47d380ee2c8749eb3453d6cf555e7a05127cb796

Move display mocking tests to DisplayServiceTests

- Move remaining display tests to new module
- Add necessary permissions

Bug: 286043820
Test: atest DisplayServiceTests
Change-Id: I242371f84185b1f770554a5ae0fbab6ed287a86f
(cherry picked from commit eeb677c9d5804dd99bc4eae11c06b170ce8767af)
Merged-In: I242371f84185b1f770554a5ae0fbab6ed287a86f

services/tests/displayservicetests/Android.bp

diff --git a/services/tests/displayservicetests/Android.bp b/services/tests/displayservicetests/Android.bp
index f1ff338..4f555d9 100644
--- a/services/tests/displayservicetests/Android.bp
+++ b/services/tests/displayservicetests/Android.bp
@@ -28,14 +28,15 @@
 
     static_libs: [
         "androidx.test.ext.junit",
-        "display-core-libs",
         "frameworks-base-testutils",
         "junit",
         "junit-params",
+        "mockingservicestests-utils-mockito",
         "platform-compat-test-rules",
         "platform-test-annotations",
         "services.core",
         "servicestests-utils",
+        "testables",
     ],
 
     defaults: [
@@ -56,10 +57,3 @@
         enabled: false,
     },
 }
-
-java_library {
-    name: "display-core-libs",
-    srcs: [
-        "src/com/android/server/display/TestUtils.java",
-    ],
-}