commit c621a5517e05fc633209fc97133d4ebd380bbca9
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 08 05:10:48 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 08 05:10:48 2019 +0000
tree 9315f1bcbad9712d4c0cdffb6d52342ef6389948
parent 2aa5a8adf1c739a02d933de14597948b48f291fb
parent a330abba0a8c1f39267cc88da2215ca8a150bde7

Merge "Fix broken tests."

tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
index 3f53ce9..a1b65c5 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
@@ -81,7 +81,7 @@
     @Test
     public void display_shouldDisplay() {
         when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
-        DeviceConfig.setProperty("namespace", "key", "false", false);
+        DeviceConfig.setProperty("telephony", "ramping_ringer_enabled", "false", false);
         mController.displayPreference(mScreen);
         assertThat(mPreference.isVisible()).isTrue();
     }
@@ -89,7 +89,7 @@
     @Test
     public void display_shouldNotDisplay_notVoiceCapable() {
         when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
-        DeviceConfig.setProperty("namespace", "key", "false", false);
+        DeviceConfig.setProperty("telephony", "ramping_ringer_enabled", "false", false);
         mController.displayPreference(mScreen);
         assertThat(mPreference.isVisible()).isFalse();
     }
@@ -97,7 +97,7 @@
     @Test
     public void display_shouldNotDisplay_RampingRingerEnabled() {
         when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
-        DeviceConfig.setProperty("namespace", "key", "true", false);
+        DeviceConfig.setProperty("telephony", "ramping_ringer_enabled", "true", false);
         mController.displayPreference(mScreen);
         assertThat(mPreference.isVisible()).isFalse();
     }
@@ -105,7 +105,7 @@
     @Test
     public void display_shouldNotDisplay_VoiceEnabled_RampingRingerEnabled() {
         when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
-        DeviceConfig.setProperty("namespace", "key", "true", false);
+        DeviceConfig.setProperty("telephony", "ramping_ringer_enabled", "true", false);
         mController.displayPreference(mScreen);
         assertThat(mPreference.isVisible()).isFalse();
     }
@@ -113,7 +113,7 @@
     @Test
     public void display_shouldNotDisplay_VoiceDisabled_RampingRingerEnabled() {
         when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
-        DeviceConfig.setProperty("namespace", "key", "true", false);
+        DeviceConfig.setProperty("telephony", "ramping_ringer_enabled", "true", false);
         mController.displayPreference(mScreen);
         assertThat(mPreference.isVisible()).isFalse();
     }
@@ -139,14 +139,14 @@
     @Test
     public void voiceCapable_availabled() {
         when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
-        DeviceConfig.setProperty("namespace", "key", "false", false);
+        DeviceConfig.setProperty("telephony", "ramping_ringer_enabled", "false", false);
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
 
     @Test
     public void voiceCapable_notAvailabled() {
         when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
-        DeviceConfig.setProperty("namespace", "key", "false", false);
+        DeviceConfig.setProperty("telephony", "ramping_ringer_enabled", "false", false);
         assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }