Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9745f08c authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Add VCN UT to mts-tethering" into main am: eaf4cbf0 am: 3b946c39 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3486622



Change-Id: Id655a474c81c83fabffcd82b2716a50f3e803dda
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8b078dc8 3b946c39

tests/vcn/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -16,13 +16,19 @@ android_test { 
    name: "FrameworksVcnTests",

    // For access hidden connectivity methods in tests

    defaults: ["framework-connectivity-test-defaults"],



    // TODO: b/374174952 Use 36 after Android B finalization

    min_sdk_version: "35",



    srcs: [

        "java/**/*.java",

        "java/**/*.kt",

    ],

    platform_apis: true,

    test_suites: ["device-tests"],

    certificate: "platform",

    test_suites: [

        "general-tests",

        "mts-tethering",

    ],

    static_libs: [

        "android.net.vcn.flags-aconfig-java-export",

        "androidx.test.rules",

tests/vcn/AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 


<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.frameworks.tests.vcn">

    <uses-sdk android:minSdkVersion="33"

        android:targetSdkVersion="33"/>

    <!-- TODO: b/374174952 Use 36 after Android B finalization -->

    <uses-sdk android:minSdkVersion="35" android:targetSdkVersion="35" />



    <application>

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

    </application>

tests/vcn/AndroidTest.xml

+9 −1
Original line number Diff line number Diff line
@@ -14,12 +14,20 @@ 
     limitations under the License.

-->

<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" />

    </target_preparer>



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

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

        <option name="package" value="com.android.frameworks.tests.vcn" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

tests/vcn/java/android/net/vcn/VcnCellUnderlyingNetworkTemplateTest.java

+13 −0
Original line number 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.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.runner.RunWith;



import java.util.HashSet;

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 {

    private static final Set<String> ALLOWED_PLMN_IDS = new HashSet<>();

    private static final Set<Integer> ALLOWED_CARRIER_IDS = new HashSet<>();

tests/vcn/java/android/net/vcn/VcnConfigTest.java

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


import android.annotation.NonNull;

import android.content.Context;

import android.os.Build;

import android.os.Parcel;

import android.util.ArraySet;



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.Test;
@@ -42,7 +45,10 @@ import org.junit.runner.RunWith; 
import java.util.Collections;

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

public class VcnConfigTest {

    private static final String TEST_PACKAGE_NAME = VcnConfigTest.class.getPackage().getName();