LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add tests for NetCapability#getCapabilityCarrierName" am: 45fa6bd811

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683350

Change-Id: I90d74f4ec5f6b7bbe81862484f50fc7fb83ae134
This commit is contained in:
Sarah Chin
2021-04-27 18:17:55 +00:00
committed by Automerger Merge Worker
parent ccaf092fc0 45fa6bd811
commit 4d9f226837
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -132,6 +132,8 @@ import androidx.test.runner.AndroidJUnit4;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.networkstack.apishim.ConnectivityManagerShimImpl; import com.android.networkstack.apishim.ConnectivityManagerShimImpl;
import com.android.networkstack.apishim.ConstantsShim;
import com.android.networkstack.apishim.NetworkInformationShimImpl;
import com.android.networkstack.apishim.common.ConnectivityManagerShim; import com.android.networkstack.apishim.common.ConnectivityManagerShim;
import com.android.testutils.CompatUtil; import com.android.testutils.CompatUtil;
import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule;
@@ -1901,4 +1903,13 @@ public class ConnectivityManagerTest {
assumeTrue(TestUtils.shouldTestSApis()); assumeTrue(TestUtils.shouldTestSApis());
runWithShellPermissionIdentity(() -> doTestLegacyLockdownEnabled(), NETWORK_SETTINGS); runWithShellPermissionIdentity(() -> doTestLegacyLockdownEnabled(), NETWORK_SETTINGS);
} }
@Test
public void testGetCapabilityCarrierName() {
assumeTrue(TestUtils.shouldTestSApis());
assertEquals("ENTERPRISE", NetworkInformationShimImpl.newInstance()
.getCapabilityCarrierName(ConstantsShim.NET_CAPABILITY_ENTERPRISE));
assertNull(NetworkInformationShimImpl.newInstance()
.getCapabilityCarrierName(ConstantsShim.NET_CAPABILITY_NOT_VCN_MANAGED));
}
} }