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

Commit 718c1703 authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Fix failure test case" am: 57a7978f am: 54ee717d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457

Change-Id: I2da154061359ad72ffa736873f06052be93ed721
parents 2bed5402 54ee717d
Loading
Loading
Loading
Loading
+11 −15
Original line number Diff line number Diff line
@@ -74,12 +74,12 @@ public class WifiCallingSettingsForSubTest {

    private static final String BUTTON_WFC_MODE = "wifi_calling_mode";
    private static final String BUTTON_WFC_ROAMING_MODE = "wifi_calling_roaming_mode";
    private static final String PREFERENCE_NO_OPTIONS_DESC = "no_options_description";
    private static final String TEST_EMERGENCY_ADDRESS_CARRIER_APP =
            "com.android.settings/.wifi.calling.TestEmergencyAddressCarrierApp";

    private TestFragment mFragment;
    private Context mContext;
    private TextView mEmptyView;
    private final PersistableBundle mBundle = new PersistableBundle();

    private MockWifiCallingQueryImsState mQueryImsState;
@@ -100,6 +100,8 @@ public class WifiCallingSettingsForSubTest {
    @Mock
    private View mView;
    @Mock
    private LinkifyDescriptionPreference mDescriptionView;
    @Mock
    private ListWithEntrySummaryPreference mButtonWfcMode;
    @Mock
    private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
@@ -126,12 +128,10 @@ public class WifiCallingSettingsForSubTest {
        doReturn(mock(ListWithEntrySummaryPreference.class)).when(mFragment).findPreference(any());
        doReturn(mButtonWfcMode).when(mFragment).findPreference(BUTTON_WFC_MODE);
        doReturn(mButtonWfcRoamingMode).when(mFragment).findPreference(BUTTON_WFC_ROAMING_MODE);
        doReturn(mDescriptionView).when(mFragment).findPreference(PREFERENCE_NO_OPTIONS_DESC);
        doNothing().when(mFragment).finish();
        doReturn(mView).when(mFragment).getView();

        mEmptyView = new TextView(mContext);
        doReturn(mEmptyView).when(mView).findViewById(android.R.id.empty);

        mSwitchBar = new SettingsMainSwitchBar(mContext);
        doReturn(mSwitchBar).when(mView).findViewById(R.id.switch_bar);

@@ -211,8 +211,7 @@ public class WifiCallingSettingsForSubTest {
        mFragment.onResume();

        // Check that WFC roaming preference is shown.
        verify(mPreferenceScreen, times(1)).addPreference(mButtonWfcRoamingMode);
        verify(mPreferenceScreen, never()).removePreference(mButtonWfcRoamingMode);
        verify(mButtonWfcRoamingMode, times(1)).setVisible(true);
    }

    @Test
@@ -225,8 +224,7 @@ public class WifiCallingSettingsForSubTest {
        mFragment.onResume();

        // Check that WFC roaming preference is hidden.
        verify(mPreferenceScreen, never()).addPreference(mButtonWfcRoamingMode);
        verify(mPreferenceScreen, times(1)).removePreference(mButtonWfcRoamingMode);
        verify(mButtonWfcRoamingMode, times(1)).setVisible(false);
    }

    @Test
@@ -239,8 +237,7 @@ public class WifiCallingSettingsForSubTest {
        mFragment.onResume();

        // Check that WFC roaming preference is hidden.
        verify(mPreferenceScreen, never()).addPreference(mButtonWfcRoamingMode);
        verify(mPreferenceScreen, times(1)).removePreference(mButtonWfcRoamingMode);
        verify(mButtonWfcRoamingMode, times(1)).setVisible(false);
    }

    @Test
@@ -253,8 +250,7 @@ public class WifiCallingSettingsForSubTest {
        mFragment.onResume();

        // Check that WFC roaming preference is hidden.
        verify(mPreferenceScreen, never()).addPreference(mButtonWfcRoamingMode);
        verify(mPreferenceScreen, times(1)).removePreference(mButtonWfcRoamingMode);
        verify(mButtonWfcRoamingMode, times(1)).setVisible(false);
    }

    @Test
@@ -332,9 +328,9 @@ public class WifiCallingSettingsForSubTest {
                Activity.RESULT_OK, null);

        // Check the WFC preferences is added.
        verify(mPreferenceScreen).addPreference(mButtonWfcMode);
        verify(mPreferenceScreen).addPreference(mButtonWfcRoamingMode);
        verify(mPreferenceScreen).addPreference(mUpdateAddress);
        verify(mButtonWfcMode).setVisible(true);
        verify(mButtonWfcRoamingMode).setVisible(true);
        verify(mUpdateAddress).setVisible(true);
        // Check the WFC enable request.
        verify(mImsMmTelManager).setVoWiFiSettingEnabled(true);
    }