Merge "[Settings] Fix failure test case" am: 57a7978f8c

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

Change-Id: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
This commit is contained in:
Bonian Chen
2021-12-14 02:30:55 +00:00
committed by Automerger Merge Worker

View File

@@ -74,12 +74,12 @@ public class WifiCallingSettingsForSubTest {
private static final String BUTTON_WFC_MODE = "wifi_calling_mode"; 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 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 = private static final String TEST_EMERGENCY_ADDRESS_CARRIER_APP =
"com.android.settings/.wifi.calling.TestEmergencyAddressCarrierApp"; "com.android.settings/.wifi.calling.TestEmergencyAddressCarrierApp";
private TestFragment mFragment; private TestFragment mFragment;
private Context mContext; private Context mContext;
private TextView mEmptyView;
private final PersistableBundle mBundle = new PersistableBundle(); private final PersistableBundle mBundle = new PersistableBundle();
private MockWifiCallingQueryImsState mQueryImsState; private MockWifiCallingQueryImsState mQueryImsState;
@@ -100,6 +100,8 @@ public class WifiCallingSettingsForSubTest {
@Mock @Mock
private View mView; private View mView;
@Mock @Mock
private LinkifyDescriptionPreference mDescriptionView;
@Mock
private ListWithEntrySummaryPreference mButtonWfcMode; private ListWithEntrySummaryPreference mButtonWfcMode;
@Mock @Mock
private ListWithEntrySummaryPreference mButtonWfcRoamingMode; private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
@@ -126,12 +128,10 @@ public class WifiCallingSettingsForSubTest {
doReturn(mock(ListWithEntrySummaryPreference.class)).when(mFragment).findPreference(any()); doReturn(mock(ListWithEntrySummaryPreference.class)).when(mFragment).findPreference(any());
doReturn(mButtonWfcMode).when(mFragment).findPreference(BUTTON_WFC_MODE); doReturn(mButtonWfcMode).when(mFragment).findPreference(BUTTON_WFC_MODE);
doReturn(mButtonWfcRoamingMode).when(mFragment).findPreference(BUTTON_WFC_ROAMING_MODE); doReturn(mButtonWfcRoamingMode).when(mFragment).findPreference(BUTTON_WFC_ROAMING_MODE);
doReturn(mDescriptionView).when(mFragment).findPreference(PREFERENCE_NO_OPTIONS_DESC);
doNothing().when(mFragment).finish(); doNothing().when(mFragment).finish();
doReturn(mView).when(mFragment).getView(); doReturn(mView).when(mFragment).getView();
mEmptyView = new TextView(mContext);
doReturn(mEmptyView).when(mView).findViewById(android.R.id.empty);
mSwitchBar = new SettingsMainSwitchBar(mContext); mSwitchBar = new SettingsMainSwitchBar(mContext);
doReturn(mSwitchBar).when(mView).findViewById(R.id.switch_bar); doReturn(mSwitchBar).when(mView).findViewById(R.id.switch_bar);
@@ -211,8 +211,7 @@ public class WifiCallingSettingsForSubTest {
mFragment.onResume(); mFragment.onResume();
// Check that WFC roaming preference is shown. // Check that WFC roaming preference is shown.
verify(mPreferenceScreen, times(1)).addPreference(mButtonWfcRoamingMode); verify(mButtonWfcRoamingMode, times(1)).setVisible(true);
verify(mPreferenceScreen, never()).removePreference(mButtonWfcRoamingMode);
} }
@Test @Test
@@ -225,8 +224,7 @@ public class WifiCallingSettingsForSubTest {
mFragment.onResume(); mFragment.onResume();
// Check that WFC roaming preference is hidden. // Check that WFC roaming preference is hidden.
verify(mPreferenceScreen, never()).addPreference(mButtonWfcRoamingMode); verify(mButtonWfcRoamingMode, times(1)).setVisible(false);
verify(mPreferenceScreen, times(1)).removePreference(mButtonWfcRoamingMode);
} }
@Test @Test
@@ -239,8 +237,7 @@ public class WifiCallingSettingsForSubTest {
mFragment.onResume(); mFragment.onResume();
// Check that WFC roaming preference is hidden. // Check that WFC roaming preference is hidden.
verify(mPreferenceScreen, never()).addPreference(mButtonWfcRoamingMode); verify(mButtonWfcRoamingMode, times(1)).setVisible(false);
verify(mPreferenceScreen, times(1)).removePreference(mButtonWfcRoamingMode);
} }
@Test @Test
@@ -253,8 +250,7 @@ public class WifiCallingSettingsForSubTest {
mFragment.onResume(); mFragment.onResume();
// Check that WFC roaming preference is hidden. // Check that WFC roaming preference is hidden.
verify(mPreferenceScreen, never()).addPreference(mButtonWfcRoamingMode); verify(mButtonWfcRoamingMode, times(1)).setVisible(false);
verify(mPreferenceScreen, times(1)).removePreference(mButtonWfcRoamingMode);
} }
@Test @Test
@@ -332,9 +328,9 @@ public class WifiCallingSettingsForSubTest {
Activity.RESULT_OK, null); Activity.RESULT_OK, null);
// Check the WFC preferences is added. // Check the WFC preferences is added.
verify(mPreferenceScreen).addPreference(mButtonWfcMode); verify(mButtonWfcMode).setVisible(true);
verify(mPreferenceScreen).addPreference(mButtonWfcRoamingMode); verify(mButtonWfcRoamingMode).setVisible(true);
verify(mPreferenceScreen).addPreference(mUpdateAddress); verify(mUpdateAddress).setVisible(true);
// Check the WFC enable request. // Check the WFC enable request.
verify(mImsMmTelManager).setVoWiFiSettingEnabled(true); verify(mImsMmTelManager).setVoWiFiSettingEnabled(true);
} }