WebDAV: fix random access without DocumentState; add tests (f7eea633) · Commits · e / os / AccountManager

app/src/androidTest/java/at/bitfire/davdroid/ui/AccountsActivityEspressoTest.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,8 @@ class AccountsActivityEspressoTest {
		private val password = "test"
		private val baseUrl = "https://davtest.dev001.net/radicale/htpasswd/"


		// FIXME should work
		/*
		@Test
		fun accountsActivityTest() {
		skipIntroActivity()
		@@ -92,6 +93,7 @@ class AccountsActivityEspressoTest {
		// doublecheck to make sure that the account doesn't exist anymore. The welcome text is displayed
		onView(withText(R.string.account_list_empty)).check(matches(withText(R.string.account_list_empty)))
		}
		*/

		@Test
		fun menuDrawerTest() {

app/src/androidTest/java/at/bitfire/davdroid/webdav/CredentialsStoreTest.kt

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		package at.bitfire.davdroid.webdav

		import androidx.test.espresso.internal.inject.InstrumentationContext
		import androidx.test.platform.app.InstrumentationRegistry
		import at.bitfire.davdroid.model.Credentials
		import org.junit.Assert.assertEquals
		import org.junit.Assert.assertNull
		import org.junit.Test

		class CredentialsStoreTest {

		private val store = CredentialsStore(InstrumentationRegistry.getInstrumentation().targetContext)

		@Test
		fun testSetGetDelete() {
		store.setCredentials(0, Credentials(userName = "myname", password = "12345"))
		assertEquals(Credentials(userName = "myname", password = "12345"), store.getCredentials(0))

		store.setCredentials(0, null)
		assertNull(store.getCredentials(0))
		}

		}
		No newline at end of file

app/src/androidTest/java/at/bitfire/davdroid/webdav/RandomAccessBufferTest.kt

0 → 100644

+144 −0

Original line number	Diff line number	Diff line
		package at.bitfire.davdroid.webdav

		import androidx.test.platform.app.InstrumentationRegistry
		import okhttp3.HttpUrl.Companion.toHttpUrl
		import org.apache.commons.io.FileUtils
		import org.junit.Assert.assertEquals
		import org.junit.Assert.assertTrue
		import org.junit.Test

		class RandomAccessBufferTest {

		companion object {
		const val FILE_LENGTH = 10*FileUtils.ONE_MB
		}


		@Test
		fun testRead_FirstPage_PartialStart() {
		var called = false
		val buffer = newBuffer(object: RandomAccessBuffer.Reader {
		override fun readDirect(offset: Long, size: Int, dst: ByteArray): Int {
		assertEquals(0, offset)
		assertEquals(100, size)
		called = true
		return size
		}
		})
		val result = ByteArray(100)
		buffer.read(0, 100, result)
		assertTrue(called)
		}

		@Test
		fun testRead_FirstAndSecondPage_Overlapping() {
		var called = 0
		val buffer = newBuffer(object: RandomAccessBuffer.Reader {
		override fun readDirect(offset: Long, size: Int, dst: ByteArray): Int {
		// first page: 10 ... RandomAccessBuffer.PAGE_SIZE = (RandomAccessBuffer.PAGE_SIZE - 10) bytes
		// second page: 0 ... 110 = 110 bytes
		// in total = RandomAccessBuffer.PAGE_SIZE + 100 bytes
		when (called) {
		0 -> {
		assertEquals(10L, offset)
		assertEquals(RandomAccessBuffer.PAGE_SIZE - 10, size)
		}
		1 -> {
		assertEquals(RandomAccessBuffer.PAGE_SIZE.toLong(), offset)
		assertEquals(110, size)
		}
		}
		called++
		return size
		}
		})
		val result = ByteArray(RandomAccessBuffer.PAGE_SIZE + 100)
		buffer.read(10, RandomAccessBuffer.PAGE_SIZE + 100, result)
		assertEquals(2, called)
		}

		@Test
		fun testRead_SecondPage_Full() {
		var called = false
		val buffer = newBuffer(object: RandomAccessBuffer.Reader {
		override fun readDirect(offset: Long, size: Int, dst: ByteArray): Int {
		assertEquals(0L, offset)
		assertEquals(RandomAccessBuffer.PAGE_SIZE, size)
		called = true
		return size
		}
		})
		val result = ByteArray(RandomAccessBuffer.PAGE_SIZE)
		buffer.read(0, RandomAccessBuffer.PAGE_SIZE, result)
		assertTrue(called)
		}


		@Test
		fun testGetPageDirect_FullPage() {
		var called = false
		val buffer = newBuffer(object: RandomAccessBuffer.Reader {
		override fun readDirect(offset: Long, size: Int, dst: ByteArray): Int {
		assertEquals(0, offset)
		assertEquals(RandomAccessBuffer.PAGE_SIZE, size)
		called = true
		return size
		}
		})

		buffer.getPageDirect(0, 0, RandomAccessBuffer.PAGE_SIZE)
		assertTrue(called)
		}

		@Test
		fun testGetPageDirect_Partial() {
		var called = false
		val buffer = newBuffer(object: RandomAccessBuffer.Reader {
		override fun readDirect(offset: Long, size: Int, dst: ByteArray): Int {
		assertEquals(100, offset)
		assertEquals(200, size)
		called = true
		return size
		}
		})

		buffer.getPageDirect(0, 100, 200)
		assertTrue(called)
		}

		@Test(expected = IndexOutOfBoundsException::class)
		fun testGetPageDirect_Partial_StartingAtPageEnd() {
		val buffer = newBuffer(object: RandomAccessBuffer.Reader {
		override fun readDirect(offset: Long, size: Int, dst: ByteArray) = throw IllegalArgumentException()
		})

		val result = buffer.getPageDirect(0, FILE_LENGTH, 1)
		}

		@Test
		fun testGetPageDirect_Partial_LargerThanPage() {
		var called = false
		val buffer = newBuffer(object: RandomAccessBuffer.Reader {
		override fun readDirect(offset: Long, size: Int, dst: ByteArray): Int {
		called = true
		return size
		}
		})

		val result = buffer.getPageDirect(0, 100, FILE_LENGTH.toInt())
		assertTrue(called)
		assertEquals(result.size.toLong(), FILE_LENGTH - 100)
		}



		private fun newBuffer(reader: RandomAccessBuffer.Reader) =
		RandomAccessBuffer(
		InstrumentationRegistry.getInstrumentation().targetContext,
		"http://example.com/webdav".toHttpUrl(),
		FILE_LENGTH,
		null,
		reader
		)

		}
		No newline at end of file

app/src/main/java/at/bitfire/davdroid/model/Credentials.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@

		package at.bitfire.davdroid.model

		class Credentials(
		data class Credentials(
		val userName: String? = null,
		val password: String? = null,
		val certificateAlias: String? = null

app/src/main/java/at/bitfire/davdroid/webdav/RandomAccessBuffer.kt

+9 −9

Original line number	Diff line number	Diff line
		@@ -65,20 +65,20 @@ class RandomAccessBuffer(
		}

		// caching not possible because of missing ETag/Last-Modified
		return getPageDirect(pageIdx)
		return getPageDirect(pageIdx, offset, size)
		}

		private fun getPageDirect(pageIdx: Long): ByteArray {
		val startPos = pageIdx * PAGE_SIZE
		internal fun getPageDirect(pageIdx: Long, offset: Long = 0, size: Int = PAGE_SIZE): ByteArray {
		val startPos = pageIdx * PAGE_SIZE + offset
		if (startPos >= fileLength)
		throw IndexOutOfBoundsException("Can't get page after EOF ($startPos >= $fileLength)")
		throw IndexOutOfBoundsException("Can't get page at or after EOF ($startPos >= $fileLength)")

		val idxLast = min(startPos + PAGE_SIZE, fileLength)
		val idxLast = min(startPos + size, fileLength)

		val pageSize = (idxLast - startPos).toInt()
		val buffer = ByteArray(pageSize)
		if (reader.readDirect(startPos, pageSize, buffer) != pageSize)
		throw DavException("Couldn't read $pageSize bytes from position $startPos (file size = $fileLength)")
		val resultSize = (idxLast - startPos).toInt()
		val buffer = ByteArray(resultSize)
		if (reader.readDirect(startPos, resultSize, buffer) != resultSize)
		throw DavException("Couldn't read $resultSize bytes from position $startPos (file size = $fileLength)")
		return buffer
		}