From f5915a7f3afdc272232506e5fefcc45a0416ab7b Mon Sep 17 00:00:00 2001 From: Cody Kesting Date: Mon, 1 Feb 2021 22:54:06 -0800 Subject: [PATCH] Fix test method naming in VcnManagementServiceTest. Bug: 175914059 Test: atest FrameworksVcnTests Change-Id: I03be15d63adfccc357000ee670e373d0359a3c06 --- .../com/android/server/VcnManagementServiceTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/vcn/java/com/android/server/VcnManagementServiceTest.java b/tests/vcn/java/com/android/server/VcnManagementServiceTest.java index de51b2bd73238..e32e1e831f835 100644 --- a/tests/vcn/java/com/android/server/VcnManagementServiceTest.java +++ b/tests/vcn/java/com/android/server/VcnManagementServiceTest.java @@ -532,7 +532,7 @@ public class VcnManagementServiceTest { Collections.singleton(subGroup), Collections.singletonMap(subId, subGroup)); } - private void verifyMergedNetworkCapabilities( + private void verifyMergedNetworkCapabilitiesIsVcnManaged( NetworkCapabilities mergedCapabilities, @Transport int transportType) { assertTrue(mergedCapabilities.hasTransport(transportType)); assertFalse( @@ -541,7 +541,7 @@ public class VcnManagementServiceTest { } @Test - public void testGetUnderlyingNetworkPolicyTransportCell() throws Exception { + public void testGetUnderlyingNetworkPolicyCellular() throws Exception { setUpVcnSubscription(TEST_SUBSCRIPTION_ID, TEST_UUID_2); NetworkCapabilities nc = @@ -554,12 +554,12 @@ public class VcnManagementServiceTest { mVcnMgmtSvc.getUnderlyingNetworkPolicy(nc, new LinkProperties()); assertFalse(policy.isTeardownRequested()); - verifyMergedNetworkCapabilities( + verifyMergedNetworkCapabilitiesIsVcnManaged( policy.getMergedNetworkCapabilities(), NetworkCapabilities.TRANSPORT_CELLULAR); } @Test - public void testGetUnderlyingNetworkPolicyTransportWifi() throws Exception { + public void testGetUnderlyingNetworkPolicyWifi() throws Exception { setUpVcnSubscription(TEST_SUBSCRIPTION_ID, TEST_UUID_2); WifiInfo wifiInfo = mock(WifiInfo.class); @@ -575,7 +575,7 @@ public class VcnManagementServiceTest { mVcnMgmtSvc.getUnderlyingNetworkPolicy(nc, new LinkProperties()); assertFalse(policy.isTeardownRequested()); - verifyMergedNetworkCapabilities( + verifyMergedNetworkCapabilitiesIsVcnManaged( policy.getMergedNetworkCapabilities(), NetworkCapabilities.TRANSPORT_WIFI); }