Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 200a439a authored by Beverly's avatar Beverly Committed by Tobias Thierer
Browse files

Fix flaky ScheduleCalendarTest 

Accurately get the next day.

Test: atest com.android.server.notification.ScheduleCalendarTest
Fixes: 110355145

(cherry picked from commit fe099b59)

Test: Treehugger
Bug: 110355145

Change-Id: Idc20944679b44b30a40eb65d958df9fffec69375
Merged-In: Idc20944679b44b30a40eb65d958df9fffec69375
parent 58d5c1e9

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

+11 −5
Original line number Original line Diff line number Diff line
@@ -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);

    }

}
 
}