From a554ba3b9e84080cbd2c0177145a6334b7b1480a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Fri, 29 Oct 2021 14:43:11 +0200
Subject: [PATCH] Use Path instead of File in DesktopTestModule
---
.../briarproject/briar/desktop/DesktopDatabaseConfig.kt | 7 ++++---
.../org/briarproject/briar/desktop/DesktopModule.kt | 2 +-
.../org/briarproject/briar/desktop/DesktopTestModule.kt | 9 +++++----
.../briar/desktop/RunWithTemporaryAccount.kt | 2 +-
.../briar/desktop/TestWithTwoTemporaryAccounts.kt | 2 +-
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/DesktopDatabaseConfig.kt b/src/main/kotlin/org/briarproject/briar/desktop/DesktopDatabaseConfig.kt
index 8b936f0475..083c3c4927 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/DesktopDatabaseConfig.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/DesktopDatabaseConfig.kt
@@ -3,13 +3,14 @@ package org.briarproject.briar.desktop
import org.briarproject.bramble.api.crypto.KeyStrengthener
import org.briarproject.bramble.api.db.DatabaseConfig
import java.io.File
+import java.nio.file.Path
-internal class DesktopDatabaseConfig(private val dbDir: File, private val keyDir: File) :
+internal class DesktopDatabaseConfig(private val dbDir: Path, private val keyDir: Path) :
DatabaseConfig {
- override fun getDatabaseDirectory() = dbDir
+ override fun getDatabaseDirectory(): File = dbDir.toFile()
- override fun getDatabaseKeyDirectory() = keyDir
+ override fun getDatabaseKeyDirectory(): File = keyDir.toFile()
override fun getKeyStrengthener(): KeyStrengthener? = null
}
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
index 0672e990c8..73c16fd05f 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
@@ -65,7 +65,7 @@ internal class DesktopModule(
internal fun provideDatabaseConfig(): DatabaseConfig {
val dbDir = appDir.resolve("db")
val keyDir = appDir.resolve("key")
- return DesktopDatabaseConfig(dbDir.toFile(), keyDir.toFile())
+ return DesktopDatabaseConfig(dbDir, keyDir)
}
@Provides
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
index 7a19894337..562d13bba9 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
@@ -35,6 +35,7 @@ import org.briarproject.briar.desktop.ui.BriarUi
import org.briarproject.briar.desktop.ui.BriarUiImpl
import org.briarproject.briar.test.TestModule
import java.io.File
+import java.nio.file.Path
import java.util.Collections.emptyList
import javax.inject.Singleton
@@ -55,7 +56,7 @@ import javax.inject.Singleton
]
)
internal class DesktopTestModule(
- private val appDir: File,
+ private val appDir: Path,
private val socksPort: Int = DEFAULT_SOCKS_PORT,
private val controlPort: Int = DEFAULT_CONTROL_PORT
) {
@@ -67,8 +68,8 @@ internal class DesktopTestModule(
@Provides
@Singleton
internal fun provideDatabaseConfig(): DatabaseConfig {
- val dbDir = File(appDir, "db")
- val keyDir = File(appDir, "key")
+ val dbDir = appDir.resolve("db")
+ val keyDir = appDir.resolve("key")
return DesktopDatabaseConfig(dbDir, keyDir)
}
@@ -81,7 +82,7 @@ internal class DesktopTestModule(
@Provides
@TorDirectory
internal fun provideTorDirectory(): File {
- return File(appDir, "tor")
+ return appDir.resolve("tor").toFile()
}
@Provides
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt b/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
index 16ec7364f8..d58254b29f 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/RunWithTemporaryAccount.kt
@@ -24,7 +24,7 @@ internal class RunWithTemporaryAccount(val customization: BriarDesktopTestApp.()
val app =
DaggerBriarDesktopTestApp.builder().desktopTestModule(
- DesktopTestModule(dataDir.toFile())
+ DesktopTestModule(dataDir)
).build()
app.getShutdownManager().addShutdownHook {
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/TestWithTwoTemporaryAccounts.kt b/src/test/kotlin/org/briarproject/briar/desktop/TestWithTwoTemporaryAccounts.kt
index 2252d9e086..dd5f338cae 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/TestWithTwoTemporaryAccounts.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/TestWithTwoTemporaryAccounts.kt
@@ -40,7 +40,7 @@ internal class TestWithTwoTemporaryAccounts() {
val app =
DaggerBriarDesktopTestApp.builder().desktopTestModule(
- DesktopTestModule(dataDir.toFile(), socksPort, controlPort)
+ DesktopTestModule(dataDir, socksPort, controlPort)
).build()
apps.add(app)
--
GitLab