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

Rename testPreferenceForUserNetworkUpDownForGivenPreference.

Browse Source 
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
This commit is contained in:
Lorenzo Colitti
2022-08-01 18:31:24 +09:00
parent ccd3020a91
commit b82e25c51b
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -14363,7 +14363,7 @@ public class ConnectivityServiceTest {
* Make sure per profile network preferences behave as expected for a given * Make sure per profile network preferences behave as expected for a given
* profile network preference. * profile network preference.
*/ */
public void testPreferenceForUserNetworkUpDownForGivenPreference( public void doTestPreferenceForUserNetworkUpDownForGivenPreference(
ProfileNetworkPreference profileNetworkPreference, ProfileNetworkPreference profileNetworkPreference,
boolean connectWorkProfileAgentAhead, boolean connectWorkProfileAgentAhead,
UserHandle testHandle, UserHandle testHandle,
@@ -14607,7 +14607,7 @@ public class ConnectivityServiceTest {
new ProfileNetworkPreference.Builder(); new ProfileNetworkPreference.Builder();
profileNetworkPreferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE); profileNetworkPreferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE);
profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1); profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1);
testPreferenceForUserNetworkUpDownForGivenPreference( doTestPreferenceForUserNetworkUpDownForGivenPreference(
profileNetworkPreferenceBuilder.build(), false, profileNetworkPreferenceBuilder.build(), false,
testHandle, mProfileDefaultNetworkCallback, null); testHandle, mProfileDefaultNetworkCallback, null);
} }
@@ -14626,7 +14626,7 @@ public class ConnectivityServiceTest {
PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK); PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK);
profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1); profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1);
registerDefaultNetworkCallbacks(); registerDefaultNetworkCallbacks();
testPreferenceForUserNetworkUpDownForGivenPreference( doTestPreferenceForUserNetworkUpDownForGivenPreference(
profileNetworkPreferenceBuilder.build(), false, profileNetworkPreferenceBuilder.build(), false,
testHandle, mProfileDefaultNetworkCallback, null); testHandle, mProfileDefaultNetworkCallback, null);
} }
@@ -14647,7 +14647,7 @@ public class ConnectivityServiceTest {
PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK); PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK);
profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1); profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1);
registerDefaultNetworkCallbacks(); registerDefaultNetworkCallbacks();
testPreferenceForUserNetworkUpDownForGivenPreference( doTestPreferenceForUserNetworkUpDownForGivenPreference(
profileNetworkPreferenceBuilder.build(), true, testHandle, profileNetworkPreferenceBuilder.build(), true, testHandle,
mProfileDefaultNetworkCallback, null); mProfileDefaultNetworkCallback, null);
} }
@@ -14666,7 +14666,7 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder.setIncludedUids( profileNetworkPreferenceBuilder.setIncludedUids(
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID)}); new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID)});
registerDefaultNetworkCallbacks(); registerDefaultNetworkCallbacks();
testPreferenceForUserNetworkUpDownForGivenPreference( doTestPreferenceForUserNetworkUpDownForGivenPreference(
profileNetworkPreferenceBuilder.build(), false, testHandle, profileNetworkPreferenceBuilder.build(), false, testHandle,
mProfileDefaultNetworkCallback, null); mProfileDefaultNetworkCallback, null);
} }
@@ -14685,7 +14685,7 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder.setIncludedUids( profileNetworkPreferenceBuilder.setIncludedUids(
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)}); new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)});
registerDefaultNetworkCallbacks(); registerDefaultNetworkCallbacks();
testPreferenceForUserNetworkUpDownForGivenPreference( doTestPreferenceForUserNetworkUpDownForGivenPreference(
profileNetworkPreferenceBuilder.build(), false, profileNetworkPreferenceBuilder.build(), false,
testHandle, mProfileDefaultNetworkCallbackAsAppUid2, null); testHandle, mProfileDefaultNetworkCallbackAsAppUid2, null);
} }
@@ -14704,7 +14704,7 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder.setExcludedUids( profileNetworkPreferenceBuilder.setExcludedUids(
new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)}); new int[]{testHandle.getUid(TEST_WORK_PROFILE_APP_UID_2)});
registerDefaultNetworkCallbacks(); registerDefaultNetworkCallbacks();
testPreferenceForUserNetworkUpDownForGivenPreference( doTestPreferenceForUserNetworkUpDownForGivenPreference(
profileNetworkPreferenceBuilder.build(), false, profileNetworkPreferenceBuilder.build(), false,
testHandle, mProfileDefaultNetworkCallback, testHandle, mProfileDefaultNetworkCallback,
mProfileDefaultNetworkCallbackAsAppUid2); mProfileDefaultNetworkCallbackAsAppUid2);
@@ -14800,7 +14800,7 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE); profileNetworkPreferenceBuilder.setPreference(PROFILE_NETWORK_PREFERENCE_ENTERPRISE);
profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1); profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1);
registerDefaultNetworkCallbacks(); registerDefaultNetworkCallbacks();
testPreferenceForUserNetworkUpDownForGivenPreference( doTestPreferenceForUserNetworkUpDownForGivenPreference(
profileNetworkPreferenceBuilder.build(), true, profileNetworkPreferenceBuilder.build(), true,
testHandle, mProfileDefaultNetworkCallback, testHandle, mProfileDefaultNetworkCallback,
null); null);
@@ -14820,7 +14820,7 @@ public class ConnectivityServiceTest {
PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK); PROFILE_NETWORK_PREFERENCE_ENTERPRISE_NO_FALLBACK);
profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1); profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(NET_ENTERPRISE_ID_1);
registerDefaultNetworkCallbacks(); registerDefaultNetworkCallbacks();
testPreferenceForUserNetworkUpDownForGivenPreference( doTestPreferenceForUserNetworkUpDownForGivenPreference(
profileNetworkPreferenceBuilder.build(), true, profileNetworkPreferenceBuilder.build(), true,
testHandle, mProfileDefaultNetworkCallback, testHandle, mProfileDefaultNetworkCallback,
null); null);
@@ -14841,7 +14841,7 @@ public class ConnectivityServiceTest {
profileNetworkPreferenceBuilder.setPreferenceEnterpriseId( profileNetworkPreferenceBuilder.setPreferenceEnterpriseId(
NET_ENTERPRISE_ID_2); NET_ENTERPRISE_ID_2);
registerDefaultNetworkCallbacks(); registerDefaultNetworkCallbacks();
testPreferenceForUserNetworkUpDownForGivenPreference( doTestPreferenceForUserNetworkUpDownForGivenPreference(
profileNetworkPreferenceBuilder.build(), true, profileNetworkPreferenceBuilder.build(), true,
testHandle, mProfileDefaultNetworkCallback, null); testHandle, mProfileDefaultNetworkCallback, null);
} }