arno
/
etesync-android
mirror of https://github.com/etesync/android
1
0
Fork 0
Code Issues Releases Wiki Activity

Test parsing recurring events with exceptions

Browse Source 
* adapted tests
* use org.apache.httpcomponents:httpclient-android:4.3.5.1 again because it seems to contain all necessary fixes
pull/2/head
Ricki Hirner 9 years ago
parent 495cdf7c7e
commit 2683012ec3
10 changed files with 64 additions and 36 deletions
Show Stats Download Patch File Download Diff File

5
app/build.gradle
Unescape View File

@ -60,10 +60,7 @@ dependencies {
// dnsjava for querying SRV/TXT records
compile 'dnsjava:dnsjava:2.1.6'
// HttpClient 4.3, Android flavour for WebDAV operations
// we have to use our own patched build of 4.3.5.2-SNAPSHOT to avoid
// https://issues.apache.org/jira/browse/HTTPCLIENT-1591
compile files('lib/httpclient-android-4.3.5.2-davdroid1.jar')
// compile 'org.apache.httpcomponents:httpclient-android:4.3.5.2-SNAPSHOT'
compile 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
// SimpleXML for parsing and generating WebDAV messages
compile('org.simpleframework:simple-xml:2.7.1') {
exclude group: 'stax', module: 'stax-api'

BIN
app/lib/httpclient-android-4.3.5.2-davdroid1.jar
View File

Binary file not shown.

17
app/src/androidTest/assets/recurring-with-exception1.ics
Unescape View File

@ -0,0 +1,17 @@
BEGIN:VCALENDAR
VERSION:2.0
BEGIN:VEVENT
UID:fcb42e4d-bc6e-4499-97f0-6616a02da7bc
SUMMARY:Recurring event with one exception
RRULE:FREQ=DAILY;COUNT=5
DTSTART;VALUE=DATE:20150501
DTEND;VALUE=DATE:20150502
END:VEVENT
BEGIN:VEVENT
UID:fcb42e4d-bc6e-4499-97f0-6616a02da7bc
RECURRENCE-ID;VALUE=DATE:20150503
DTSTART;VALUE=DATE:20150503
DTEND;VALUE=DATE:20150504
SUMMARY:Another summary for the third day
END:VEVENT
END:VCALENDAR

14
app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java
Unescape View File

@ -30,10 +30,18 @@ public class EventTest extends InstrumentationTestCase {
eAllDay1Day = parseCalendar("all-day-1day.ics");
eAllDay10Days = parseCalendar("all-day-10days.ics");
eAllDay0Sec = parseCalendar("all-day-0sec.ics");
//assertEquals("Test-Ereignis im schönen Wien", e.getSummary());
}
public void testRecurringWithException() throws Exception {
Event event = parseCalendar("recurring-with-exception1.ics");
assertTrue(event.isAllDay());
assertEquals(1, event.getExceptions().size());
Event exception = event.getExceptions().get(0);
assertEquals("20150503", exception.getRecurrenceId().getValue());
assertEquals("Another summary for the third day", exception.getSummary());
}
public void testStartEndTimes() throws IOException, ParserException, InvalidResourceException {
// event with start+end date-time

44
app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java
Unescape View File

@ -10,12 +10,16 @@ package at.bitfire.davdroid.resource;
import java.util.Calendar;
import lombok.Cleanup;
import android.Manifest;
import android.accounts.Account;
import android.annotation.TargetApi;
import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
import android.os.Build;
@ -26,6 +30,8 @@ import android.provider.CalendarContract.Calendars;
import android.provider.CalendarContract.Events;
import android.provider.CalendarContract.Reminders;
import android.test.InstrumentationTestCase;
import android.test.IsolatedContext;
import android.test.mock.MockContentResolver;
import android.util.Log;
import at.bitfire.davdroid.resource.LocalCalendar;
import at.bitfire.davdroid.resource.LocalStorageException;
@ -33,20 +39,23 @@ import at.bitfire.davdroid.resource.LocalStorageException;
public class LocalCalendarTest extends InstrumentationTestCase {
private static final String
TAG = "davroid.test",
TAG = "davdroid.test",
accountName = "at.bitfire.davdroid.test",
calendarName = "DAVdroid_Test";
Context targetContext;
ContentProviderClient providerClient;
Account testAccount = new Account(calendarName, CalendarContract.ACCOUNT_TYPE_LOCAL);
LocalCalendar testCalendar;
// helpers
private Uri syncAdapterURI(Uri uri) {
return uri.buildUpon()
.appendQueryParameter(Calendars.ACCOUNT_NAME, calendarName)
.appendQueryParameter(Calendars.ACCOUNT_TYPE, CalendarContract.ACCOUNT_TYPE_LOCAL)
.appendQueryParameter(Calendars.ACCOUNT_NAME, accountName)
.appendQueryParameter(CalendarContract.CALLER_IS_SYNCADAPTER, "true").
build();
}
@ -72,20 +81,21 @@ public class LocalCalendarTest extends InstrumentationTestCase {
@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
protected void setUp() throws Exception {
ContentResolver resolver = getInstrumentation().getContext().getContentResolver();
providerClient = resolver.acquireContentProviderClient(CalendarContract.AUTHORITY);
targetContext = getInstrumentation().getTargetContext();
targetContext.enforceCallingOrSelfPermission(Manifest.permission.READ_CALENDAR, "No privileges for enumerating calendars");
providerClient = targetContext.getContentResolver().acquireContentProviderClient(CalendarContract.AUTHORITY);
long id;
long calendarId;
@Cleanup Cursor cursor = providerClient.query(Calendars.CONTENT_URI,
new String[]{Calendars._ID},
Calendars.ACCOUNT_TYPE + "=? AND " + Calendars.NAME + "=?",
new String[]{ CalendarContract.ACCOUNT_TYPE_LOCAL, calendarName },
new String[]{ Calendars._ID },
Calendars.ACCOUNT_TYPE + "=? AND " + Calendars.ACCOUNT_NAME + "=? AND " + Calendars.NAME + "=?",
new String[] { CalendarContract.ACCOUNT_TYPE_LOCAL, accountName, calendarName },
null);
if (cursor != null && cursor.moveToNext()) {
// found local test calendar
id = cursor.getLong(0);
Log.d(TAG, "Found test calendar with ID " + id);
calendarId = cursor.getLong(0);
Log.i(TAG, "Found test calendar with ID " + calendarId);
} else {
// no local test calendar found, create
@ -106,11 +116,11 @@ public class LocalCalendarTest extends InstrumentationTestCase {
Uri calendarURI = providerClient.insert(syncAdapterURI(Calendars.CONTENT_URI), values);
id = ContentUris.parseId(calendarURI);
Log.d(TAG, "Created test calendar with ID " + id);
calendarId = ContentUris.parseId(calendarURI);
Log.d(TAG, "Created test calendar with ID " + calendarId);
}
testCalendar = new LocalCalendar(testAccount, providerClient, id, null);
testCalendar = new LocalCalendar(testAccount, providerClient, calendarId, null);
}
protected void tearDown() throws Exception {

2
app/src/main/AndroidManifest.xml
Unescape View File

@ -9,7 +9,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="at.bitfire.davdroid"
android:versionCode="57" android:versionName="0.7.2"
android:versionCode="58" android:versionName="0.7.3"
android:installLocation="internalOnly">
<uses-sdk

2
app/src/main/java/at/bitfire/davdroid/Constants.java
Unescape View File

@ -9,7 +9,7 @@ package at.bitfire.davdroid;
public class Constants {
public static final String
APP_VERSION = "0.7.2",
APP_VERSION = "0.7.3-BETA",
ACCOUNT_TYPE = "bitfire.at.davdroid",
WEB_URL_HELP = "https://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app",
WEB_URL_VIEW_LOGS = "https://github.com/bitfireAT/davdroid/wiki/How-to-view-the-logs";

4
app/src/main/java/at/bitfire/davdroid/resource/Contact.java
Unescape View File

@ -9,6 +9,8 @@ package at.bitfire.davdroid.resource;
import android.util.Log;
import net.fortuna.ical4j.model.property.ProdId;
import org.apache.commons.lang.StringUtils;
import java.io.ByteArrayOutputStream;
@ -40,6 +42,7 @@ import ezvcard.property.Nickname;
import ezvcard.property.Note;
import ezvcard.property.Organization;
import ezvcard.property.Photo;
import ezvcard.property.ProductId;
import ezvcard.property.RawProperty;
import ezvcard.property.Revision;
import ezvcard.property.Role;
@ -285,6 +288,7 @@ public class Contact extends Resource {
vcard.removeProperties(Logo.class);
vcard.removeProperties(Sound.class);
// remove properties that don't apply anymore
vcard.removeProperties(ProductId.class);
vcard.removeProperties(Revision.class);
vcard.removeProperties(Source.class);
// store all remaining properties into unknownProperties

10
app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java
Unescape View File

@ -561,9 +561,6 @@ public class LocalCalendar extends LocalCollection<Event> {
.withValue(entryColumnETag(), event.getETag())
.withValue(entryColumnUID(), event.getUid());
} else {
// this event is an exception for a recurring event -> calculate
// 1. ORIGINAL_INSTANCE_TIME when the original instance would have occured (ms UTC)
// 2. ORIGINAL_ALL_DAY was the original instance an all-day event?
builder = builder.withValue(Events.ORIGINAL_SYNC_ID, event.getName());
// ORIGINAL_INSTANCE_TIME and ORIGINAL_ALL_DAY is set in buildExceptions.
@ -674,8 +671,6 @@ public class LocalCalendar extends LocalCollection<Event> {
Date date = recurrenceId.getDate();
boolean originalAllDay = master.isAllDay();
long originalInstanceTime;
if (originalAllDay && date instanceof DateTime) {
String value = recurrenceId.getValue();
if (value.matches("^\\d{8}T\\d{6}$"))
@ -687,12 +682,9 @@ public class LocalCalendar extends LocalCollection<Event> {
Log.e(TAG, "Couldn't parse DATE part of DATE-TIME RECURRENCE-ID", e);
}
}
originalInstanceTime = date.getTime();
Log.i(TAG, "Original instance time: " + date.getTime()/1000);
builder.withValue(Events.ORIGINAL_INSTANCE_TIME, originalInstanceTime);
builder.withValue(Events.ORIGINAL_INSTANCE_TIME, date.getTime());
builder.withValue(Events.ORIGINAL_ALL_DAY, originalAllDay ? 1 : 0);
return builder;
}

2
app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java
Unescape View File

@ -300,7 +300,7 @@ public abstract class LocalCollection<T extends Resource> {
/** Updates the locally-known ETag of a resource. */
public void updateETag(Resource res, String eTag) throws LocalStorageException {
Log.d(TAG, "Setting ETag of local resource " + res + " to " + eTag);
Log.d(TAG, "Setting ETag of local resource " + res.getName() + " to " + eTag);
ContentValues values = new ContentValues(1);
values.put(entryColumnETag(), eTag);

Write Preview
Loading…
Cancel
Save