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

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

Change-Id: I7d74dc77ea69c68138c282af74f19dd67c38253f
This commit is contained in:
Sarah Chin
2021-04-27 18:36:09 +00:00
committed by Automerger Merge Worker

View File

@@ -132,6 +132,8 @@ import androidx.test.runner.AndroidJUnit4;
import com.android.internal.util.ArrayUtils;
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.testutils.CompatUtil;
import com.android.testutils.DevSdkIgnoreRule;
@@ -1901,4 +1903,13 @@ public class ConnectivityManagerTest {
assumeTrue(TestUtils.shouldTestSApis());
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));
}
}