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

Commit 3654b61e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Mock WifiPickerTracker.class for Roboletric test-cases"

parents 8a0d26dc ea0425e1

tests/robotests/src/com/android/settings/network/WifiConnectionPreferenceControllerTest.java

+6 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.network; 
import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyLong;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;
@@ -33,6 +34,7 @@ import androidx.lifecycle.LifecycleOwner; 
import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceScreen;



import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.wifi.WifiConnectionPreferenceController;

import com.android.settings.wifi.WifiEntryPreference;

import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -40,7 +42,6 @@ import com.android.wifitrackerlib.WifiEntry; 
import com.android.wifitrackerlib.WifiPickerTracker;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;
@@ -50,7 +51,6 @@ import org.robolectric.RobolectricTestRunner; 
import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

@Ignore

public class WifiConnectionPreferenceControllerTest {

    private static final String KEY = "wifi_connection";
@@ -72,6 +72,10 @@ public class WifiConnectionPreferenceControllerTest { 
    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = spy(RuntimeEnvironment.application);

        FakeFeatureFactory fakeFeatureFactory = FakeFeatureFactory.setupForTest();

        when(fakeFeatureFactory.wifiTrackerLibProvider.createWifiPickerTracker(

                any(), any(), any(), any(), any(), anyLong(), anyLong(), any()))

                .thenReturn(mWifiPickerTracker);

        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = new Lifecycle(mLifecycleOwner);

        when(mScreen.findPreference(eq(KEY))).thenReturn(mPreferenceCategory);

tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java

+7 −8
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.wifi; 
import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyLong;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;
@@ -35,13 +36,12 @@ import android.os.Bundle; 
import androidx.annotation.Nullable;

import androidx.appcompat.app.AlertDialog;



import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;

import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;

import com.android.settingslib.wifi.WifiTracker;

import com.android.settingslib.wifi.WifiTrackerFactory;

import com.android.wifitrackerlib.WifiPickerTracker;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.MockitoAnnotations;
@@ -55,7 +55,6 @@ import java.util.ArrayList; 
import java.util.List;



@RunWith(RobolectricTestRunner.class)

@Ignore

@Config(shadows = ShadowAlertDialogCompat.class)

public class NetworkRequestDialogActivityTest {
@@ -69,11 +68,11 @@ public class NetworkRequestDialogActivityTest { 
    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        mContext = spy(RuntimeEnvironment.application);



        WifiTracker wifiTracker = mock(WifiTracker.class);

        WifiTrackerFactory.setTestingWifiTracker(wifiTracker);

        FakeFeatureFactory fakeFeatureFactory = FakeFeatureFactory.setupForTest();

        when(fakeFeatureFactory.wifiTrackerLibProvider.createWifiPickerTracker(

                any(), any(), any(), any(), any(), anyLong(), anyLong(), any()))

                .thenReturn(mock(WifiPickerTracker.class));



        NetworkRequestDialogActivity activity =

            Robolectric.setupActivity(NetworkRequestDialogActivity.class);

tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java

+10 −2
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.settings.wifi; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyLong;

import static org.mockito.Mockito.inOrder;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;
@@ -38,15 +40,16 @@ import androidx.appcompat.app.AlertDialog; 
import androidx.fragment.app.FragmentActivity;



import com.android.settings.R;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;

import com.android.wifitrackerlib.WifiEntry;

import com.android.wifitrackerlib.WifiPickerTracker;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.InOrder;

import org.mockito.MockitoAnnotations;

import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;
@@ -56,7 +59,6 @@ import java.util.ArrayList; 
import java.util.List;



@RunWith(RobolectricTestRunner.class)

@Ignore

@Config(shadows = ShadowAlertDialogCompat.class)

public class NetworkRequestDialogFragmentTest {
@@ -69,6 +71,12 @@ public class NetworkRequestDialogFragmentTest { 


    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        FakeFeatureFactory fakeFeatureFactory = FakeFeatureFactory.setupForTest();

        when(fakeFeatureFactory.wifiTrackerLibProvider.createWifiPickerTracker(

                any(), any(), any(), any(), any(), anyLong(), anyLong(), any()))

                .thenReturn(mock(WifiPickerTracker.class));



        mActivity = Robolectric.buildActivity(FragmentActivity.class,

                new Intent().putExtra(NetworkRequestDialogFragment.EXTRA_APP_NAME,

                        TEST_APP_NAME)).setup().get();

tests/robotests/src/com/android/settings/wifi/NetworkRequestErrorDialogFragmentTest.java

+11 −6
Original line number Diff line number Diff line
@@ -19,9 +19,12 @@ package com.android.settings.wifi; 
import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assert.fail;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyLong;

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 static org.mockito.internal.verification.VerificationModeFactory.times;



import android.content.DialogInterface;
@@ -32,22 +35,21 @@ import android.widget.Button; 
import androidx.appcompat.app.AlertDialog;



import com.android.settings.R;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;

import com.android.settings.wifi.NetworkRequestErrorDialogFragment.ERROR_DIALOG_TYPE;

import com.android.settingslib.wifi.WifiTracker;

import com.android.settingslib.wifi.WifiTrackerFactory;

import com.android.wifitrackerlib.WifiPickerTracker;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.MockitoAnnotations;

import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



@RunWith(RobolectricTestRunner.class)

@Ignore

@Config(shadows = ShadowAlertDialogCompat.class)

public class NetworkRequestErrorDialogFragmentTest {
@@ -56,8 +58,11 @@ public class NetworkRequestErrorDialogFragmentTest { 


    @Before

    public void setUp() {

        WifiTracker wifiTracker = mock(WifiTracker.class);

        WifiTrackerFactory.setTestingWifiTracker(wifiTracker);

        MockitoAnnotations.initMocks(this);

        FakeFeatureFactory fakeFeatureFactory = FakeFeatureFactory.setupForTest();

        when(fakeFeatureFactory.wifiTrackerLibProvider.createWifiPickerTracker(

                any(), any(), any(), any(), any(), anyLong(), anyLong(), any()))

                .thenReturn(mock(WifiPickerTracker.class));



        mActivity = Robolectric.setupActivity(NetworkRequestDialogActivity.class);

        mFragment = spy(NetworkRequestErrorDialogFragment.newInstance());