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

Merge "Fix flaky NotificationAssistantPreferenceControllerTest" into sc-dev am: 8f5ccfaef0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14810398

Change-Id: I143807946ce9ad4591320aef21ed34b175e08faf
This commit is contained in:
Chloris Kuo
2021-06-03 17:42:33 +00:00
committed by Automerger Merge Worker
parent 09ed6e8e29 8f5ccfaef0
commit 511a2ceffa
1 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/robotests/src/com/android/settings/notification/NotificationAssistantPreferenceControllerTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.notification; package com.android.settings.notification;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
@@ -24,6 +23,7 @@ import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -117,18 +117,10 @@ public class NotificationAssistantPreferenceControllerTest {
//Test user enable for the first time //Test user enable for the first time
mPreferenceController.setNotificationAssistantGranted(mNASComponent); mPreferenceController.setNotificationAssistantGranted(mNASComponent);
assertEquals(1, Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.NAS_SETTINGS_UPDATED, 0, 0));
assertEquals(1, Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.NAS_SETTINGS_UPDATED, 0, 10));
verify(mBackend, times(1))
.setNASMigrationDoneAndResetDefault(eq(0), eq(true));
//Test user enable again, migration should not happen
mPreferenceController.setNotificationAssistantGranted(mNASComponent);
//Number of invocations should not increase
verify(mBackend, times(1)) verify(mBackend, times(1))
.setNASMigrationDoneAndResetDefault(eq(0), eq(true)); .setNASMigrationDoneAndResetDefault(eq(0), eq(true));
verify(mBackend, never())
.setNASMigrationDoneAndResetDefault(eq(10), anyBoolean());
} }
@Test @Test
@@ -141,18 +133,10 @@ public class NotificationAssistantPreferenceControllerTest {
//Test user 0 enable for the first time //Test user 0 enable for the first time
mPreferenceController.setNotificationAssistantGranted(mNASComponent); mPreferenceController.setNotificationAssistantGranted(mNASComponent);
assertEquals(1, Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.NAS_SETTINGS_UPDATED, 0, 0));
assertEquals(0, Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.NAS_SETTINGS_UPDATED, 0, 20));
verify(mBackend, times(1))
.setNASMigrationDoneAndResetDefault(eq(0), eq(true));
//Test user enable again, migration should not happen
mPreferenceController.setNotificationAssistantGranted(mNASComponent);
//Number of invocations should not increase
verify(mBackend, times(1)) verify(mBackend, times(1))
.setNASMigrationDoneAndResetDefault(eq(0), eq(true)); .setNASMigrationDoneAndResetDefault(eq(0), eq(true));
verify(mBackend, never())
.setNASMigrationDoneAndResetDefault(eq(20), anyBoolean());
} }
@Test @Test
@@ -165,18 +149,10 @@ public class NotificationAssistantPreferenceControllerTest {
//Test user disable for the first time //Test user disable for the first time
mPreferenceController.setChecked(false); mPreferenceController.setChecked(false);
assertEquals(1, Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.NAS_SETTINGS_UPDATED, 0, 0));
assertEquals(1, Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.NAS_SETTINGS_UPDATED, 0, 10));
verify(mBackend, times(1))
.setNASMigrationDoneAndResetDefault(eq(0), eq(false));
//Test user disable again, migration should not happen
mPreferenceController.setChecked(false);
//Number of invocations should not increase
verify(mBackend, times(1)) verify(mBackend, times(1))
.setNASMigrationDoneAndResetDefault(eq(0), eq(false)); .setNASMigrationDoneAndResetDefault(eq(0), eq(false));
verify(mBackend, never())
.setNASMigrationDoneAndResetDefault(eq(10), anyBoolean());
} }
} }