Skip to content
Snippets Groups Projects
Commit 330860bf authored by Sebastian's avatar Sebastian
Browse files

Use @TempDir instead of handling temporary directories manually

parent 3bde159c
No related branches found
No related tags found
1 merge request!16Basic database setup
......@@ -2,19 +2,9 @@ package org.briarproject.mailbox.core
import org.briarproject.mailbox.core.util.IoUtils
import java.io.File
import java.util.concurrent.atomic.AtomicInteger
object TestUtils {
private val nextTestDir = AtomicInteger(
(Math.random() * 1000 * 1000).toInt()
)
fun getTestDirectory(): File {
val name: Int = nextTestDir.getAndIncrement()
return File("test.tmp/$name")
}
fun deleteTestDirectory(testDir: File) {
IoUtils.deleteFileOrDir(testDir)
testDir.parentFile.delete() // Delete if empty
......
package org.briarproject.mailbox.core.db
import org.briarproject.mailbox.core.TestUtils.deleteTestDirectory
import org.briarproject.mailbox.core.TestUtils.getTestDirectory
import org.briarproject.mailbox.core.api.Contact
import org.briarproject.mailbox.core.system.Clock
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.io.TempDir
import java.io.File
import java.sql.Connection
import kotlin.test.assertEquals
import kotlin.test.assertNull
import kotlin.test.assertTrue
abstract class JdbcDatabaseTest {
private val testDir: File = getTestDirectory()
@TempDir
lateinit var testDir: File
protected abstract fun createDatabase(
config: DatabaseConfig,
clock: Clock,
): JdbcDatabase
@BeforeEach
open fun setUp() {
assertTrue(testDir.mkdirs())
}
@Throws(java.lang.Exception::class)
fun open(
resume: Boolean,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment