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

Commit d39dae37 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities"... 

Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" am: 392633f7 am: c9f08650 am: 20030057 am: 0a81dfc0

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

Change-Id: I83051032d59ad427b6b7d7ce9693b3e5534c618b
parents ed5ab3a9 0a81dfc0

packages/Connectivity/tests/common/java/android/net/NetworkCapabilitiesTest.java

+12 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN; 
import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PAID;

import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE;

import static android.net.NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY;

import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_WIFI_P2P;

import static android.net.NetworkCapabilities.REDACT_FOR_ACCESS_FINE_LOCATION;
@@ -1155,4 +1156,15 @@ public class NetworkCapabilitiesTest { 
            assertEquals(Set.of(TEST_SUBID1), nc2.getSubscriptionIds());

        }

    }



    @Test @IgnoreUpTo(Build.VERSION_CODES.R)

    public void testBuilderWithoutDefaultCap() {

        final NetworkCapabilities nc =

                NetworkCapabilities.Builder.withoutDefaultCapabilities().build();

        assertFalse(nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED));

        assertFalse(nc.hasCapability(NET_CAPABILITY_TRUSTED));

        assertFalse(nc.hasCapability(NET_CAPABILITY_NOT_VPN));

        // Ensure test case fails if new net cap is added into default cap but no update here.

        assertEquals(0, nc.getCapabilities().length);

    }

}