Move tests for frameworks-base-testutils lib into their own target
The test modules that include these util classes are running the util tests as well, because they're in the same java library. This change separates the util classes from their tests, with a new separate test mapping. Fix: 292212651 Test: atest frameworks-base-testutils-tests Change-Id: Ic8309a303307457e0e642370bc2a0a0335e4e8f6
This commit is contained in:
32
tests/utils/testutils/TEST_MAPPING
Normal file
32
tests/utils/testutils/TEST_MAPPING
Normal file
@@ -0,0 +1,32 @@
|
||||
{
|
||||
"presubmit": [
|
||||
{
|
||||
"name": "frameworks-base-testutils-tests",
|
||||
"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": "frameworks-base-testutils-tests",
|
||||
"options": [
|
||||
{
|
||||
"exclude-annotation": "org.junit.Ignore"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
47
tests/utils/testutils/tests/Android.bp
Normal file
47
tests/utils/testutils/tests/Android.bp
Normal file
@@ -0,0 +1,47 @@
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
|
||||
package {
|
||||
default_applicable_licenses: ["frameworks_base_license"],
|
||||
}
|
||||
|
||||
android_test {
|
||||
name: "frameworks-base-testutils-tests",
|
||||
|
||||
srcs: [
|
||||
"src/**/*.java",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"junit",
|
||||
"hamcrest-library",
|
||||
"androidx.test.runner",
|
||||
"mockito-target-minus-junit4",
|
||||
"frameworks-base-testutils",
|
||||
],
|
||||
|
||||
libs: [
|
||||
"android.test.runner",
|
||||
"android.test.base",
|
||||
"android.test.mock",
|
||||
],
|
||||
|
||||
certificate: "platform",
|
||||
test_suites: [
|
||||
"device-tests",
|
||||
"automotive-tests",
|
||||
],
|
||||
}
|
||||
29
tests/utils/testutils/tests/AndroidManifest.xml
Normal file
29
tests/utils/testutils/tests/AndroidManifest.xml
Normal file
@@ -0,0 +1,29 @@
|
||||
<?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.frameworks.tests.utils.testutils.tests">
|
||||
|
||||
<application>
|
||||
<uses-library android:name="android.test.runner"/>
|
||||
</application>
|
||||
|
||||
<instrumentation
|
||||
android:name="androidx.test.runner.AndroidJUnitRunner"
|
||||
android:targetPackage="com.frameworks.tests.utils.testutils.tests"
|
||||
android:label="Test Utils Tests"/>
|
||||
</manifest>
|
||||
Reference in New Issue
Block a user