PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f102

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614988

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id800c96a0c41593b68d1718e0eb3b11eaf05538e
This commit is contained in:
SongFerng Wang
2021-03-04 06:48:24 +00:00
committed by Automerger Merge Worker
parent d64a350d86 cbc2c4f102
commit fa58b7e292
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/robotests/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java → tests/unit/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java
View File

@@ -16,41 +16,43 @@
package com.android.settings.network; package com.android.settings.network;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
import android.test.mock.MockContentResolver;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class) @RunWith(AndroidJUnit4.class)
public class PreferredNetworkModeContentObserverTest { public class PreferredNetworkModeContentObserverTest {
private static final int SUB_ID = 1; private static final int SUB_ID = 1;
@Mock
private ContentResolver mResolver;
@Mock
private Context mContext; private Context mContext;
private MockContentResolver mResolver;
private PreferredNetworkModeContentObserver mPreferredNetworkModeContentObserver;
@Mock @Mock
private PreferredNetworkModeContentObserver.OnPreferredNetworkModeChangedListener mListener; private PreferredNetworkModeContentObserver.OnPreferredNetworkModeChangedListener mListener;
private PreferredNetworkModeContentObserver mPreferredNetworkModeContentObserver;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
when(mContext.getContentResolver()).thenReturn(mResolver); mContext = spy(ApplicationProvider.getApplicationContext());
mResolver = spy(new MockContentResolver(mContext));
when(mContext.getContentResolver()).thenReturn(mResolver);
mPreferredNetworkModeContentObserver = mPreferredNetworkModeContentObserver =
spy(new PreferredNetworkModeContentObserver(null)); spy(new PreferredNetworkModeContentObserver(null));
} }
@@ -68,8 +70,8 @@ public class PreferredNetworkModeContentObserverTest {
mPreferredNetworkModeContentObserver.register(mContext, SUB_ID); mPreferredNetworkModeContentObserver.register(mContext, SUB_ID);
verify(mResolver).registerContentObserver( verify(mResolver).registerContentObserver(
Settings.Global.getUriFor(Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID), false, Settings.Global.getUriFor(Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID), false,
mPreferredNetworkModeContentObserver); mPreferredNetworkModeContentObserver);
} }
@Test @Test
@@ -78,5 +80,4 @@ public class PreferredNetworkModeContentObserverTest {
verify(mResolver).unregisterContentObserver(mPreferredNetworkModeContentObserver); verify(mResolver).unregisterContentObserver(mPreferredNetworkModeContentObserver);
} }
} }