diff options
| author | Michael Chan <mchan@android.com> | 2011-12-21 18:05:22 -0800 |
|---|---|---|
| committer | Michael Chan <mchan@android.com> | 2012-01-03 17:26:54 -0800 |
| commit | 0335d9f524da1da1f4d15bba37a1576a9480a36d (patch) | |
| tree | 1d26445d9438e128fc05931c36f6aa1104126449 /tests/src | |
| parent | 9a91eb9d6c3c28b54223dae453c9d456b0c87355 (diff) | |
| download | android_frameworks_opt_calendar-0335d9f524da1da1f4d15bba37a1576a9480a36d.tar.gz android_frameworks_opt_calendar-0335d9f524da1da1f4d15bba37a1576a9480a36d.tar.bz2 android_frameworks_opt_calendar-0335d9f524da1da1f4d15bba37a1576a9480a36d.zip | |
Fix rrules with bad count and interval during parsing
Specifically
If count < 0, assume 1
If interval < 1, assume 1
Bug: 5676414
Change-Id: I942cdaffcfb98a922c5867c9d08be322c64a0f94
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/calendarcommon/EventRecurrenceTest.java | 129 |
1 files changed, 129 insertions, 0 deletions
diff --git a/tests/src/com/android/calendarcommon/EventRecurrenceTest.java b/tests/src/com/android/calendarcommon/EventRecurrenceTest.java index 35777eb..a058adf 100644 --- a/tests/src/com/android/calendarcommon/EventRecurrenceTest.java +++ b/tests/src/com/android/calendarcommon/EventRecurrenceTest.java @@ -527,6 +527,135 @@ public class EventRecurrenceTest extends TestCase { ); } + // INTERVAL = 0 -> Interval = 1 bug #5676414 + public void test20() throws Exception { + verifyRecurType("FREQ=YEARLY;BYMONTHDAY=18;BYMONTH=10;INTERVAL=0;", + /* int freq */ EventRecurrence.YEARLY, + /* String until */ null, + /* int count */ 0, + /* int interval */ 1, + /* int[] bysecond */ null, + /* int[] byminute */ null, + /* int[] byhour */ null, + /* int[] byday */ null, + /* int[] bydayNum */ null, + /* int[] bymonthday */ new int[]{18}, + /* int[] byyearday */ null, + /* int[] byweekno */ null, + /* int[] bymonth */ new int[]{10}, + /* int[] bysetpos */ null, + /* int wkst */ EventRecurrence.MO + ); + } + + // Working case: INTERVAL=1 -> Interval = 1 bug #5676414 + public void test21() throws Exception { + verifyRecurType("FREQ=WEEKLY;WKST=SU;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR", + /* int freq */ EventRecurrence.WEEKLY, + /* String until */ null, + /* int count */ 0, + /* int interval */ 1, + /* int[] bysecond */ null, + /* int[] byminute */ null, + /* int[] byhour */ null, + /* int[] byday */ new int[] { + EventRecurrence.MO, + EventRecurrence.TU, + EventRecurrence.WE, + EventRecurrence.TH, + EventRecurrence.FR, + }, + /* int[] bydayNum */ new int[]{0, 0, 0, 0, 0}, + /* int[] bymonthday */ null, + /* int[] byyearday */ null, + /* int[] byweekno */ null, + /* int[] bymonth */ null, + /* int[] bysetpos */ null, + /* int wkst */ EventRecurrence.SU + ); + } + + // Working case: INTERVAL=2 -> Interval = 2 bug #5676414 + public void test22() throws Exception { + verifyRecurType("FREQ=WEEKLY;WKST=SU;INTERVAL=2;BYDAY=MO,TU,WE,TH,FR", + /* int freq */ EventRecurrence.WEEKLY, + /* String until */ null, + /* int count */ 0, + /* int interval */ 2, + /* int[] bysecond */ null, + /* int[] byminute */ null, + /* int[] byhour */ null, + /* int[] byday */ new int[] { + EventRecurrence.MO, + EventRecurrence.TU, + EventRecurrence.WE, + EventRecurrence.TH, + EventRecurrence.FR, + }, + /* int[] bydayNum */ new int[]{0, 0, 0, 0, 0}, + /* int[] bymonthday */ null, + /* int[] byyearday */ null, + /* int[] byweekno */ null, + /* int[] bymonth */ null, + /* int[] bysetpos */ null, + /* int wkst */ EventRecurrence.SU + ); + } + + // COUNT < 0 -> Count = 1 bug #5676414 + public void test23() throws Exception { + verifyRecurType("FREQ=WEEKLY;COUNT=-20;BYDAY=MO,TU,WE,TH,FR;", + /* int freq */ EventRecurrence.WEEKLY, + /* String until */ null, + /* int count */ 1, + /* int interval */ 0, + /* int[] bysecond */ null, + /* int[] byminute */ null, + /* int[] byhour */ null, + /* int[] byday */ new int[] { + EventRecurrence.MO, + EventRecurrence.TU, + EventRecurrence.WE, + EventRecurrence.TH, + EventRecurrence.FR, + }, + /* int[] bydayNum */ new int[]{0, 0, 0, 0, 0}, + /* int[] bymonthday */ null, + /* int[] byyearday */ null, + /* int[] byweekno */ null, + /* int[] bymonth */ null, + /* int[] bysetpos */ null, + /* int wkst */ EventRecurrence.MO + ); + } + + // Working case: COUNT=2 -> Count=2 bug #5676414 + public void test24() throws Exception { + verifyRecurType("FREQ=WEEKLY;COUNT=2;BYDAY=MO,TU,WE,TH,FR;", + /* int freq */ EventRecurrence.WEEKLY, + /* String until */ null, + /* int count */ 2, + /* int interval */ 0, + /* int[] bysecond */ null, + /* int[] byminute */ null, + /* int[] byhour */ null, + /* int[] byday */ new int[] { + EventRecurrence.MO, + EventRecurrence.TU, + EventRecurrence.WE, + EventRecurrence.TH, + EventRecurrence.FR, + }, + /* int[] bydayNum */ new int[]{0, 0, 0, 0, 0}, + /* int[] bymonthday */ null, + /* int[] byyearday */ null, + /* int[] byweekno */ null, + /* int[] bymonth */ null, + /* int[] bysetpos */ null, + /* int wkst */ EventRecurrence.MO + ); + } + // for your copying pleasure public void fakeTestXX() throws Exception { verifyRecurType("FREQ=DAILY;", |