Merge "Add vibrator service test mapping to source folder" into main (a7d8d2c6) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/vibrator/TEST_MAPPING

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		{
		"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"}
		]
		}
		]
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -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>

deleted100644 → 0

+0 −34

Original line number	Diff line number	Diff line
		<?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>

+2 −16

Original line number	Diff line number	Diff line
		{
		"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"
		}
		]
		}