PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WifiCallingSettingsForSubTest: Solve casting problem in setup

Browse Source 
Solves casting problem in WifiCallingSettingsForSubTest that causes all
tests in this file to fail in the setup-function.

The wfc mode buttons has changed from being a ListPreference to be a
ListWithEntrySummaryPreference. The test cases have now been updated
accordingly.

Problem was introduced by the following two patches that conflict with
each other. The test cases in WifiCallingSettingsForSubTest works
correctly when each patch is tested in isolation, but failed when they
were both merged:
73ffcf4999
8498436a96

Bug: 129545431
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Change-Id: Ib6988e514bbad2023ba6cfc2e1d8734b68cabc31
This commit is contained in:
Torbjorn Eklund
2019-03-28 13:18:47 +01:00
parent bdef91f964
commit 428ba7cde6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
View File

@@ -92,8 +92,8 @@ public class WifiCallingSettingsForSubTest {
@Mock private ToggleSwitch mToggleSwitch; @Mock private ToggleSwitch mToggleSwitch;
@Mock private View mView; @Mock private View mView;
@Mock private ImsConfig mImsConfig; @Mock private ImsConfig mImsConfig;
@Mock private ListPreference mButtonWfcMode; @Mock private ListWithEntrySummaryPreference mButtonWfcMode;
@Mock private ListPreference mButtonWfcRoamingMode; @Mock private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
@Mock private Preference mUpdateAddress; @Mock private Preference mUpdateAddress;
@Before @Before