diff --git a/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt b/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt index 13370267c3eab041ee2a993963da627fa5b85560..dd669a4e72eaa301ef6fbe5dfcfe0800444ad112 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 0000000000000000000000000000000000000000..0bc9746ca81376963566acbd622e9fa95af70e7a --- /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 1336ba996531747e3188d199186006c448c8209e..5f852e12b53228081b7a3f4d0728ca91f71339f5 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 - } }