diff options
5 files changed, 130 insertions, 0 deletions
diff --git a/services/tests/displayservicetests/Android.bp b/services/tests/displayservicetests/Android.bp new file mode 100644 index 000000000000..b242ec2db420 --- /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 000000000000..c2e417429eac --- /dev/null +++ b/services/tests/displayservicetests/AndroidManifest.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2023 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.frameworks.displayservicetests"> + + <!-- + Insert permissions here. eg: + <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> + --> + + <application android:debuggable="true" + android:testOnly="true"> + <uses-library android:name="android.test.mock" android:required="true" /> + <uses-library android:name="android.test.runner" /> + </application> + + <instrumentation + android:name="androidx.test.runner.AndroidJUnitRunner" + android:label="Display Service Tests" + android:targetPackage="com.android.frameworks.displayservicetests" /> +</manifest> diff --git a/services/tests/displayservicetests/AndroidTest.xml b/services/tests/displayservicetests/AndroidTest.xml new file mode 100644 index 000000000000..2985f98417df --- /dev/null +++ b/services/tests/displayservicetests/AndroidTest.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2023 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<configuration description="Runs Display Service Tests."> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-instrumentation" /> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> + <option name="cleanup-apks" value="true" /> + <option name="install-arg" value="-t" /> + <option name="test-file-name" value="DisplayServiceTests.apk" /> + </target_preparer> + + <option name="test-tag" value="DisplayServiceTests" /> + <test class="com.android.tradefed.testtype.AndroidJUnitTest"> + <option name="package" value="com.android.frameworks.displayservicetests" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> + <option name="hidden-api-checks" value="false" /> + </test> +</configuration> diff --git a/services/tests/displayservicetests/TEST_MAPPING b/services/tests/displayservicetests/TEST_MAPPING new file mode 100644 index 000000000000..d8655194ab0f --- /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 000000000000..6ce1ee4d3de2 --- /dev/null +++ b/services/tests/displayservicetests/src/com/android/server/display/OWNERS @@ -0,0 +1 @@ +include /services/core/java/com/android/server/display/OWNERS |