Skip to content
Snippets Groups Projects
Commit 7e20b84c authored by Sebastian's avatar Sebastian
Browse files

Move getDataDir() to TestUtils

parent a28fa049
No related branches found
No related tags found
1 merge request!35Make it possible to run multiple versions of briar-desktop concurrently
......@@ -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
}
}
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
......@@ -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
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment