diff options
| author | Michael Chan <chanm@google.com> | 2012-06-12 18:21:23 -0700 |
|---|---|---|
| committer | Michael Chan <chanm@google.com> | 2012-06-12 18:21:59 -0700 |
| commit | 5cde0374a28f91dd02e515d2956c6028144d0a9c (patch) | |
| tree | bafbf2d3f04520aa632b3942c300ac7819be68c4 /tests | |
| parent | c0feea05e070c45892169372d608c4f6d19eaece (diff) | |
| download | android_packages_apps_Calendar-5cde0374a28f91dd02e515d2956c6028144d0a9c.tar.gz android_packages_apps_Calendar-5cde0374a28f91dd02e515d2956c6028144d0a9c.tar.bz2 android_packages_apps_Calendar-5cde0374a28f91dd02e515d2956c6028144d0a9c.zip | |
Fix some NPE and comparison errors.
Not all the tests are fixed.
Change-Id: I24a4b2c2525570e294facd030b4e86d6762f8485
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/calendar/event/EditEventHelperTest.java | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/tests/src/com/android/calendar/event/EditEventHelperTest.java b/tests/src/com/android/calendar/event/EditEventHelperTest.java index 05cfc24f..a6794f7f 100644 --- a/tests/src/com/android/calendar/event/EditEventHelperTest.java +++ b/tests/src/com/android/calendar/event/EditEventHelperTest.java @@ -16,13 +16,6 @@ package com.android.calendar.event; -import com.android.calendar.AbstractCalendarActivity; -import com.android.calendar.AsyncQueryService; -import com.android.calendar.CalendarEventModel; -import com.android.calendar.CalendarEventModel.ReminderEntry; -import com.android.calendar.R; -import com.android.common.Rfc822Validator; - import android.content.ContentProvider; import android.content.ContentProviderOperation; import android.content.ContentProviderResult; @@ -42,6 +35,14 @@ import android.text.TextUtils; import android.text.format.DateUtils; import android.text.format.Time; import android.text.util.Rfc822Token; +import android.util.Log; + +import com.android.calendar.AbstractCalendarActivity; +import com.android.calendar.AsyncQueryService; +import com.android.calendar.CalendarEventModel; +import com.android.calendar.CalendarEventModel.ReminderEntry; +import com.android.calendar.R; +import com.android.common.Rfc822Validator; import java.util.ArrayList; import java.util.Calendar; @@ -86,7 +87,11 @@ public class EditEventHelperTest extends AndroidTestCase { "3", // 14 visibility "steve@gmail.com", // 15 owner account "1", // 16 has attendee data - null, //17 originalEvent + null, //17 originalSyncId + "organizer@gmail.com", // 18 organizer + "0", // 19 guest can modify + null, // 20 original id + "1" // event status }; // These should match up with EditEventHelper.EVENT_PROJECTION private static final String AUTHORITY_URI = "content://EditEventHelperAuthority/"; @@ -1487,6 +1492,9 @@ public class EditEventHelperTest extends AndroidTestCase { model.mOwnerAccount = "steve@gmail.com"; model.mHasAttendeeData = true; model.mEventStatus = Events.STATUS_CONFIRMED; + model.mOrganizer = "organizer@gmail.com"; + model.mGuestsCanModify = false; + model.mModelUpdatedWithEventCursor = true; return model; } |