Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix flaky ScheduleCalendarTest"

Browse Source 
am: 08667cc9c1

Change-Id: If0c64d0a7b6f7a51f3a4d09b7ecf9cbad7ad6883
This commit is contained in:
Beverly
2018-10-16 05:44:38 -07:00
committed by android-build-merger
parent f0a45a4114 08667cc9c1
commit 97f1fa1688
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/tests/uiservicestests/src/com/android/server/notification/ScheduleCalendarTest.java
View File

@@ -121,7 +121,7 @@ public class ScheduleCalendarTest extends UiServiceTestCase {
cal.set(Calendar.MINUTE, 15); cal.set(Calendar.MINUTE, 15);
cal.set(Calendar.SECOND, 0); cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0); cal.set(Calendar.MILLISECOND, 0);
mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay() + 1}; mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay(1)};
mScheduleInfo.startHour = 1; mScheduleInfo.startHour = 1;
mScheduleInfo.endHour = 3; mScheduleInfo.endHour = 3;
mScheduleInfo.startMinute = 15; mScheduleInfo.startMinute = 15;
@@ -149,7 +149,7 @@ public class ScheduleCalendarTest extends UiServiceTestCase {
cal.set(Calendar.MINUTE, 15); cal.set(Calendar.MINUTE, 15);
cal.set(Calendar.SECOND, 0); cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0); cal.set(Calendar.MILLISECOND, 0);
mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay() + 1}; mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay(1)};
mScheduleInfo.startHour = 22; mScheduleInfo.startHour = 22;
mScheduleInfo.endHour = 3; mScheduleInfo.endHour = 3;
mScheduleInfo.startMinute = 15; mScheduleInfo.startMinute = 15;
@@ -250,7 +250,7 @@ public class ScheduleCalendarTest extends UiServiceTestCase {
calAlarm.add(Calendar.DATE, 1); // add a day calAlarm.add(Calendar.DATE, 1); // add a day
// ScheduleInfo: day 1, day 2: 9pm-7am // ScheduleInfo: day 1, day 2: 9pm-7am
mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay() + 1}; mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay(1)};
mScheduleInfo.startHour = 21; mScheduleInfo.startHour = 21;
mScheduleInfo.endHour = 7; mScheduleInfo.endHour = 7;
mScheduleInfo.startMinute = 0; mScheduleInfo.startMinute = 0;
@@ -418,7 +418,7 @@ public class ScheduleCalendarTest extends UiServiceTestCase {
now.set(Calendar.MILLISECOND, 0); now.set(Calendar.MILLISECOND, 0);
now.add(Calendar.DATE, 1); // add a day now.add(Calendar.DATE, 1); // add a day
mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay() + 1}; mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay(1)};
mScheduleInfo.startHour = 22; mScheduleInfo.startHour = 22;
mScheduleInfo.startMinute = 15; mScheduleInfo.startMinute = 15;
mScheduleInfo.endHour = 3; mScheduleInfo.endHour = 3;
@@ -446,7 +446,7 @@ public class ScheduleCalendarTest extends UiServiceTestCase {
now.set(Calendar.MILLISECOND, 0); now.set(Calendar.MILLISECOND, 0);
now.add(Calendar.DATE, 1); // add a day now.add(Calendar.DATE, 1); // add a day
mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay() + 1}; mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay(1)};
mScheduleInfo.startHour = 22; mScheduleInfo.startHour = 22;
mScheduleInfo.startMinute = 15; mScheduleInfo.startMinute = 15;
mScheduleInfo.endHour = 3; mScheduleInfo.endHour = 3;
@@ -464,4 +464,10 @@ public class ScheduleCalendarTest extends UiServiceTestCase {
private int getTodayDay() { private int getTodayDay() {
return new GregorianCalendar().get(Calendar.DAY_OF_WEEK); return new GregorianCalendar().get(Calendar.DAY_OF_WEEK);
} }
private int getTodayDay(int offset) {
Calendar cal = new GregorianCalendar();
cal.add(Calendar.DATE, offset);
return cal.get(Calendar.DAY_OF_WEEK);
}
} }