From 3611c3e22f77b098d04c1427519cad749f311f6d Mon Sep 17 00:00:00 2001 From: Jeremy Goldman Date: Fri, 11 Dec 2020 20:09:31 +0800 Subject: [PATCH] Settings JUnit test for PreferredNetworkModeContentObserverTest Biggest difference here: the use of a MockContentProvider Bug: 175389659 Test: atest -c PreferredNetworkModeContentObserverTest Change-Id: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a Merged-In: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a --- ...eferredNetworkModeContentObserverTest.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) rename tests/{robotests => unit}/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java (79%) diff --git a/tests/robotests/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java b/tests/unit/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java similarity index 79% rename from tests/robotests/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java rename to tests/unit/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java index 657b8b3dc9d..e07a8f140e0 100644 --- a/tests/robotests/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java +++ b/tests/unit/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java @@ -16,41 +16,43 @@ package com.android.settings.network; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.content.ContentResolver; import android.content.Context; 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.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; -@RunWith(RobolectricTestRunner.class) +@RunWith(AndroidJUnit4.class) public class PreferredNetworkModeContentObserverTest { private static final int SUB_ID = 1; - @Mock - private ContentResolver mResolver; - @Mock private Context mContext; + private MockContentResolver mResolver; + private PreferredNetworkModeContentObserver mPreferredNetworkModeContentObserver; + @Mock private PreferredNetworkModeContentObserver.OnPreferredNetworkModeChangedListener mListener; - private PreferredNetworkModeContentObserver mPreferredNetworkModeContentObserver; @Before public void setUp() { MockitoAnnotations.initMocks(this); - when(mContext.getContentResolver()).thenReturn(mResolver); + mContext = spy(ApplicationProvider.getApplicationContext()); + + mResolver = spy(new MockContentResolver(mContext)); + when(mContext.getContentResolver()).thenReturn(mResolver); mPreferredNetworkModeContentObserver = spy(new PreferredNetworkModeContentObserver(null)); } @@ -68,8 +70,8 @@ public class PreferredNetworkModeContentObserverTest { mPreferredNetworkModeContentObserver.register(mContext, SUB_ID); verify(mResolver).registerContentObserver( - Settings.Global.getUriFor(Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID), false, - mPreferredNetworkModeContentObserver); + Settings.Global.getUriFor(Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID), false, + mPreferredNetworkModeContentObserver); } @Test @@ -78,5 +80,4 @@ public class PreferredNetworkModeContentObserverTest { verify(mResolver).unregisterContentObserver(mPreferredNetworkModeContentObserver); } - }