# HG changeset patch # User Michael Schloh von Bennewitz # Date 1423945723 -3600 # Node ID 40e965b10350084375b34e7afc83c3dbf9823b66 # Parent eb20162864073a4b5e8c2d0aca61f8e77687ea2f Merge manually from 842945e5b782, correct build configuration to assert. diff -r eb2016286407 -r 40e965b10350 build.gradle --- a/build.gradle Sat Feb 14 00:38:55 2015 +0100 +++ b/build.gradle Sat Feb 14 21:28:43 2015 +0100 @@ -43,7 +43,7 @@ } dependencies { - compile 'junit:junit:4.+' + androidTestCompile 'junit:junit:4.+' compile 'com.android.support:support-v4:19.1.0' compile 'org.mnode.ical4j:ical4j:1.0.6' } diff -r eb2016286407 -r 40e965b10350 src/org/gege/caldavsyncadapter/android/entities/AndroidEvent.java --- a/src/org/gege/caldavsyncadapter/android/entities/AndroidEvent.java Sat Feb 14 00:38:55 2015 +0100 +++ b/src/org/gege/caldavsyncadapter/android/entities/AndroidEvent.java Sat Feb 14 21:28:43 2015 +0100 @@ -72,7 +72,7 @@ import java.net.URISyntaxException; import java.text.ParseException; -import static org.junit.Assert.*; +import static junit.framework.Assert.*; import com.europalab.caldavsyn.Appctxpro;