LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Call clearSettingsProvider before and after test"

Browse Source 
am: 3868fc30ee

Change-Id: I38cae25353df48851280490d4593e70b49f0e6c0
This commit is contained in:
Remi NGUYEN VAN
2018-09-28 07:28:31 -07:00
committed by android-build-merger
parent 937c009070 b7c67f8e24
commit a1a00cbbd1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -79,6 +79,7 @@ import static org.mockito.Mockito.when;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ContentProvider;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -248,7 +249,7 @@ public class ConnectivityServiceTest {
@Spy private Resources mResources; @Spy private Resources mResources;
private final LinkedBlockingQueue<Intent> mStartedActivities = new LinkedBlockingQueue<>(); private final LinkedBlockingQueue<Intent> mStartedActivities = new LinkedBlockingQueue<>();
MockContext(Context base) { MockContext(Context base, ContentProvider settingsProvider) {
super(base); super(base);
mResources = spy(base.getResources()); mResources = spy(base.getResources());
@@ -260,7 +261,7 @@ public class ConnectivityServiceTest {
}); });
mContentResolver = new MockContentResolver(); mContentResolver = new MockContentResolver();
mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider()); mContentResolver.addProvider(Settings.AUTHORITY, settingsProvider);
} }
@Override @Override
@@ -1048,7 +1049,9 @@ public class ConnectivityServiceTest {
Looper.prepare(); Looper.prepare();
} }
mServiceContext = new MockContext(InstrumentationRegistry.getContext()); FakeSettingsProvider.clearSettingsProvider();
mServiceContext = new MockContext(InstrumentationRegistry.getContext(),
new FakeSettingsProvider());
LocalServices.removeServiceForTest(NetworkPolicyManagerInternal.class); LocalServices.removeServiceForTest(NetworkPolicyManagerInternal.class);
LocalServices.addService( LocalServices.addService(
NetworkPolicyManagerInternal.class, mock(NetworkPolicyManagerInternal.class)); NetworkPolicyManagerInternal.class, mock(NetworkPolicyManagerInternal.class));
@@ -1086,6 +1089,7 @@ public class ConnectivityServiceTest {
mEthernetNetworkAgent.disconnect(); mEthernetNetworkAgent.disconnect();
mEthernetNetworkAgent = null; mEthernetNetworkAgent = null;
} }
FakeSettingsProvider.clearSettingsProvider();
} }
private static int transportToLegacyType(int transport) { private static int transportToLegacyType(int transport) {