From 7aa7ece7a2a98dec63c76f8c501b221c42eb8034 Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Mon, 17 Dec 2018 15:56:56 +0800 Subject: [PATCH] Fix build failed of Settings test cases while importing AndroidX - API change in AndroidX Preference causes a build breakage - Apply explicit casting for the new API interface Test: robotest Fixes: 121109361 Change-Id: If3e7be9e53c7860252523700d6721ae4956db68a --- .../connecteddevice/AvailableMediaDeviceGroupControllerTest.java | 3 ++- .../connecteddevice/ConnectedDeviceGroupControllerTest.java | 3 ++- .../connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java | 8 +++++--- .../settings/deviceinfo/BuildNumberPreferenceControllerTest.java | 2 +- .../settings/notification/WorkSoundPreferenceControllerTest.java | 9 +++++---- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java index 8470ef9c25..c4b5901d97 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java @@ -119,7 +119,8 @@ public class AvailableMediaDeviceGroupControllerTest { mAvailableMediaDeviceGroupController.onDeviceAdded(mPreference); assertThat(mPreferenceGroup.isVisible()).isTrue(); - assertThat(mPreferenceGroup.findPreference(PREFERENCE_KEY_1)).isEqualTo(mPreference); + assertThat((Preference) mPreferenceGroup.findPreference(PREFERENCE_KEY_1)) + .isEqualTo(mPreference); } @Test diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java index c9e2644b1b..23754a05d3 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java @@ -100,7 +100,8 @@ public class ConnectedDeviceGroupControllerTest { mConnectedDeviceGroupController.onDeviceAdded(mPreference); assertThat(mPreferenceGroup.isVisible()).isTrue(); - assertThat(mPreferenceGroup.findPreference(PREFERENCE_KEY_1)).isEqualTo(mPreference); + assertThat((Preference) mPreferenceGroup.findPreference(PREFERENCE_KEY_1)) + .isEqualTo(mPreference); } @Test diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java index 38c92c3a2d..b16a453632 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java @@ -29,6 +29,7 @@ import android.hardware.usb.UsbPort; import android.os.Handler; import androidx.fragment.app.FragmentActivity; +import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; @@ -122,8 +123,8 @@ public class UsbDetailsPowerRoleControllerTest { UsbPort.POWER_ROLE_SINK, UsbPort.DATA_ROLE_DEVICE); assertThat(mPreference.isEnabled()).isFalse(); - assertThat(mScreen.findPreference(mDetailsPowerRoleController.getPreferenceKey())) - .isEqualTo(mPreference); + assertThat((Preference) mScreen.findPreference( + mDetailsPowerRoleController.getPreferenceKey())).isEqualTo(mPreference); } @Test @@ -134,7 +135,8 @@ public class UsbDetailsPowerRoleControllerTest { mDetailsPowerRoleController.refresh(true, UsbManager.FUNCTION_NONE, UsbPort.POWER_ROLE_SINK, UsbPort.DATA_ROLE_DEVICE); - assertThat(mScreen.findPreference(mDetailsPowerRoleController.getPreferenceKey())).isNull(); + assertThat((Preference) mScreen.findPreference( + mDetailsPowerRoleController.getPreferenceKey())).isNull(); } @Test diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index fb674abb0a..5fb17470c6 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -105,7 +105,7 @@ public class BuildNumberPreferenceControllerTest { public void displayPref_shouldAlwaysDisplay() { mController.displayPreference(mScreen); - verify(mScreen.findPreference(mController.getPreferenceKey())) + verify((Preference) mScreen.findPreference(mController.getPreferenceKey())) .setSummary(BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY)); verify(mScreen, never()).removePreference(any(Preference.class)); } diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java index d6a594a72b..fb4747c7fe 100644 --- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java @@ -218,7 +218,8 @@ public class WorkSoundPreferenceControllerTest { mController.displayPreference(mScreen); mController.onResume(); - verify(mWorkCategory.findPreference(KEY_WORK_PHONE_RINGTONE)).setVisible(false); + verify((Preference) mWorkCategory.findPreference(KEY_WORK_PHONE_RINGTONE)) + .setVisible(false); } @Test @@ -242,11 +243,11 @@ public class WorkSoundPreferenceControllerTest { verify(mWorkCategory, times(2)).setVisible(true); // Sound preferences should explain that the profile isn't available yet. - verify(mWorkCategory.findPreference(KEY_WORK_PHONE_RINGTONE)) + verify((Preference) mWorkCategory.findPreference(KEY_WORK_PHONE_RINGTONE)) .setSummary(eq(notAvailable)); - verify(mWorkCategory.findPreference(KEY_WORK_NOTIFICATION_RINGTONE)) + verify((Preference) mWorkCategory.findPreference(KEY_WORK_NOTIFICATION_RINGTONE)) .setSummary(eq(notAvailable)); - verify(mWorkCategory.findPreference(KEY_WORK_ALARM_RINGTONE)) + verify((Preference) mWorkCategory.findPreference(KEY_WORK_ALARM_RINGTONE)) .setSummary(eq(notAvailable)); } -- 2.11.0