Merge "Migrate to using Mockito directly." (22cb5b37) · Commits · e / os / android_frameworks_base

services/java/com/android/server/ConnectivityService.java

+4 −11

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.server;

		import static android.Manifest.permission.CONNECTIVITY_INTERNAL;
		import static android.Manifest.permission.MANAGE_NETWORK_POLICY;
		import static android.Manifest.permission.RECEIVE_DATA_ACTIVITY_CHANGE;
		import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
		@@ -32,7 +31,6 @@ import static android.net.ConnectivityManager.isNetworkTypeValid;
		import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;
		import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;

		import android.app.Activity;
		import android.bluetooth.BluetoothTetheringDataTracker;
		import android.content.BroadcastReceiver;
		import android.content.ContentResolver;
		@@ -88,7 +86,6 @@ import android.provider.Settings;
		import android.security.Credentials;
		import android.security.KeyStore;
		import android.text.TextUtils;
		import android.util.EventLog;
		import android.util.Slog;
		import android.util.SparseIntArray;

		@@ -3336,7 +3333,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {

		@Override
		public boolean updateLockdownVpn() {
		enforceSystemUid();
		if (Binder.getCallingUid() != Process.SYSTEM_UID) {
		Slog.w(TAG, "Lockdown VPN only available to AID_SYSTEM");
		return false;
		}

		// Tear down existing lockdown if profile was removed
		mLockdownEnabled = LockdownVpnTracker.isEnabled();
		@@ -3387,11 +3387,4 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		throw new IllegalStateException("Unavailable in lockdown mode");
		}
		}

		private static void enforceSystemUid() {
		final int uid = Binder.getCallingUid();
		if (uid != Process.SYSTEM_UID) {
		throw new SecurityException("Only available to AID_SYSTEM");
		}
		}
		}

services/tests/servicestests/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
		LOCAL_STATIC_JAVA_LIBRARIES := \
		easymocklib \
		guava \
		littlemock
		mockito-target

		LOCAL_JAVA_LIBRARIES := android.test.runner services

services/tests/servicestests/src/com/android/server/BroadcastInterceptingContext.java

+18 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.content.ContextWrapper;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.os.Handler;
		import android.os.UserHandle;

		import com.google.common.collect.Lists;
		import com.google.common.util.concurrent.AbstractFuture;
		@@ -132,13 +133,29 @@ public class BroadcastInterceptingContext extends ContextWrapper {
		}
		}

		@Override
		public void sendBroadcast(Intent intent, String receiverPermission) {
		sendBroadcast(intent);
		}

		@Override
		public void sendBroadcastAsUser(Intent intent, UserHandle user) {
		sendBroadcast(intent);
		}

		@Override
		public void sendBroadcastAsUser(Intent intent, UserHandle user,
		String receiverPermission) {
		sendBroadcast(intent);
		}

		@Override
		public void sendStickyBroadcast(Intent intent) {
		sendBroadcast(intent);
		}

		@Override
		public void sendBroadcast(Intent intent, String receiverPermission) {
		public void sendStickyBroadcastAsUser(Intent intent, UserHandle user) {
		sendBroadcast(intent);
		}

services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java

+11 −12

Original line number	Diff line number	Diff line
		@@ -21,16 +21,15 @@ import static android.net.ConnectivityManager.TYPE_MOBILE;
		import static android.net.ConnectivityManager.TYPE_WIFI;
		import static android.net.ConnectivityManager.getNetworkTypeName;
		import static android.net.NetworkStateTracker.EVENT_STATE_CHANGED;
		import static com.google.testing.littlemock.LittleMock.anyInt;
		import static com.google.testing.littlemock.LittleMock.createCaptor;
		import static com.google.testing.littlemock.LittleMock.doNothing;
		import static com.google.testing.littlemock.LittleMock.doReturn;
		import static com.google.testing.littlemock.LittleMock.doThrow;
		import static com.google.testing.littlemock.LittleMock.eq;
		import static com.google.testing.littlemock.LittleMock.isA;
		import static com.google.testing.littlemock.LittleMock.mock;
		import static com.google.testing.littlemock.LittleMock.reset;
		import static com.google.testing.littlemock.LittleMock.verify;
		import static org.mockito.Matchers.anyInt;
		import static org.mockito.Matchers.eq;
		import static org.mockito.Matchers.isA;
		import static org.mockito.Mockito.doNothing;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.doThrow;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.reset;
		import static org.mockito.Mockito.verify;

		import android.content.Context;
		import android.net.INetworkPolicyManager;
		@@ -48,7 +47,7 @@ import android.test.suitebuilder.annotation.LargeTest;
		import android.util.Log;
		import android.util.LogPrinter;

		import com.google.testing.littlemock.ArgumentCaptor;
		import org.mockito.ArgumentCaptor;

		import java.net.InetAddress;
		import java.util.concurrent.Future;
		@@ -128,7 +127,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
		doReturn(mWifi.tracker)
		.when(mNetFactory).createTracker(eq(TYPE_WIFI), isA(NetworkConfig.class));

		final ArgumentCaptor<Handler> trackerHandler = createCaptor();
		final ArgumentCaptor<Handler> trackerHandler = ArgumentCaptor.forClass(Handler.class);
		doNothing().when(mMobile.tracker)
		.startMonitoring(isA(Context.class), trackerHandler.capture());