From b82e25c51b3ed9880a434547483e7e2bb75a0db4 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Mon, 1 Aug 2022 18:31:24 +0900 Subject: [PATCH 1/3] Rename testPreferenceForUserNetworkUpDownForGivenPreference. This method name is confusing because it is not a test, and convention in this file is that only test methods are called testXyz. Rename it to doTestXyz. Bug: 143158421 Test: test-only change Change-Id: Ief9742174a7fc9966ade29d9a32a13277ce747ac --- .../server/ConnectivityServiceTest.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index 0919dfc981..c6f8b52de4 100644 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -14363,7 +14363,7 @@ public class ConnectivityServiceTest { * Make sure per profile network preferences behave as expected for a given * profile network preference. */ - public void testPreferenceForUserNetworkUpDownForGivenPreference( + public void doTestPreferenceForUserNetworkUpDownForGivenPreference( ProfileNetworkPreference profileNetworkPreference, boolean connectWorkProfileAgentAhead, UserHandle testHandle, @@ -14607,7 +14607,7 @@ public class ConnectivityServiceTest { new ProfileNetworkPreference.Builder(); profileNetworkPreferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE); profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1); - testPreferenceForUserNetworkUpDownForGivenPreference( + doTestPreferenceForUserNetworkUpDownForGivenPreference( profileNetworkPreferenceBuilder.build(), false, testHandle, mProfileDefaultNetworkCallback, null); } @@ -14626,7 +14626,7 @@ public class ConnectivityServiceTest { PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK); profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1); registerDefaultNetworkCallbacks(); - testPreferenceForUserNetworkUpDownForGivenPreference( + doTestPreferenceForUserNetworkUpDownForGivenPreference( profileNetworkPreferenceBuilder.build(), false, testHandle, mProfileDefaultNetworkCallback, null); } @@ -14647,7 +14647,7 @@ public class ConnectivityServiceTest { PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK); profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1); registerDefaultNetworkCallbacks(); - testPreferenceForUserNetworkUpDownForGivenPreference( + doTestPreferenceForUserNetworkUpDownForGivenPreference( profileNetworkPreferenceBuilder.build(), true, testHandle, mProfileDefaultNetworkCallback, null); } @@ -14666,7 +14666,7 @@ public class ConnectivityServiceTest { profileNetworkPreferenceBuilder.setIncludedUids( new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID)}); registerDefaultNetworkCallbacks(); - testPreferenceForUserNetworkUpDownForGivenPreference( + doTestPreferenceForUserNetworkUpDownForGivenPreference( profileNetworkPreferenceBuilder.build(), false, testHandle, mProfileDefaultNetworkCallback, null); } @@ -14685,7 +14685,7 @@ public class ConnectivityServiceTest { profileNetworkPreferenceBuilder.setIncludedUids( new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)}); registerDefaultNetworkCallbacks(); - testPreferenceForUserNetworkUpDownForGivenPreference( + doTestPreferenceForUserNetworkUpDownForGivenPreference( profileNetworkPreferenceBuilder.build(), false, testHandle, mProfileDefaultNetworkCallbackAsAppUid2, null); } @@ -14704,7 +14704,7 @@ public class ConnectivityServiceTest { profileNetworkPreferenceBuilder.setExcludedUids( new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)}); registerDefaultNetworkCallbacks(); - testPreferenceForUserNetworkUpDownForGivenPreference( + doTestPreferenceForUserNetworkUpDownForGivenPreference( profileNetworkPreferenceBuilder.build(), false, testHandle, mProfileDefaultNetworkCallback, mProfileDefaultNetworkCallbackAsAppUid2); @@ -14800,7 +14800,7 @@ public class ConnectivityServiceTest { profileNetworkPreferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE); profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1); registerDefaultNetworkCallbacks(); - testPreferenceForUserNetworkUpDownForGivenPreference( + doTestPreferenceForUserNetworkUpDownForGivenPreference( profileNetworkPreferenceBuilder.build(), true, testHandle, mProfileDefaultNetworkCallback, null); @@ -14820,7 +14820,7 @@ public class ConnectivityServiceTest { PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK); profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1); registerDefaultNetworkCallbacks(); - testPreferenceForUserNetworkUpDownForGivenPreference( + doTestPreferenceForUserNetworkUpDownForGivenPreference( profileNetworkPreferenceBuilder.build(), true, testHandle, mProfileDefaultNetworkCallback, null); @@ -14841,7 +14841,7 @@ public class ConnectivityServiceTest { profileNetworkPreferenceBuilder.setPreferenceEnterpriseId( NET_ENTERPRISE_ID_2); registerDefaultNetworkCallbacks(); - testPreferenceForUserNetworkUpDownForGivenPreference( + doTestPreferenceForUserNetworkUpDownForGivenPreference( profileNetworkPreferenceBuilder.build(), true, testHandle, mProfileDefaultNetworkCallback, null); } From 410d4e18b0a09e87ecfcb64c2322f5ab86f578bc Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Mon, 1 Aug 2022 10:24:35 +0900 Subject: [PATCH 2/3] Expect creating the DNS event listener in setUp, not in tests. This simplifies the code a bit. Also remove an unnecessary reset(mMockNetd) call. Bug: 143158421 Test: test-only change Change-Id: Ie49d23193ef8d9dcb3f724a7dff249755c67a971 --- .../com/android/server/ConnectivityServiceTest.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index c6f8b52de4..85117752e0 100644 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -1854,6 +1854,7 @@ public class ConnectivityServiceTest { // getSystemService() correctly. mCm = new WrappedConnectivityManager(InstrumentationRegistry.getContext(), mService); mService.systemReadyInternal(); + verify(mMockDnsResolver).registerUnsolicitedEventListener(any()); mVpnManagerService = makeVpnManagerService(); mVpnManagerService.systemReady(); mockVpn(Process.myUid()); @@ -7256,9 +7257,6 @@ public class ConnectivityServiceTest { public void testBasicDnsConfigurationPushed() throws Exception { setPrivateDnsSettings(PRIVATE_DNS_MODE_OPPORTUNISTIC, "ignored.example.com"); - // Clear any interactions that occur as a result of CS starting up. - reset(mMockDnsResolver); - mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR); waitForIdle(); verify(mMockDnsResolver, never()).setResolverConfiguration(any()); @@ -7331,9 +7329,6 @@ public class ConnectivityServiceTest { @Test public void testDnsConfigurationTransTypesPushed() throws Exception { - // Clear any interactions that occur as a result of CS starting up. - reset(mMockDnsResolver); - final NetworkRequest request = new NetworkRequest.Builder() .clearCapabilities().addCapability(NET_CAPABILITY_INTERNET) .build(); @@ -7392,9 +7387,6 @@ public class ConnectivityServiceTest { @Test public void testPrivateDnsSettingsChange() throws Exception { - // Clear any interactions that occur as a result of CS starting up. - reset(mMockDnsResolver); - // The default on Android is opportunistic mode ("Automatic"). setPrivateDnsSettings(PRIVATE_DNS_MODE_OPPORTUNISTIC, "ignored.example.com"); @@ -9845,8 +9837,6 @@ public class ConnectivityServiceTest { cellLp.addRoute(ipv6Default); cellLp.addRoute(ipv6Subnet); mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR, cellLp); - reset(mMockDnsResolver); - reset(mMockNetd); reset(mClatCoordinator); // Connect with ipv6 link properties. Expect prefix discovery to be started. From db04c60658153530e110ae33798af782037554e3 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Tue, 2 Aug 2022 09:50:59 +0900 Subject: [PATCH 3/3] Make all ConnectivityService#doTestXyz methods private. They are not tests so there is no need for them to be public. Test: TH Bug: 143158421 Change-Id: I6fff65eb62b1689432dc1c9c7347261433317fac --- .../server/ConnectivityServiceTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index 85117752e0..ca58eb2e89 100644 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -2605,7 +2605,7 @@ public class ConnectivityServiceTest { doTestValidatedCellularOutscoresUnvalidatedWiFi(false); } - public void doTestValidatedCellularOutscoresUnvalidatedWiFi( + private void doTestValidatedCellularOutscoresUnvalidatedWiFi( final boolean cellRadioTimesharingCapable) throws Exception { mService.mCellularRadioTimesharingCapable = cellRadioTimesharingCapable; // Test bringing up unvalidated WiFi @@ -2653,7 +2653,7 @@ public class ConnectivityServiceTest { doTestUnvalidatedWifiOutscoresUnvalidatedCellular(false); } - public void doTestUnvalidatedWifiOutscoresUnvalidatedCellular( + private void doTestUnvalidatedWifiOutscoresUnvalidatedCellular( final boolean cellRadioTimesharingCapable) throws Exception { mService.mCellularRadioTimesharingCapable = cellRadioTimesharingCapable; // Test bringing up unvalidated cellular. @@ -2692,7 +2692,7 @@ public class ConnectivityServiceTest { doTestUnlingeringDoesNotValidate(false); } - public void doTestUnlingeringDoesNotValidate( + private void doTestUnlingeringDoesNotValidate( final boolean cellRadioTimesharingCapable) throws Exception { mService.mCellularRadioTimesharingCapable = cellRadioTimesharingCapable; // Test bringing up unvalidated WiFi. @@ -2741,7 +2741,7 @@ public class ConnectivityServiceTest { doTestRequestMigrationToSameTransport(TRANSPORT_ETHERNET, true); } - public void doTestRequestMigrationToSameTransport(final int transport, + private void doTestRequestMigrationToSameTransport(final int transport, final boolean expectLingering) throws Exception { // To speed up tests the linger delay is very short by default in tests but this // test needs to make sure the delay is not incurred so a longer value is safer (it @@ -2846,7 +2846,7 @@ public class ConnectivityServiceTest { doTestCellularOutscoresWeakWifi(false); } - public void doTestCellularOutscoresWeakWifi( + private void doTestCellularOutscoresWeakWifi( final boolean cellRadioTimesharingCapable) throws Exception { mService.mCellularRadioTimesharingCapable = cellRadioTimesharingCapable; // Test bringing up validated cellular. @@ -2885,7 +2885,7 @@ public class ConnectivityServiceTest { doTestReapingNetwork(false); } - public void doTestReapingNetwork( + private void doTestReapingNetwork( final boolean cellRadioTimesharingCapable) throws Exception { mService.mCellularRadioTimesharingCapable = cellRadioTimesharingCapable; // Test bringing up WiFi without NET_CAPABILITY_INTERNET. @@ -2927,7 +2927,7 @@ public class ConnectivityServiceTest { doTestCellularFallback(false); } - public void doTestCellularFallback( + private void doTestCellularFallback( final boolean cellRadioTimesharingCapable) throws Exception { mService.mCellularRadioTimesharingCapable = cellRadioTimesharingCapable; // Test bringing up validated cellular. @@ -2978,7 +2978,7 @@ public class ConnectivityServiceTest { doTestWiFiFallback(false); } - public void doTestWiFiFallback( + private void doTestWiFiFallback( final boolean cellRadioTimesharingCapable) throws Exception { mService.mCellularRadioTimesharingCapable = cellRadioTimesharingCapable; // Test bringing up unvalidated WiFi. @@ -14353,7 +14353,7 @@ public class ConnectivityServiceTest { * Make sure per profile network preferences behave as expected for a given * profile network preference. */ - public void doTestPreferenceForUserNetworkUpDownForGivenPreference( + private void doTestPreferenceForUserNetworkUpDownForGivenPreference( ProfileNetworkPreference profileNetworkPreference, boolean connectWorkProfileAgentAhead, UserHandle testHandle,