From 36dfb5ac0b181c7580492d45c7dc4f6136490645 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Thu, 15 Jun 2023 16:33:05 +0800 Subject: [PATCH] Fix SettingsRoboTests Mock the getViewLifecycleOwner in test to fix. Fix: 287387514 Test: m RunSettingsRoboTests Change-Id: I346930e9655e4f78227276aee4c2a4e5ae6962e0 --- .../accessibility/AccessibilitySettingsForSetupWizardTest.java | 2 ++ .../TextReadingPreferenceFragmentForSetupWizardTest.java | 3 +++ ...creenMagnificationPreferenceFragmentForSetupWizardTest.java | 3 +++ ...ToggleScreenReaderPreferenceFragmentForSetupWizardTest.java | 3 +++ ...oggleSelectToSpeakPreferenceFragmentForSetupWizardTest.java | 3 +++ 5 files changed, 14 insertions(+) diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java index e14e27109e0..ea2852fd75e 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardTest.java @@ -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); } diff --git a/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizardTest.java b/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizardTest.java index 1cd301f98b9..4ee2a2dedbd 100644 --- a/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizardTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/TextReadingPreferenceFragmentForSetupWizardTest.java @@ -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); } diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest.java index 84783b21a3a..aa622f58afd 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizardTest.java @@ -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); } diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizardTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizardTest.java index c604652fd50..77e5b1f9b9d 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizardTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizardTest.java @@ -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); } diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest.java index 78938310d9a..8878064afa0 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizardTest.java @@ -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); }