summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2014-05-02 11:16:35 -0700
committerJay Shrauner <shrauner@google.com>2014-05-02 11:18:44 -0700
commit0c49fe537fed155ecf0df57065255a738f69e193 (patch)
treede959517d56484df9a3009fa151088cb3c8baabc /tests
parent7c3686eae16af8c7873e114976c67f4c8b62bc60 (diff)
downloadandroid_packages_apps_Exchange-0c49fe537fed155ecf0df57065255a738f69e193.tar.gz
android_packages_apps_Exchange-0c49fe537fed155ecf0df57065255a738f69e193.tar.bz2
android_packages_apps_Exchange-0c49fe537fed155ecf0df57065255a738f69e193.zip
Fix crash on unset recurrence type
Recurring event rule parser uses -1 for an unset recurrence type. Check for invalid recurrence type to prevent crash. Bug:14490734 Change-Id: I68de74d16cd4489d4235a9a3aea9c8ed0c4429dc
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
index 68e57e0f..bf80f1b7 100644
--- a/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
+++ b/tests/src/com/android/exchange/utility/CalendarUtilitiesTests.java
@@ -720,6 +720,14 @@ public class CalendarUtilitiesTests extends AndroidTestCase {
rrule = CalendarUtilities.rruleFromRecurrence(
6 /*Yearly/Month/DayOfWeek*/, 0, 0, 4 /*Tue*/, 0, 1 /*1st*/, 6 /*June*/, null);
assertEquals("FREQ=YEARLY;BYDAY=1TU;BYMONTH=6", rrule);
+ // Missing type
+ rrule = CalendarUtilities.rruleFromRecurrence(
+ -1 /* missing */, 0, 0, 4 /*Tue*/, 0, 1 /*1st*/, 6 /*June*/, null);
+ assertNull(rrule);
+ // Invalid type
+ rrule = CalendarUtilities.rruleFromRecurrence(
+ 4 /* invalid */, 0, 0, 4 /*Tue*/, 0, 1 /*1st*/, 6 /*June*/, null);
+ assertNull(rrule);
}
/**