From 428ba7cde651273696021d4a7269351595304023 Mon Sep 17 00:00:00 2001 From: Torbjorn Eklund Date: Thu, 28 Mar 2019 13:18:47 +0100 Subject: [PATCH] WifiCallingSettingsForSubTest: Solve casting problem in setup 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: 73ffcf49990ab3134b139607c0225f6ae1646c18 8498436a9613c806d4e1085074aea22f1a78675a Bug: 129545431 Test: make RunSettingsRoboTests \ ROBOTEST_FILTER=WifiCallingSettingsForSubTest Change-Id: Ib6988e514bbad2023ba6cfc2e1d8734b68cabc31 --- .../settings/wifi/calling/WifiCallingSettingsForSubTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java index fbdc30361c1..8f01d39e73e 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java @@ -92,8 +92,8 @@ public class WifiCallingSettingsForSubTest { @Mock private ToggleSwitch mToggleSwitch; @Mock private View mView; @Mock private ImsConfig mImsConfig; - @Mock private ListPreference mButtonWfcMode; - @Mock private ListPreference mButtonWfcRoamingMode; + @Mock private ListWithEntrySummaryPreference mButtonWfcMode; + @Mock private ListWithEntrySummaryPreference mButtonWfcRoamingMode; @Mock private Preference mUpdateAddress; @Before