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

Merge "Add additional mocking for Context innards" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-12 05:06:35 +00:00
committed by Android (Google) Code Review
parent cacf1981ca f3a08b44ed
commit cdb134c012
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/net/java/com/android/server/connectivity/TetheringTest.java
View File

@@ -42,6 +42,7 @@ import android.content.Context;
import android.content.ContextWrapper; import android.content.ContextWrapper;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.ApplicationInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.hardware.usb.UsbManager; import android.hardware.usb.UsbManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
@@ -85,6 +86,7 @@ import java.util.Vector;
public class TetheringTest { public class TetheringTest {
private static final String[] PROVISIONING_APP_NAME = {"some", "app"}; private static final String[] PROVISIONING_APP_NAME = {"some", "app"};
@Mock private ApplicationInfo mApplicationInfo;
@Mock private Context mContext; @Mock private Context mContext;
@Mock private ConnectivityManager mConnectivityManager; @Mock private ConnectivityManager mConnectivityManager;
@Mock private INetworkManagementService mNMService; @Mock private INetworkManagementService mNMService;
@@ -115,6 +117,9 @@ public class TetheringTest {
super(base); super(base);
} }
@Override
public ApplicationInfo getApplicationInfo() { return mApplicationInfo; }
@Override @Override
public ContentResolver getContentResolver() { return mContentResolver; } public ContentResolver getContentResolver() { return mContentResolver; }

5
tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java
View File

@@ -30,6 +30,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.net.LinkAddress; import android.net.LinkAddress;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.RouteInfo; import android.net.RouteInfo;
@@ -59,15 +60,17 @@ import org.mockito.MockitoAnnotations;
public class OffloadControllerTest { public class OffloadControllerTest {
@Mock private OffloadHardwareInterface mHardware; @Mock private OffloadHardwareInterface mHardware;
@Mock private ApplicationInfo mApplicationInfo;
@Mock private Context mContext; @Mock private Context mContext;
final ArgumentCaptor<ArrayList> mStringArrayCaptor = ArgumentCaptor.forClass(ArrayList.class); final ArgumentCaptor<ArrayList> mStringArrayCaptor = ArgumentCaptor.forClass(ArrayList.class);
private MockContentResolver mContentResolver; private MockContentResolver mContentResolver;
@Before public void setUp() throws Exception { @Before public void setUp() throws Exception {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
when(mContext.getApplicationInfo()).thenReturn(mApplicationInfo);
when(mContext.getPackageName()).thenReturn("OffloadControllerTest");
mContentResolver = new MockContentResolver(mContext); mContentResolver = new MockContentResolver(mContext);
mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider()); mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());
when(mContext.getPackageName()).thenReturn("OffloadControllerTest");
when(mContext.getContentResolver()).thenReturn(mContentResolver); when(mContext.getContentResolver()).thenReturn(mContentResolver);
} }