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

Commit 1208f44b authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Skip some VCN unit tests on user builds" into main am: 0384d352 am: cdecd618 

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



Change-Id: I2bf81f8b8155818b405efeb50cebda5c4759dff4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26528230 cdecd618

tests/vcn/java/com/android/server/VcnManagementServiceTest.java

+17 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import static org.junit.Assert.assertNotNull; 
import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;

import static org.junit.Assume.assumeTrue;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyInt;
@@ -1088,6 +1089,10 @@ public class VcnManagementServiceTest { 


    @Test

    public void testGetRestrictedTransportsFromCarrierConfig() {

        assumeTrue(

                "Configuring restricted transport types is only allowed on a debuggable build",

                Build.isDebuggable());



        final Set<Integer> restrictedTransports = new ArraySet<>();

        restrictedTransports.add(TRANSPORT_CELLULAR);

        restrictedTransports.add(TRANSPORT_WIFI);
@@ -1109,6 +1114,10 @@ public class VcnManagementServiceTest { 


    @Test

    public void testGetRestrictedTransportsFromCarrierConfig_noRestrictPolicyConfigured() {

        assumeTrue(

                "Configuring restricted transport types is only allowed on a debuggable build",

                Build.isDebuggable());



        final Set<Integer> restrictedTransports = Collections.singleton(TRANSPORT_WIFI);



        final PersistableBundleWrapper carrierConfig =
@@ -1123,6 +1132,10 @@ public class VcnManagementServiceTest { 


    @Test

    public void testGetRestrictedTransportsFromCarrierConfig_noCarrierConfig() {

        assumeTrue(

                "Configuring restricted transport types is only allowed on a debuggable build",

                Build.isDebuggable());



        final Set<Integer> restrictedTransports = Collections.singleton(TRANSPORT_WIFI);



        final TelephonySubscriptionSnapshot lastSnapshot =
@@ -1134,6 +1147,10 @@ public class VcnManagementServiceTest { 


    @Test

    public void testGetRestrictedTransportsFromCarrierConfigAndVcnConfig() {

        assumeTrue(

                "Configuring restricted transport types is only allowed on a debuggable build",

                Build.isDebuggable());



        // Configure restricted transport in CarrierConfig

        final Set<Integer> restrictedTransportInCarrierConfig =

                Collections.singleton(TRANSPORT_WIFI);