Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3a08b44 authored by Erik Kline's avatar Erik Kline
Browse files

Add additional mocking for Context innards 

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - cherry-picked to master and verified there as well
Bug: 32163131
Bug: 32561414

Merged-In: I2695841bfc31280060754132e589af1ca95911da
Merged-In: I9a05f34035a15b233a44d517f2b2426481679974
Change-Id: I0b5b1b12d55547d08c332c7d274f19f0023a7b07
(cherry picked from commit ec37275e)
parent 6e9a1010

tests/net/java/com/android/server/connectivity/TetheringTest.java

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.content.Context; 
import android.content.ContextWrapper;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.ApplicationInfo;

import android.content.res.Resources;

import android.hardware.usb.UsbManager;

import android.net.ConnectivityManager;
@@ -85,6 +86,7 @@ import java.util.Vector; 
public class TetheringTest {

    private static final String[] PROVISIONING_APP_NAME = {"some", "app"};



    @Mock private ApplicationInfo mApplicationInfo;

    @Mock private Context mContext;

    @Mock private ConnectivityManager mConnectivityManager;

    @Mock private INetworkManagementService mNMService;
@@ -115,6 +117,9 @@ public class TetheringTest { 
            super(base);

        }



        @Override

        public ApplicationInfo getApplicationInfo() { return mApplicationInfo; }



        @Override

        public ContentResolver getContentResolver() { return mContentResolver; }

tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java

+4 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.times; 
import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.net.LinkAddress;

import android.net.LinkProperties;

import android.net.RouteInfo;
@@ -59,15 +60,17 @@ import org.mockito.MockitoAnnotations; 
public class OffloadControllerTest {



    @Mock private OffloadHardwareInterface mHardware;

    @Mock private ApplicationInfo mApplicationInfo;

    @Mock private Context mContext;

    final ArgumentCaptor<ArrayList> mStringArrayCaptor = ArgumentCaptor.forClass(ArrayList.class);

    private MockContentResolver mContentResolver;



    @Before public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);

        when(mContext.getApplicationInfo()).thenReturn(mApplicationInfo);

        when(mContext.getPackageName()).thenReturn("OffloadControllerTest");

        mContentResolver = new MockContentResolver(mContext);

        mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());

        when(mContext.getPackageName()).thenReturn("OffloadControllerTest");

        when(mContext.getContentResolver()).thenReturn(mContentResolver);

    }