Refactor API, especially DavResponse

Author: rfc2822

build.gradle

@@ -33,7 +33,8 @@ android {
     buildToolsVersion '27.0.3'
 
     defaultConfig {
-        minSdkVersion 14
+        //noinspection MinSdkTooLow
+        minSdkVersion 9        // Android 2.3
         targetSdkVersion 27
 
         buildConfigField "String", "version_okhttp", "\"$okhttp_version\""
@@ -58,6 +59,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
+    implementation "commons-io:commons-io:2.6"
 
     androidTestImplementation "com.squareup.okhttp3:mockwebserver:$okhttp_version"
     androidTestImplementation 'com.android.support.test:runner:1.0.2'

src/androidTest/java/at/bitfire/dav4android/DavCollectionTest.kt

@@ -94,25 +94,25 @@ class DavCollectionTest {
                         "     <D:sync-token>http://example.com/ns/sync/1234</D:sync-token>\n" +
                         "   </D:multistatus>")
         )
-        val changes = collection.reportChanges(null, false, null, GetETag.NAME)
-
-        assertEquals(3, changes.members.size)
-        val members = changes.members.iterator()
-        val member1 = members.next()
-        assertEquals(sampleUrl().newBuilder().addPathSegment("test.doc").build(), member1.url)
-        assertEquals("00001-abcd1", member1[GetETag::class.java]!!.eTag)
-
-        val member2 = members.next()
-        assertEquals(sampleUrl().newBuilder().addPathSegment("vcard.vcf").build(), member2.url)
-        assertEquals("00002-abcd1", member2[GetETag::class.java]!!.eTag)
-
-        val member3 = members.next()
-        assertEquals(sampleUrl().newBuilder().addPathSegment("calendar.ics").build(), member3.url)
-        assertEquals("00003-abcd1", member3[GetETag::class.java]!!.eTag)
-
-        assertEquals(0, changes.removedMembers.size)
-        assertFalse(changes.furtherResults)
-        assertEquals("http://example.com/ns/sync/1234", changes.syncToken!!.token)
+        collection.reportChanges(null, false, null, GetETag.NAME).use { changes ->
+            assertEquals(3, changes.members.size)
+            val members = changes.members.iterator()
+            val member1 = members.next()
+            assertEquals(sampleUrl().newBuilder().addPathSegment("test.doc").build(), member1.url)
+            assertEquals("00001-abcd1", member1[GetETag::class.java]!!.eTag)
+
+            val member2 = members.next()
+            assertEquals(sampleUrl().newBuilder().addPathSegment("vcard.vcf").build(), member2.url)
+            assertEquals("00002-abcd1", member2[GetETag::class.java]!!.eTag)
+
+            val member3 = members.next()
+            assertEquals(sampleUrl().newBuilder().addPathSegment("calendar.ics").build(), member3.url)
+            assertEquals("00003-abcd1", member3[GetETag::class.java]!!.eTag)
+
+            assertEquals(0, changes.removedMembers.size)
+            assertFalse(changes.furtherResults)
+            assertEquals("http://example.com/ns/sync/1234", changes.syncToken!!.token)
+        }
     }
 
     /**
@@ -158,24 +158,24 @@ class DavCollectionTest {
                         "     <D:sync-token>http://example.com/ns/sync/1233</D:sync-token>\n" +
                         "   </D:multistatus>")
         )
-        val changes = collection.reportChanges(null, false, null, GetETag.NAME)
-
-        assertEquals(2, changes.members.size)
-        val members = changes.members.iterator()
-        val member1 = members.next()
-        assertEquals(sampleUrl().newBuilder().addPathSegment("test.doc").build(), member1.url)
-        assertEquals("00001-abcd1", member1[GetETag::class.java]!!.eTag)
-
-        val member2 = members.next()
-        assertEquals(sampleUrl().newBuilder().addPathSegment("vcard.vcf").build(), member2.url)
-        assertEquals("00002-abcd1", member2[GetETag::class.java]!!.eTag)
-
-        assertEquals(1, changes.removedMembers.size)
-        val removedMember = changes.removedMembers.first()
-        assertEquals(sampleUrl().newBuilder().addPathSegment("removed.txt").build(), removedMember.url)
-
-        assertTrue(changes.furtherResults)
-        assertEquals("http://example.com/ns/sync/1233", changes.syncToken!!.token)
+        collection.reportChanges(null, false, null, GetETag.NAME).use { changes ->
+            assertEquals(2, changes.members.size)
+            val members = changes.members.iterator()
+            val member1 = members.next()
+            assertEquals(sampleUrl().newBuilder().addPathSegment("test.doc").build(), member1.url)
+            assertEquals("00001-abcd1", member1[GetETag::class.java]!!.eTag)
+
+            val member2 = members.next()
+            assertEquals(sampleUrl().newBuilder().addPathSegment("vcard.vcf").build(), member2.url)
+            assertEquals("00002-abcd1", member2[GetETag::class.java]!!.eTag)
+
+            assertEquals(1, changes.removedMembers.size)
+            val removedMember = changes.removedMembers.first()
+            assertEquals(sampleUrl().newBuilder().addPathSegment("removed.txt").build(), removedMember.url)
+
+            assertTrue(changes.furtherResults)
+            assertEquals("http://example.com/ns/sync/1233", changes.syncToken!!.token)
+        }
     }
 
     /**
@@ -196,13 +196,11 @@ class DavCollectionTest {
         )
 
         try {
-            collection.reportChanges("http://example.com/ns/sync/1232", false, 100, GetETag.NAME)
+            collection.reportChanges("http://example.com/ns/sync/1232", false, 100, GetETag.NAME).close()
+            fail("Expected HttpException")
         } catch (e: HttpException) {
             assertEquals(507, e.status)
-            return
         }
-
-        fail()
     }
 
 }