Add ThreadNetworkTestCases.apk to run thread CTS
Drop CTS from android-mcts-tethering.zip in aml-frc-release branch.
Build: T1010062 (frc_350712000)
The AndroidTest.xml makes sure only device that declares
android.hardware.thread_network will run this test. Otherwise, the test
will be skipped completely.
Bug: 346980572
Test: Run on U devices with/without ThreadNetwork
Change-Id: Ib41e70e2c6ae0491dde8e08009af533b25980be2
diff --git a/thread/tests/cts/Android.bp b/thread/tests/cts/Android.bp
new file mode 100644
index 0000000..9edbd8b
--- /dev/null
+++ b/thread/tests/cts/Android.bp
@@ -0,0 +1,31 @@
+//
+// 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.
+//
+
+android_test_import {
+ name: "CtsThreadNetworkTestCases",
+ apk: "CtsThreadNetworkTestCases.apk",
+
+ test_suites: [
+ "cts",
+ "general-tests",
+ ],
+
+ presigned: true,
+ dex_preopt: {
+ enabled: false,
+ },
+}
+
diff --git a/thread/tests/cts/AndroidTest.xml b/thread/tests/cts/AndroidTest.xml
new file mode 100644
index 0000000..6eda1e9
--- /dev/null
+++ b/thread/tests/cts/AndroidTest.xml
@@ -0,0 +1,58 @@
+<?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="Config for Thread network CTS test cases">
+ <option name="test-tag" value="CtsThreadNetworkTestCases" />
+ <option name="test-suite-tag" value="cts" />
+ <option name="config-descriptor:metadata" key="component" value="framework" />
+ <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+ <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+ <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+ <!--
+ Only run tests if the device under test is SDK version 33 (Android 13) or above.
+ The Thread feature is only available on V+ and U+ TV devices but this test module
+ needs run on T+ because there are testcases which verifies that Thread service
+ is not support on T or T-.
+ -->
+ <object type="module_controller"
+ class="com.android.tradefed.testtype.suite.module.Sdk33ModuleController" />
+
+ <!-- Run tests in MTS only if the Tethering Mainline module is installed. -->
+ <object type="module_controller"
+ class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+ <option name="mainline-module-package-name" value="com.google.android.tethering" />
+ </object>
+
+ <object type="module_controller"
+ class="com.android.tradefed.testtype.suite.module.DeviceFeatureModuleController">
+ <option name="required-feature" value="android.hardware.thread_network" />
+ </object>
+
+ <!-- Install test -->
+ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+ <option name="test-file-name" value="CtsThreadNetworkTestCases.apk" />
+ <option name="check-min-sdk" value="true" />
+ <option name="cleanup-apks" value="true" />
+ </target_preparer>
+
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="package" value="android.net.thread.cts" />
+ <!-- Ignores tests introduced by guava-android-testlib -->
+ <option name="exclude-annotation" value="org.junit.Ignore"/>
+ </test>
+</configuration>
diff --git a/thread/tests/cts/CtsThreadNetworkTestCases.apk b/thread/tests/cts/CtsThreadNetworkTestCases.apk
new file mode 100755
index 0000000..ef9d615
--- /dev/null
+++ b/thread/tests/cts/CtsThreadNetworkTestCases.apk
Binary files differ
diff --git a/thread/tests/cts/METADATA b/thread/tests/cts/METADATA
new file mode 100644
index 0000000..08c9e81
--- /dev/null
+++ b/thread/tests/cts/METADATA
@@ -0,0 +1,17 @@
+name: "CtsThreadNetworkTestCases"
+description: "Prebuilt of CtsThreadNetworkTestCases"
+third_party {
+ identifier {
+ type: "Git"
+ value: "https://android.googlesource.com/platform/packages/modules/Connectivity/"
+ version: "frc_350712000"
+ }
+ version: "15"
+ license_type: NOTICE
+ license_note: "None"
+ last_upgrade_date {
+ year: 2024
+ month: 5
+ day: 25
+ }
+}