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

Commit 915abab4 authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Use Sdk36ModuleController to ensure VCN UT is only updated on B/B+" into main am: 8fbdf7c8 

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



Change-Id: Icdbf105783f4a4840c7e2182ca04cd549d26704a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8489f89c 8fbdf7c8

tests/vcn/Android.bp

+1 −3
Original line number Original line Diff line number Diff line
@@ -17,9 +17,7 @@ android_test { 
    // For access hidden connectivity methods in tests

    // For access hidden connectivity methods in tests

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

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





    // Tethering module is released in R so this test needs to be installable

    min_sdk_version: "36",

    // on R

    min_sdk_version: "30",





    srcs: [

    srcs: [

        "java/**/*.java",

        "java/**/*.java",

tests/vcn/AndroidManifest.xml

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




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

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



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

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





    <application>

    <application>

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

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

tests/vcn/AndroidTest.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ 
            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="mainline-module-package-name" value="com.google.android.tethering" />

        <option name="mainline-module-package-name" value="com.google.android.tethering" />

    </object>

    </object>

    <object type="module_controller"

            class="com.android.tradefed.testtype.suite.module.Sdk36ModuleController" />





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

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

+2 −9
Original line number Original line Diff line number Diff line
@@ -23,12 +23,8 @@ 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 androidx.test.filters.SmallTest;



import androidx.test.runner.AndroidJUnit4;

import com.android.testutils.DevSdkIgnoreRule;

import com.android.testutils.DevSdkIgnoreRunner;





import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;
@@ -36,10 +32,7 @@ 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

@RunWith(AndroidJUnit4.class)

// Android B/B+

@RunWith(DevSdkIgnoreRunner.class)

@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.VANILLA_ICE_CREAM)

@SmallTest

@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<>();

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

+2 −8
Original line number Original line Diff line number Diff line
@@ -29,14 +29,11 @@ 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;
@@ -45,10 +42,7 @@ import org.junit.runner.RunWith; 
import java.util.Collections;

import java.util.Collections;

import java.util.Set;

import java.util.Set;





// TODO: b/374174952 After B finalization, use Sdk36ModuleController to ensure VCN tests only run on

@RunWith(AndroidJUnit4.class)

// 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();