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

Commit 36dfb5ac authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Fix SettingsRoboTests

Mock the getViewLifecycleOwner in test to fix.

Fix: 287387514
Test: m RunSettingsRoboTests
Change-Id: I346930e9655e4f78227276aee4c2a4e5ae6962e0
parent e1c9d65c
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.content.pm.ServiceInfo;
import android.view.accessibility.AccessibilityManager;

import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
@@ -93,6 +94,7 @@ public class AccessibilitySettingsForSetupWizardTest {
        when(mAccessibilityManager.getInstalledAccessibilityServiceList()).thenReturn(
                mAccessibilityServices);
        doReturn(mActivity).when(mFragment).getActivity();
        doReturn(mock(LifecycleOwner.class)).when(mFragment).getViewLifecycleOwner();
        doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
    }

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.google.common.truth.Truth.assertThat;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;

@@ -29,6 +30,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;

import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.LifecycleOwner;
import androidx.test.core.app.ApplicationProvider;

import com.android.settings.R;
@@ -73,6 +75,7 @@ public class TextReadingPreferenceFragmentForSetupWizardTest {
        final LayoutPreference resetPreference =
                new LayoutPreference(mContext, R.layout.accessibility_text_reading_reset_button);
        doReturn(mContext).when(mFragment).getContext();
        doReturn(mock(LifecycleOwner.class)).when(mFragment).getViewLifecycleOwner();
        doReturn(resetPreference).when(mFragment).findPreference(RESET_KEY);
        doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
    }
+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -27,6 +28,7 @@ import static org.mockito.Mockito.when;
import android.app.settings.SettingsEnums;
import android.content.Context;

import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
@@ -75,6 +77,7 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest {
        mFragment =
                spy(new TestToggleScreenMagnificationPreferenceFragmentForSetupWizard(mContext));
        doReturn(mActivity).when(mFragment).getActivity();
        doReturn(mock(LifecycleOwner.class)).when(mFragment).getViewLifecycleOwner();
        when(mActivity.getSwitchBar()).thenReturn(mSwitchBar);
        doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
    }
+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,6 +29,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;

import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
@@ -72,6 +74,7 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizardTest {
    public void setUp() {
        mFragment = spy(new TestToggleScreenReaderPreferenceFragmentForSetupWizard(mContext));
        doReturn(mActivity).when(mFragment).getActivity();
        doReturn(mock(LifecycleOwner.class)).when(mFragment).getViewLifecycleOwner();
        when(mActivity.getSwitchBar()).thenReturn(mSwitchBar);
        doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
    }
+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,6 +29,7 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;

import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
@@ -72,6 +74,7 @@ public class ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest {
    public void setUp() {
        mFragment = spy(new TestToggleSelectToSpeakPreferenceFragmentForSetupWizard(mContext));
        doReturn(mActivity).when(mFragment).getActivity();
        doReturn(mock(LifecycleOwner.class)).when(mFragment).getViewLifecycleOwner();
        when(mActivity.getSwitchBar()).thenReturn(mSwitchBar);
        doReturn(mFooterBarMixin).when(mGlifLayoutView).getMixin(FooterBarMixin.class);
    }