diff options
| author | 2018-10-16 05:44:38 -0700 | |
|---|---|---|
| committer | 2018-10-16 05:44:38 -0700 | |
| commit | 97f1fa1688b5b2e390c2722f1eaa560b50043b05 (patch) | |
| tree | cd5867bb2aaa534305274c6d6b9a3c0cca886719 | |
| parent | f0a45a411439d1431a44159efcdade7fc9ba5bff (diff) | |
| parent | 08667cc9c12664cfcc69faf831e8cab878cc04b6 (diff) | |
Merge "Fix flaky ScheduleCalendarTest"
am: 08667cc9c1
Change-Id: If0c64d0a7b6f7a51f3a4d09b7ecf9cbad7ad6883
| -rw-r--r-- | services/tests/uiservicestests/src/com/android/server/notification/ScheduleCalendarTest.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ScheduleCalendarTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ScheduleCalendarTest.java index 942a07acbf9f..96ac93536a8a 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ScheduleCalendarTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ScheduleCalendarTest.java @@ -121,7 +121,7 @@ public class ScheduleCalendarTest extends UiServiceTestCase { cal.set(Calendar.MINUTE, 15); cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); - mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay() + 1}; + mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay(1)}; mScheduleInfo.startHour = 1; mScheduleInfo.endHour = 3; mScheduleInfo.startMinute = 15; @@ -149,7 +149,7 @@ public class ScheduleCalendarTest extends UiServiceTestCase { cal.set(Calendar.MINUTE, 15); cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); - mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay() + 1}; + mScheduleInfo.days = new int[] {getTodayDay(), getTodayDay(1)}; mScheduleInfo.startHour = 22; mScheduleInfo.endHour = 3; mScheduleInfo.startMinute = 15; @@ -250,7 +250,7 @@ public class ScheduleCalendarTest extends UiServiceTestCase { calAlarm.add(Calendar.DATE, 1); // add a day // 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.endHour = 7; mScheduleInfo.startMinute = 0; @@ -418,7 +418,7 @@ public class ScheduleCalendarTest extends UiServiceTestCase { now.set(Calendar.MILLISECOND, 0); 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.startMinute = 15; mScheduleInfo.endHour = 3; @@ -446,7 +446,7 @@ public class ScheduleCalendarTest extends UiServiceTestCase { now.set(Calendar.MILLISECOND, 0); 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.startMinute = 15; mScheduleInfo.endHour = 3; @@ -464,4 +464,10 @@ public class ScheduleCalendarTest extends UiServiceTestCase { private int getTodayDay() { 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); + } } |