From 330860bfab709ff412c638c274716ec3bdce46f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Thu, 16 Sep 2021 09:18:12 +0200
Subject: [PATCH] Use @TempDir instead of handling temporary directories
manually
---
.../java/org/briarproject/mailbox/core/TestUtils.kt | 10 ----------
.../briarproject/mailbox/core/db/JdbcDatabaseTest.kt | 12 +++---------
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/mailbox-core/src/test/java/org/briarproject/mailbox/core/TestUtils.kt b/mailbox-core/src/test/java/org/briarproject/mailbox/core/TestUtils.kt
index 88d0f480..2025f841 100644
--- a/mailbox-core/src/test/java/org/briarproject/mailbox/core/TestUtils.kt
+++ b/mailbox-core/src/test/java/org/briarproject/mailbox/core/TestUtils.kt
@@ -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
diff --git a/mailbox-core/src/test/java/org/briarproject/mailbox/core/db/JdbcDatabaseTest.kt b/mailbox-core/src/test/java/org/briarproject/mailbox/core/db/JdbcDatabaseTest.kt
index 03dff95d..f2e0018a 100644
--- a/mailbox-core/src/test/java/org/briarproject/mailbox/core/db/JdbcDatabaseTest.kt
+++ b/mailbox-core/src/test/java/org/briarproject/mailbox/core/db/JdbcDatabaseTest.kt
@@ -1,31 +1,25 @@
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,
--
GitLab