Close cursors in SyncCalendarTest.
BUG 2040084
diff --git a/tests/src/com/android/providers/calendar/SyncCalendarTest.java b/tests/src/com/android/providers/calendar/SyncCalendarTest.java
index a4d9a83..83fb506 100644
--- a/tests/src/com/android/providers/calendar/SyncCalendarTest.java
+++ b/tests/src/com/android/providers/calendar/SyncCalendarTest.java
@@ -30,7 +30,7 @@
private EventInfo dailyRecurringEvent = new EventInfo("dailyEvent",
"daily from 5/1/2008 12am to 1am", "2008-10-01T00:00:00", "2008-10-01T01:00:00",
"FREQ=DAILY;WKST=SU", false);
-
+
private static final long ONE_HOUR_IN_MILLIS = 3600000;
@Override
@@ -44,7 +44,7 @@
insertEvent(normalEvent);
assertTrue("No new event was added. ", getEventsCount() > countBeforeNewEvent);
}
-
+
@LargeTest
public void testDeleteNewEvent() throws Exception {
int countBeforeNewEvent = getEventsCount();
@@ -53,7 +53,7 @@
assertEquals("Normal event should have been deleted.",
countBeforeNewEvent, getEventsCount());
}
-
+
@LargeTest
public void testCreateAndDeleteNewRecurringEvent() throws Exception {
int countBeforeNewEvent = getEventsCount();
@@ -78,7 +78,7 @@
assertTrue("An all-day event should have been created.",
getEventsCount() > countBeforeNewEvent);
}
-
+
@LargeTest
public void testCreateMultipleDayEvent() throws Exception {
Time time = new Time();
@@ -90,7 +90,7 @@
assertTrue("An multiple day event should have been created.",
getEventsCount() > countBeforeNewEvent);
}
-
+
@LargeTest
public void testEditEventTitle() throws Exception {
@@ -99,28 +99,29 @@
cursor = mResolver.query(mEventsUri, null, null, null, null);
int countBeforeNewEvent = cursor.getCount();
cursor.moveToNext();
-
+
Time time = new Time();
time.setToNow();
-
+
String newTitle = cursor.getString(cursor.getColumnIndex("title")) + time.toString();
long dtStart = cursor.getLong(cursor.getColumnIndex("dtstart"));
long dtEnd = cursor.getLong(cursor.getColumnIndex("dtend"));
-
+
EventInfo event = new EventInfo(newTitle, dtStart, dtEnd, false);
long eventId = cursor.getLong(cursor.getColumnIndex("_id"));
String fieldName = android.provider.Calendar.EventsColumns.TITLE;
-
+
//execute
editEvent(eventId, event);
-
+ cursor.close();
+
//assert
- cursor = mResolver.query(mEventsUri, null, null, null, null);
+ cursor = mResolver.query(mEventsUri, null, null, null, null);
assertTrue("Events count should remain same.", getEventsCount() == countBeforeNewEvent);
assertEventFieldValue(eventId, fieldName, cursor, newTitle);
cursor.close();
}
-
+
private void assertEventFieldValue(long eventId, String fieldName, Cursor cursor, String newValue) {
while (cursor.moveToNext()) {
if (cursor.getLong(cursor.getColumnIndex("_id")) == eventId) {
@@ -142,7 +143,7 @@
cursor = mResolver.query(mEventsUri, null, null, null, null);
int countBeforeNewEvent = cursor.getCount();
cursor.moveToNext();
-
+
Time time = new Time();
String title = cursor.getString(cursor.getColumnIndex("title"));
long dtStart = cursor.getLong(cursor.getColumnIndex("dtstart"));
@@ -150,32 +151,33 @@
long newDtStart = time.toMillis(false);
time.set(dtStart + 3 * ONE_HOUR_IN_MILLIS);
long newDtEnd = time.toMillis(false);
-
+
EventInfo event = new EventInfo(title, newDtStart, newDtEnd, false);
long eventId = cursor.getLong(cursor.getColumnIndex("_id"));
//execute
editEvent(eventId, event);
-
+ cursor.close();
+
//assert
cursor = mResolver.query(mEventsUri, null, null, null, null);
int countAfterNewEvent = cursor.getCount();
assertTrue("Events count should remain same.", countAfterNewEvent == countBeforeNewEvent);
-
+
String startDate = android.provider.Calendar.EventsColumns.DTSTART;
- String endDate = android.provider.Calendar.EventsColumns.DTEND;
-
+ String endDate = android.provider.Calendar.EventsColumns.DTEND;
+
assertEventFieldValue(eventId, startDate, cursor, endDate);
cursor.close();
}
-
+
@LargeTest
public void testEditEventTime() throws Exception {
//setup
Cursor cursor;
cursor = mResolver.query(mEventsUri, null, null, null, null);
String startDate = android.provider.Calendar.EventsColumns.DTSTART;
- String endDate = android.provider.Calendar.EventsColumns.DTEND;
+ String endDate = android.provider.Calendar.EventsColumns.DTEND;
int countBeforeNewEvent = cursor.getCount();
cursor.moveToNext();
Time time = new Time();
@@ -188,10 +190,11 @@
EventInfo event = new EventInfo(title, newDtStart, newDtEnd, false);
long eventId = cursor.getLong(cursor.getColumnIndex("_id"));
-
+
//execute
editEvent(eventId, event);
-
+ cursor.close();
+
//assert
cursor = mResolver.query(mEventsUri, null, null, null, null);
int countAfterNewEvent = cursor.getCount();
@@ -216,9 +219,10 @@
EventInfo event = new EventInfo(title, dtStart, dtEnd, false, newDescription);
long eventId = cursor.getLong(cursor.getColumnIndex("_id"));
-
+
//execute
editEvent(eventId, event);
+ cursor.close();
//assert
cursor = mResolver.query(mEventsUri, null, null, null, null);
@@ -229,7 +233,7 @@
assertEventFieldValue(eventId, fieldName , cursor, newDescription);
cursor.close();
}
-
+
@LargeTest
public void testEditEventLocation() throws Exception {
//setup
@@ -242,16 +246,17 @@
long dtStart = cursor.getLong(cursor.getColumnIndex("dtstart"));
long dtEnd = cursor.getLong(cursor.getColumnIndex("dtend"));
String fieldName = android.provider.Calendar.EventsColumns.EVENT_LOCATION;
-
+
String newLocation = "New Location - Cafe ";
EventInfo event = new EventInfo(title, dtStart, dtEnd, false, null);
event.mLocation = newLocation;
-
+
long eventId = cursor.getLong(cursor.getColumnIndex("_id"));
-
+
//execute
editEvent(eventId, event);
-
+ cursor.close();
+
//assert
cursor = mResolver.query(mEventsUri, null, null, null, null);
int countAfterNewEvent = cursor.getCount();
