Fix unit tests

pull/1137/head
Alex Baker 5 years ago
parent 0d0094ad9c
commit df907cfabb

@ -57,7 +57,7 @@ object BackupConstants {
return file.name?.let { getTimestampFromFilename(it) } ?: file.lastModified() return file.name?.let { getTimestampFromFilename(it) } ?: file.lastModified()
} }
private fun getTimestampFromFilename(name: String): Long? { internal fun getTimestampFromFilename(name: String): Long? {
return MATCHER return MATCHER
.matcher(name) .matcher(name)
.takeIf { it.matches() } .takeIf { it.matches() }

@ -3,8 +3,6 @@ package org.tasks.jobs
import org.junit.Assert.* import org.junit.Assert.*
import org.junit.Test import org.junit.Test
import org.mockito.Mockito import org.mockito.Mockito
import org.tasks.date.DateTimeUtils
import org.tasks.time.DateTime
import java.io.File import java.io.File
class BackupWorkTest { class BackupWorkTest {
@ -20,9 +18,9 @@ class BackupWorkTest {
@Test @Test
fun getDeleteKeepAllFiles() { fun getDeleteKeepAllFiles() {
val file1 = newFile(DateTimeUtils.newDate(2018, 3, 27)) val file1 = newFile("auto.180327-0000.json")
val file2 = newFile(DateTimeUtils.newDate(2018, 3, 28)) val file2 = newFile("auto.180328-0000.json")
val file3 = newFile(DateTimeUtils.newDate(2018, 3, 29)) val file3 = newFile("auto.180329-0000.json")
assertEquals(emptyList<Any>(), BackupWork.getDeleteList(arrayOf(file2, file1, file3), 7)) assertEquals(emptyList<Any>(), BackupWork.getDeleteList(arrayOf(file2, file1, file3), 7))
} }
@ -33,17 +31,17 @@ class BackupWorkTest {
@Test @Test
fun sortFiles() { fun sortFiles() {
val file1 = newFile(DateTimeUtils.newDate(2018, 3, 27)) val file1 = newFile("auto.180327-0000.json")
val file2 = newFile(DateTimeUtils.newDate(2018, 3, 28)) val file2 = newFile("auto.180328-0000.json")
val file3 = newFile(DateTimeUtils.newDate(2018, 3, 29)) val file3 = newFile("auto.180329-0000.json")
assertEquals( assertEquals(
listOf(file1), BackupWork.getDeleteList(arrayOf(file2, file1, file3), 2)) listOf(file1), BackupWork.getDeleteList(arrayOf(file2, file1, file3), 2))
} }
companion object { companion object {
private fun newFile(lastModified: DateTime): File { private fun newFile(name: String): File {
val result = Mockito.mock(File::class.java) val result = Mockito.mock(File::class.java)
Mockito.`when`(result.lastModified()).thenReturn(lastModified.millis) Mockito.`when`(result.name).thenReturn(name)
return result return result
} }
} }

Loading…
Cancel
Save