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

Fix broken tests

Browse Source 
Test: robo tests
Fixes: 130871450
Change-Id: If7b01147f5680392c7635f3a3b4e558aa56a633e
This commit is contained in:
Julia Reynolds
2019-04-19 10:01:53 -04:00
parent fb250122f8
commit 9c5a19319b
8 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java
View File

@@ -139,7 +139,7 @@ public class AllowSoundPreferenceControllerTest {
}
@Test
public void testUpdateState_notConfigurable() {
public void testUpdateState_notBlockable() {
String lockedId = "locked";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = lockedId;
@@ -150,7 +150,7 @@ public class AllowSoundPreferenceControllerTest {
Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertFalse(pref.isEnabled());
assertTrue(pref.isEnabled());
}
@Test

4
tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java
View File

@@ -187,7 +187,7 @@ public class BadgePreferenceControllerTest {
}
@Test
public void testUpdateState_channelNotConfigurable() {
public void testUpdateState_channelNotBlockable() {
String lockedId = "locked";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = lockedId;
@@ -198,7 +198,7 @@ public class BadgePreferenceControllerTest {
Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertFalse(pref.isEnabled());
assertTrue(pref.isEnabled());
}
@Test

4
tests/robotests/src/com/android/settings/notification/BubblePreferenceControllerTest.java
View File

@@ -202,7 +202,7 @@ public class BubblePreferenceControllerTest {
}
@Test
public void testUpdateState_channelNotConfigurable() {
public void testUpdateState_channelNotBlockable() {
String lockedId = "locked";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = lockedId;
@@ -213,7 +213,7 @@ public class BubblePreferenceControllerTest {
Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertFalse(pref.isEnabled());
assertTrue(pref.isEnabled());
}
@Test

4
tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java
View File

@@ -110,7 +110,7 @@ public class DndPreferenceControllerTest {
}
@Test
public void testUpdateState_notConfigurable() {
public void testUpdateState_notBlockable() {
String lockedId = "locked";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = lockedId;
@@ -121,7 +121,7 @@ public class DndPreferenceControllerTest {
Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
mController.updateState(pref);
assertFalse(pref.isEnabled());
assertTrue(pref.isEnabled());
}
@Test

15
tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java
View File

@@ -158,7 +158,7 @@ public class LightsPreferenceControllerTest {
}
@Test
public void testUpdateState_notConfigurable() {
public void testUpdateState_notBlockable() {
String lockedId = "locked";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = lockedId;
@@ -169,19 +169,6 @@ public class LightsPreferenceControllerTest {
Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertFalse(pref.isEnabled());
}
@Test
public void testUpdateState_configurable() {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn("something");
mController.onResume(appRow, channel, null, null);
Preference pref = new RestrictedSwitchPreference(mContext);
mController.updateState(pref);
assertTrue(pref.isEnabled());
}

5
tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
View File

@@ -209,6 +209,7 @@ public class NotificationPreferenceControllerTest {
appRow.lockedChannelId = sameId;
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getId()).thenReturn(sameId);
when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
mController.onResume(appRow, channel, null, null);
assertFalse(mController.isChannelBlockable());
@@ -223,8 +224,10 @@ public class NotificationPreferenceControllerTest {
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = "something";
appRow.lockedImportance = true;
NotificationChannel channel = mock(NotificationChannel.class);
when(channel.getImportance()).thenReturn(IMPORTANCE_LOW);
mController.onResume(appRow, mock(NotificationChannel.class), null, null);
mController.onResume(appRow, channel, null, null);
assertFalse(mController.isChannelBlockable());
appRow.lockedImportance = false;

4
tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
View File

@@ -161,7 +161,7 @@ public class SoundPreferenceControllerTest {
}
@Test
public void testUpdateState_notConfigurable() {
public void testUpdateState_notBlockable() {
String lockedId = "locked";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = lockedId;
@@ -173,7 +173,7 @@ public class SoundPreferenceControllerTest {
Preference pref = new NotificationSoundPreference(mContext, attributeSet);
mController.updateState(pref);
assertFalse(pref.isEnabled());
assertTrue(pref.isEnabled());
}
@Test

4
tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java
View File

@@ -140,7 +140,7 @@ public class VibrationPreferenceControllerTest {
}
@Test
public void testUpdateState_notConfigurable() {
public void testUpdateState_notBlockable() {
String lockedId = "locked";
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
appRow.lockedChannelId = lockedId;
@@ -151,7 +151,7 @@ public class VibrationPreferenceControllerTest {
Preference pref = new RestrictedSwitchPreference(RuntimeEnvironment.application);
mController.updateState(pref);
assertFalse(pref.isEnabled());
assertTrue(pref.isEnabled());
}
@Test