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

Commit 860fce72 authored by Eric Rahm's avatar Eric Rahm Committed by Android (Google) Code Review
Browse files

Merge "Revert "Test Fix SettingRobolectricTest Fail"" into main

parents 72dc40e4 802b9225

tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java

+0 −2
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import com.android.settings.wifi.tether.WifiTetherSecurityPreferenceController; 
import com.android.settingslib.core.lifecycle.Lifecycle;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -186,7 +185,6 @@ public class AllInOneTetherSettingsTest { 
                .getPreferenceControllers(mContext)).isNotEmpty();

    }



    @Ignore

    @Test

    public void createPreferenceControllers_hasAutoOffPreference() {

        assertThat(mAllInOneTetherSettings.createPreferenceControllers(mContext)

tests/robotests/src/com/android/settings/MainClearConfirmTest.java

+1 −4
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ import android.widget.TextView; 


import androidx.fragment.app.FragmentActivity;



import com.android.settings.utils.ActivityControllerWrapper;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -66,8 +64,7 @@ public class MainClearConfirmTest { 
    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mActivity = spy((FragmentActivity) ActivityControllerWrapper.setup(

                Robolectric.buildActivity(FragmentActivity.class)).get());

        mActivity = Robolectric.setupActivity(FragmentActivity.class);

        mMainClearConfirm = spy(new MainClearConfirm());

    }

tests/robotests/src/com/android/settings/MainClearTest.java

+1 −6
Original line number Diff line number Diff line
@@ -52,12 +52,10 @@ import androidx.fragment.app.FragmentActivity; 


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

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

import com.android.settings.utils.ActivityControllerWrapper;

import com.android.settingslib.development.DevelopmentSettingsEnabler;



import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;
@@ -113,8 +111,7 @@ public class MainClearTest { 
            @Override

            boolean showAnySubscriptionInfo(Context context) { return true; }

        });

        mActivity = spy((FragmentActivity) ActivityControllerWrapper.setup(

                Robolectric.buildActivity(FragmentActivity.class)).get());

        mActivity = Robolectric.setupActivity(FragmentActivity.class);

        mShadowActivity = Shadows.shadowOf(mActivity);

        UserManager userManager = mActivity.getSystemService(UserManager.class);

        mShadowUserManager = Shadow.extract(userManager);
@@ -151,7 +148,6 @@ public class MainClearTest { 
                .isTrue();

    }



    @Ignore

    @Test

    public void testShowFinalConfirmation_eraseEsimVisible_eraseEsimUnchecked() {

        final Context context = mock(Context.class);
@@ -237,7 +233,6 @@ public class MainClearTest { 
        assertThat(mMainClear.showWipeEuicc()).isTrue();

    }



    @Ignore

    @Test

    public void testShowWipeEuicc_developerMode_unprovisioned() {

        prepareEuiccState(

tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java

+8 −3
Original line number Diff line number Diff line
@@ -18,8 +18,14 @@ package com.android.settings; 


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



import static org.mockito.ArgumentMatchers.any;

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.Context;

import android.os.Looper;

import android.view.LayoutInflater;

import android.widget.TextView;
@@ -27,10 +33,10 @@ import androidx.fragment.app.FragmentActivity; 


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

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

import com.android.settings.utils.ActivityControllerWrapper;



import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -57,8 +63,7 @@ public class ResetNetworkConfirmTest { 
        MockitoAnnotations.initMocks(this);



        mResetNetworkConfirm = new ResetNetworkConfirm();

        mActivity = spy((FragmentActivity) ActivityControllerWrapper.setup(

                Robolectric.buildActivity(FragmentActivity.class)).get());

        mActivity = spy(Robolectric.setupActivity(FragmentActivity.class));

        mResetNetworkConfirm.mActivity = mActivity;

    }

tests/robotests/src/com/android/settings/ResetNetworkTest.java

+1 −4
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import android.content.Intent; 
import android.view.View;

import android.widget.CheckBox;



import com.android.settings.utils.ActivityControllerWrapper;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;
@@ -43,8 +41,7 @@ public class ResetNetworkTest { 


    @Before

    public void setUp() {

        mActivity = (Activity) ActivityControllerWrapper.setup(

                Robolectric.buildActivity(Activity.class)).get();

        mActivity = Robolectric.setupActivity(Activity.class);

        mResetNetwork = spy(new ResetNetwork());

        when(mResetNetwork.getContext()).thenReturn(mActivity);

        mResetNetwork.mEsimContainer = new View(mActivity);