Merge "Add VCN UT to mts-tethering" into main (eaf4cbf0) · Commits · e / os / android_frameworks_base

tests/vcn/Android.bp

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,13 +16,19 @@ android_test {
	name: "FrameworksVcnTests",		name: "FrameworksVcnTests",
	// For access hidden connectivity methods in tests		// For access hidden connectivity methods in tests
	defaults: ["framework-connectivity-test-defaults"],		defaults: ["framework-connectivity-test-defaults"],

			// TODO: b/374174952 Use 36 after Android B finalization
			min_sdk_version: "35",

	srcs: [		srcs: [
	"java/*/.java",		"java/*/.java",
	"java/*/.kt",		"java/*/.kt",
	],		],
	platform_apis: true,		platform_apis: true,
	test_suites: ["device-tests"],		test_suites: [
	certificate: "platform",		"general-tests",
			"mts-tethering",
			],
	static_libs: [		static_libs: [
	"android.net.vcn.flags-aconfig-java-export",		"android.net.vcn.flags-aconfig-java-export",
	"androidx.test.rules",		"androidx.test.rules",

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,8 +16,9 @@

	<manifest xmlns:android="http://schemas.android.com/apk/res/android"		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
	package="com.android.frameworks.tests.vcn">		package="com.android.frameworks.tests.vcn">
	<uses-sdk android:minSdkVersion="33"		<!-- TODO: b/374174952 Use 36 after Android B finalization -->
	android:targetSdkVersion="33"/>		<uses-sdk android:minSdkVersion="35" android:targetSdkVersion="35" />

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

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,12 +14,20 @@
	limitations under the License.		limitations under the License.
	-->		-->
	<configuration description="Runs VCN Tests.">		<configuration description="Runs VCN Tests.">
	<target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">		<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
			<option name="cleanup-apks" value="true" />
	<option name="test-file-name" value="FrameworksVcnTests.apk" />		<option name="test-file-name" value="FrameworksVcnTests.apk" />
	</target_preparer>		</target_preparer>

	<option name="test-suite-tag" value="apct" />		<option name="test-suite-tag" value="apct" />
	<option name="test-tag" value="FrameworksVcnTests" />		<option name="test-tag" value="FrameworksVcnTests" />

			<!-- 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>

	<test class="com.android.tradefed.testtype.AndroidJUnitTest" >		<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
	<option name="package" value="com.android.frameworks.tests.vcn" />		<option name="package" value="com.android.frameworks.tests.vcn" />
	<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />		<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,11 +23,24 @@ import static org.junit.Assert.assertEquals;
	import static org.junit.Assert.assertNotEquals;		import static org.junit.Assert.assertNotEquals;
	import static org.junit.Assert.fail;		import static org.junit.Assert.fail;

			import android.os.Build;

			import androidx.test.filters.SmallTest;

			import com.android.testutils.DevSdkIgnoreRule;
			import com.android.testutils.DevSdkIgnoreRunner;

	import org.junit.Test;		import org.junit.Test;
			import org.junit.runner.RunWith;

	import java.util.HashSet;		import java.util.HashSet;
	import java.util.Set;		import java.util.Set;

			// TODO: b/374174952 After B finalization, use Sdk36ModuleController to ensure VCN tests only run on
			// Android B/B+
			@RunWith(DevSdkIgnoreRunner.class)
			@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.VANILLA_ICE_CREAM)
			@SmallTest
	public class VcnCellUnderlyingNetworkTemplateTest extends VcnUnderlyingNetworkTemplateTestBase {		public class VcnCellUnderlyingNetworkTemplateTest extends VcnUnderlyingNetworkTemplateTestBase {
	private static final Set<String> ALLOWED_PLMN_IDS = new HashSet<>();		private static final Set<String> ALLOWED_PLMN_IDS = new HashSet<>();
	private static final Set<Integer> ALLOWED_CARRIER_IDS = new HashSet<>();		private static final Set<Integer> ALLOWED_CARRIER_IDS = new HashSet<>();

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,11 +29,14 @@ import static org.mockito.Mockito.mock;

	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.content.Context;		import android.content.Context;
			import android.os.Build;
	import android.os.Parcel;		import android.os.Parcel;
	import android.util.ArraySet;		import android.util.ArraySet;

	import androidx.test.filters.SmallTest;		import androidx.test.filters.SmallTest;
	import androidx.test.runner.AndroidJUnit4;
			import com.android.testutils.DevSdkIgnoreRule;
			import com.android.testutils.DevSdkIgnoreRunner;

	import org.junit.Before;		import org.junit.Before;
	import org.junit.Test;		import org.junit.Test;
	@@ -42,7 +45,10 @@ import org.junit.runner.RunWith;
	import java.util.Collections;		import java.util.Collections;
	import java.util.Set;		import java.util.Set;

	@RunWith(AndroidJUnit4.class)		// TODO: b/374174952 After B finalization, use Sdk36ModuleController to ensure VCN tests only run on
			// Android B/B+
			@RunWith(DevSdkIgnoreRunner.class)
			@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.VANILLA_ICE_CREAM)
	@SmallTest		@SmallTest
	public class VcnConfigTest {		public class VcnConfigTest {
	private static final String TEST_PACKAGE_NAME = VcnConfigTest.class.getPackage().getName();		private static final String TEST_PACKAGE_NAME = VcnConfigTest.class.getPackage().getName();