Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup test method names."

Browse Source
This commit is contained in:
Treehugger Robot
2017-01-10 22:18:56 +00:00
committed by Gerrit Code Review
parent f3b1881bb2 23f1fcd5ef
commit 8e9fd295c8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java
View File

@@ -322,7 +322,7 @@ public class NetworkScoreServiceTest {
} }
@Test @Test
public void testClearScores_notActiveScorer_noBroadcastNetworkPermission() { public void testClearScores_notActiveScorer_noRequestNetworkScoresPermission() {
when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(false); when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(false);
when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES)) when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES))
.thenReturn(PackageManager.PERMISSION_DENIED); .thenReturn(PackageManager.PERMISSION_DENIED);
@@ -335,7 +335,7 @@ public class NetworkScoreServiceTest {
} }
@Test @Test
public void testClearScores_activeScorer_noBroadcastNetworkPermission() { public void testClearScores_activeScorer_noRequestNetworkScoresPermission() {
when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(true); when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(true);
when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES)) when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES))
.thenReturn(PackageManager.PERMISSION_DENIED); .thenReturn(PackageManager.PERMISSION_DENIED);
@@ -355,7 +355,7 @@ public class NetworkScoreServiceTest {
} }
@Test @Test
public void testClearScores_notActiveScorer_hasBroadcastNetworkPermission() public void testClearScores_notActiveScorer_hasRequestNetworkScoresPermission()
throws RemoteException { throws RemoteException {
when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(false); when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(false);
when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES)) when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES))
@@ -382,7 +382,7 @@ public class NetworkScoreServiceTest {
} }
@Test @Test
public void testDisableScoring_notActiveScorer_noBroadcastNetworkPermission() { public void testDisableScoring_notActiveScorer_noRequestNetworkScoresPermission() {
when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(false); when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(false);
when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES)) when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES))
.thenReturn(PackageManager.PERMISSION_DENIED); .thenReturn(PackageManager.PERMISSION_DENIED);
@@ -396,7 +396,7 @@ public class NetworkScoreServiceTest {
} }
@Test @Test
public void testRegisterNetworkScoreCache_noBroadcastNetworkPermission() { public void testRegisterNetworkScoreCache_noRequestNetworkScoresPermission() {
doThrow(new SecurityException()).when(mContext).enforceCallingOrSelfPermission( doThrow(new SecurityException()).when(mContext).enforceCallingOrSelfPermission(
eq(permission.REQUEST_NETWORK_SCORES), anyString()); eq(permission.REQUEST_NETWORK_SCORES), anyString());
@@ -410,7 +410,7 @@ public class NetworkScoreServiceTest {
} }
@Test @Test
public void testUnregisterNetworkScoreCache_noBroadcastNetworkPermission() { public void testUnregisterNetworkScoreCache_noRequestNetworkScoresPermission() {
doThrow(new SecurityException()).when(mContext).enforceCallingOrSelfPermission( doThrow(new SecurityException()).when(mContext).enforceCallingOrSelfPermission(
eq(permission.REQUEST_NETWORK_SCORES), anyString()); eq(permission.REQUEST_NETWORK_SCORES), anyString());