summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-01-10 18:35:40 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-01-10 18:35:44 +0000
commit558097a03bc4e8c40a9e82cf1264d7e741337c64 (patch)
tree7575fdca2ba9b25885083dd5a792ae66ceb8c3f6
parent6f225cae06a49bf2c34716b3418d7b64d0feb232 (diff)
parent06d1fd7077c1dd4da3b8c1d6e02931c5b76b3670 (diff)
Merge "Cleanup test method names."
-rw-r--r--services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java
index 9c5c67237fd2..af570b0dff08 100644
--- a/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java
@@ -322,7 +322,7 @@ public class NetworkScoreServiceTest {
}
@Test
- public void testClearScores_notActiveScorer_noBroadcastNetworkPermission() {
+ public void testClearScores_notActiveScorer_noRequestNetworkScoresPermission() {
when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(false);
when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES))
.thenReturn(PackageManager.PERMISSION_DENIED);
@@ -335,7 +335,7 @@ public class NetworkScoreServiceTest {
}
@Test
- public void testClearScores_activeScorer_noBroadcastNetworkPermission() {
+ public void testClearScores_activeScorer_noRequestNetworkScoresPermission() {
when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(true);
when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES))
.thenReturn(PackageManager.PERMISSION_DENIED);
@@ -355,7 +355,7 @@ public class NetworkScoreServiceTest {
}
@Test
- public void testClearScores_notActiveScorer_hasBroadcastNetworkPermission()
+ public void testClearScores_notActiveScorer_hasRequestNetworkScoresPermission()
throws RemoteException {
when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(false);
when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES))
@@ -382,7 +382,7 @@ public class NetworkScoreServiceTest {
}
@Test
- public void testDisableScoring_notActiveScorer_noBroadcastNetworkPermission() {
+ public void testDisableScoring_notActiveScorer_noRequestNetworkScoresPermission() {
when(mNetworkScorerAppManager.isCallerActiveScorer(anyInt())).thenReturn(false);
when(mContext.checkCallingOrSelfPermission(permission.REQUEST_NETWORK_SCORES))
.thenReturn(PackageManager.PERMISSION_DENIED);
@@ -396,7 +396,7 @@ public class NetworkScoreServiceTest {
}
@Test
- public void testRegisterNetworkScoreCache_noBroadcastNetworkPermission() {
+ public void testRegisterNetworkScoreCache_noRequestNetworkScoresPermission() {
doThrow(new SecurityException()).when(mContext).enforceCallingOrSelfPermission(
eq(permission.REQUEST_NETWORK_SCORES), anyString());
@@ -410,7 +410,7 @@ public class NetworkScoreServiceTest {
}
@Test
- public void testUnregisterNetworkScoreCache_noBroadcastNetworkPermission() {
+ public void testUnregisterNetworkScoreCache_noRequestNetworkScoresPermission() {
doThrow(new SecurityException()).when(mContext).enforceCallingOrSelfPermission(
eq(permission.REQUEST_NETWORK_SCORES), anyString());