Merge "Add TetheringCoverageTests" into rvc-dev (82a29a33) · Commits · e / os / android_frameworks_base

packages/Tethering/tests/integration/Android.bp

+47 −9

Original line number	Diff line number	Diff line
		@@ -13,19 +13,12 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.
		//

		android_test {
		name: "TetheringIntegrationTests",
		certificate: "platform",
		platform_apis: true,
		java_defaults {
		name: "TetheringIntegrationTestsDefaults",
		srcs: [
		"src/*/.java",
		"src/*/.kt",
		],
		test_suites: [
		"device-tests",
		"mts",
		],
		static_libs: [
		"NetworkStackApiStableLib",
		"androidx.test.rules",
		@@ -44,4 +37,49 @@ android_test {
		"libdexmakerjvmtiagent",
		"libstaticjvmtiagent",
		],
		jarjar_rules: ":NetworkStackJarJarRules",
		}

		android_library {
		name: "TetheringIntegrationTestsLib",
		platform_apis: true,
		defaults: ["TetheringIntegrationTestsDefaults"],
		visibility: ["//cts/tests/tests/tethering"]
		}

		android_test {
		name: "TetheringIntegrationTests",
		platform_apis: true,
		defaults: ["TetheringIntegrationTestsDefaults"],
		test_suites: [
		"device-tests",
		"mts",
		],
		compile_multilib: "both",
		}

		// Special version of the tethering tests that includes all tests necessary for code coverage
		// purposes. This is currently the union of TetheringTests, TetheringIntegrationTests and
		// NetworkStackTests.
		android_test {
		name: "TetheringCoverageTests",
		certificate: "platform",
		platform_apis: true,
		test_suites: ["device-tests", "mts"],
		test_config: "AndroidTest_Coverage.xml",
		defaults: ["libnetworkstackutilsjni_deps"],
		static_libs: [
		"NetworkStackTestsLib",
		"TetheringTestsLib",
		"TetheringIntegrationTestsLib",
		],
		jni_libs: [
		// For mockito extended
		"libdexmakerjvmtiagent",
		"libstaticjvmtiagent",
		// For NetworkStackUtils included in NetworkStackBase
		"libnetworkstackutilsjni",
		],
		compile_multilib: "both",
		manifest: "AndroidManifest_coverage.xml",
		}
		No newline at end of file

packages/Tethering/tests/integration/AndroidManifest.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package="com.android.networkstack.tethering.tests.integration">

		<uses-permission android:name="android.permission.INTERNET"/>
		<uses-permission android:name="android.permission.TETHER_PRIVILEGED"/>

		<application android:debuggable="true">
		<uses-library android:name="android.test.runner" />

packages/Tethering/tests/integration/AndroidManifest_coverage.xml

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2020 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"
		xmlns:tools="http://schemas.android.com/tools"
		package="com.android.networkstack.tethering.tests.coverage">

		<application tools:replace="android:label"
		android:debuggable="true"
		android:label="Tethering coverage tests">
		<uses-library android:name="android.test.runner" />
		</application>
		<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
		android:targetPackage="com.android.networkstack.tethering.tests.coverage"
		android:label="Tethering coverage tests">
		</instrumentation>
		</manifest>

packages/Tethering/tests/integration/AndroidTest_Coverage.xml

0 → 100644

+12 −0

Original line number	Diff line number	Diff line
		<configuration description="Runs coverage tests for Tethering">
		<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
		<option name="test-file-name" value="TetheringCoverageTests.apk" />
		</target_preparer>

		<option name="test-tag" value="TetheringCoverageTests" />
		<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
		<option name="package" value="com.android.networkstack.tethering.tests.coverage" />
		<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
		<option name="hidden-api-checks" value="false"/>
		</test>
		</configuration>
		No newline at end of file

packages/Tethering/tests/integration/src/android/net/EthernetTetheringTest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.net;

		import static android.Manifest.permission.MANAGE_TEST_NETWORKS;
		import static android.Manifest.permission.NETWORK_SETTINGS;
		import static android.Manifest.permission.TETHER_PRIVILEGED;
		import static android.net.TetheringManager.TETHERING_ETHERNET;

		import static org.junit.Assert.assertEquals;
		@@ -109,7 +110,8 @@ public class EthernetTetheringTest {
		mTetheredInterfaceRequester = new TetheredInterfaceRequester(mHandler, mEm);
		// Needed to create a TestNetworkInterface, to call requestTetheredInterface, and to receive
		// tethered client callbacks.
		mUiAutomation.adoptShellPermissionIdentity(MANAGE_TEST_NETWORKS, NETWORK_SETTINGS);
		mUiAutomation.adoptShellPermissionIdentity(
		MANAGE_TEST_NETWORKS, NETWORK_SETTINGS, TETHER_PRIVILEGED);
		}

		private void cleanUp() throws Exception {