Add vibrator service test mapping to source folder

Move TEST_MAPPING for FrameworksVibratorServicesTests to the
source code at services/core/java/com/android/server/vibrator.

This ensures that any changes in this source folder will also trigger
FrameworksVibratorServicesTests.

Uodate TEST_MAPPING at the test folder to import the new one, since
changes in test files should also trigger the tests.

This change also removes AndroidTest.xml, since it can use the
auto-generated one.

Test: atest --test-mapping \
       services/core/java/com/android/server/vibrator:presubmit
Bug: 290745798
Change-Id: I664f952035379000aedfa0a0339f3d0b8f2c16e0
This commit is contained in:
Lais Andrade
2023-07-18 12:51:28 +01:00
parent 65fbba601d
commit 1cde7070db
4 changed files with 24 additions and 52 deletions

View File

@@ -0,0 +1,21 @@
{
"presubmit": [
{
"name": "FrameworksVibratorServicesTests",
"options": [
{"exclude-annotation": "android.platform.test.annotations.LargeTest"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"},
{"exclude-annotation": "org.junit.Ignore"}
]
}
],
"postsubmit": [
{
"name": "FrameworksVibratorServicesTests",
"options": [
{"exclude-annotation": "org.junit.Ignore"}
]
}
]
}

View File

@@ -31,8 +31,7 @@
<!-- Required to set always-on vibrations -->
<uses-permission android:name="android.permission.VIBRATE_ALWAYS_ON" />
<application android:debuggable="true"
android:testOnly="true">
<application android:debuggable="true">
<uses-library android:name="android.test.mock" android:required="true" />
<uses-library android:name="android.test.runner" />
</application>

View File

@@ -1,34 +0,0 @@
<?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 Frameworks Vibrator Services 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="FrameworksVibratorServicesTests.apk" />
</target_preparer>
<option name="test-tag" value="FrameworksVibratorServicesTests" />
<test class="com.android.tradefed.testtype.AndroidJUnitTest">
<option name="package" value="com.android.framework.services.tests.vibrator" />
<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
<option name="hidden-api-checks" value="false" />
</test>
</configuration>

View File

@@ -1,21 +1,7 @@
{
"presubmit": [
"imports": [
{
"name": "FrameworksVibratorServicesTests",
"options": [
{"exclude-annotation": "android.platform.test.annotations.LargeTest"},
{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
{"exclude-annotation": "androidx.test.filters.FlakyTest"},
{"exclude-annotation": "org.junit.Ignore"}
]
}
],
"postsubmit": [
{
"name": "FrameworksVibratorServicesTests",
"options": [
{"exclude-annotation": "org.junit.Ignore"}
]
"path": "frameworks/base/services/core/java/com/android/server/vibrator"
}
]
}