From 7e20b84ce7877955ad1dfabb08d1810650bc929c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Fri, 29 Oct 2021 12:36:40 +0200
Subject: [PATCH] Move getDataDir() to TestUtils
---
.../briar/desktop/RunWithTemporaryAccount.kt | 17 +-------------
.../briarproject/briar/desktop/TestUtils.kt | 22 +++++++++++++++++++
.../desktop/TestWithTwoTemporaryAccounts.kt | 17 +-------------
3 files changed, 24 insertions(+), 32 deletions(-)
create mode 100644 src/test/kotlin/org/briarproject/briar/desktop/TestUtils.kt
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt b/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
index 13370267c3..dd669a4e72 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
@@ -4,14 +4,10 @@ import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.window.application
import org.briarproject.bramble.BrambleCoreEagerSingletons
import org.briarproject.briar.BriarCoreEagerSingletons
-import org.briarproject.briar.desktop.utils.FileUtils
-import java.io.IOException
-import java.nio.file.Files
-import java.nio.file.Path
+import org.briarproject.briar.desktop.TestUtils.getDataDir
import java.util.logging.Level.INFO
import java.util.logging.LogManager
import java.util.logging.Logger
-import kotlin.io.path.absolute
internal class RunWithTemporaryAccount(val customization: BriarDesktopTestApp.() -> Unit) {
@@ -61,15 +57,4 @@ internal class RunWithTemporaryAccount(val customization: BriarDesktopTestApp.()
app.getBriarUi().start(this)
}
}
-
- private fun getDataDir(): Path {
- val dataDir = Files.createTempDirectory("briar")
- if (!Files.exists(dataDir)) {
- throw IOException("Could not create directory: ${dataDir.absolute()}")
- } else if (!Files.isDirectory(dataDir)) {
- throw IOException("Data dir is not a directory: ${dataDir.absolute()}")
- }
- FileUtils.setRWX(dataDir)
- return dataDir
- }
}
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/TestUtils.kt b/src/test/kotlin/org/briarproject/briar/desktop/TestUtils.kt
new file mode 100644
index 0000000000..0bc9746ca8
--- /dev/null
+++ b/src/test/kotlin/org/briarproject/briar/desktop/TestUtils.kt
@@ -0,0 +1,22 @@
+package org.briarproject.briar.desktop
+
+import org.briarproject.briar.desktop.utils.FileUtils
+import java.io.IOException
+import java.nio.file.Files
+import java.nio.file.Path
+import kotlin.io.path.absolute
+
+object TestUtils {
+
+ fun getDataDir(): Path {
+ val dataDir = Files.createTempDirectory("briar")
+ if (!Files.exists(dataDir)) {
+ throw IOException("Could not create directory: ${dataDir.absolute()}")
+ } else if (!Files.isDirectory(dataDir)) {
+ throw IOException("Data dir is not a directory: ${dataDir.absolute()}")
+ }
+ FileUtils.setRWX(dataDir)
+ return dataDir
+ }
+
+}
\ No newline at end of file
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/TestWithTwoTemporaryAccounts.kt b/src/test/kotlin/org/briarproject/briar/desktop/TestWithTwoTemporaryAccounts.kt
index 1336ba9965..5f852e12b5 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/TestWithTwoTemporaryAccounts.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/TestWithTwoTemporaryAccounts.kt
@@ -8,14 +8,10 @@ import org.briarproject.bramble.BrambleCoreEagerSingletons
import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT
import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT
import org.briarproject.briar.BriarCoreEagerSingletons
-import org.briarproject.briar.desktop.utils.FileUtils
-import java.io.IOException
-import java.nio.file.Files
-import java.nio.file.Path
+import org.briarproject.briar.desktop.TestUtils.getDataDir
import java.util.logging.Level.INFO
import java.util.logging.LogManager
import java.util.logging.Logger
-import kotlin.io.path.absolute
fun main(args: Array<String>) = TestWithTwoTemporaryAccounts().run()
@@ -73,15 +69,4 @@ internal class TestWithTwoTemporaryAccounts() {
app.getBriarUi().start(applicationScope)
}
-
- private fun getDataDir(): Path {
- val dataDir = Files.createTempDirectory("briar")
- if (!Files.exists(dataDir)) {
- throw IOException("Could not create directory: ${dataDir.absolute()}")
- } else if (!Files.isDirectory(dataDir)) {
- throw IOException("Data dir is not a directory: ${dataDir.absolute()}")
- }
- FileUtils.setRWX(dataDir)
- return dataDir
- }
}
--
GitLab