From a8a4daffece71d4d034bea820e30c0b9c3a22bf5 Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Wed, 21 Jun 2023 14:36:01 +0000 Subject: [PATCH] Set Up DisplayServiceTests Create DisplayServiceTests build files Bug: 286043820 Test: atest DisplayServiceTests Change-Id: I5ef4f0784a23be75002fb0023c12dbef5224621d --- services/tests/displayservicetests/Android.bp | 49 +++++++++++++++++++ .../displayservicetests/AndroidManifest.xml | 35 +++++++++++++ .../tests/displayservicetests/AndroidTest.xml | 32 ++++++++++++ .../tests/displayservicetests/TEST_MAPPING | 13 +++++ .../src/com/android/server/display/OWNERS | 1 + 5 files changed, 130 insertions(+) create mode 100644 services/tests/displayservicetests/Android.bp create mode 100644 services/tests/displayservicetests/AndroidManifest.xml create mode 100644 services/tests/displayservicetests/AndroidTest.xml create mode 100644 services/tests/displayservicetests/TEST_MAPPING create mode 100644 services/tests/displayservicetests/src/com/android/server/display/OWNERS diff --git a/services/tests/displayservicetests/Android.bp b/services/tests/displayservicetests/Android.bp new file mode 100644 index 0000000000000..b242ec2db4205 --- /dev/null +++ b/services/tests/displayservicetests/Android.bp @@ -0,0 +1,49 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_base_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_license"], +} + +// Include all test java files. +filegroup { + name: "displayservicetests-sources", + srcs: [ + "src/**/*.java", + ], +} + +android_test { + name: "DisplayServiceTests", + + srcs: [ + "src/**/*.java", + ], + + static_libs: [ + "services.core", + "androidx.test.runner", + "androidx.test.rules", + "platform-test-annotations", + ], + + defaults: [ + "modules-utils-testable-device-config-defaults", + ], + + platform_apis: true, + test_suites: [ + "device-tests", + "automotive-tests", + ], + + certificate: "platform", + + dxflags: ["--multi-dex"], + + optimize: { + enabled: false, + }, +} diff --git a/services/tests/displayservicetests/AndroidManifest.xml b/services/tests/displayservicetests/AndroidManifest.xml new file mode 100644 index 0000000000000..c2e417429eac5 --- /dev/null +++ b/services/tests/displayservicetests/AndroidManifest.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + diff --git a/services/tests/displayservicetests/AndroidTest.xml b/services/tests/displayservicetests/AndroidTest.xml new file mode 100644 index 0000000000000..2985f98417dfb --- /dev/null +++ b/services/tests/displayservicetests/AndroidTest.xml @@ -0,0 +1,32 @@ + + + + + diff --git a/services/tests/displayservicetests/TEST_MAPPING b/services/tests/displayservicetests/TEST_MAPPING new file mode 100644 index 0000000000000..d8655194ab0f1 --- /dev/null +++ b/services/tests/displayservicetests/TEST_MAPPING @@ -0,0 +1,13 @@ +{ + "presubmit": [ + { + "name": "DisplayServiceTests", + "options": [ + {"include-filter": "com.android.server.display"}, + {"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, + {"exclude-annotation": "androidx.test.filters.FlakyTest"}, + {"exclude-annotation": "org.junit.Ignore"} + ] + } + ] +} diff --git a/services/tests/displayservicetests/src/com/android/server/display/OWNERS b/services/tests/displayservicetests/src/com/android/server/display/OWNERS new file mode 100644 index 0000000000000..6ce1ee4d3de28 --- /dev/null +++ b/services/tests/displayservicetests/src/com/android/server/display/OWNERS @@ -0,0 +1 @@ +include /services/core/java/com/android/server/display/OWNERS