diff options
Diffstat (limited to 'libs/sftp/src/test/java/org/the_jk/cleversync')
4 files changed, 26 insertions, 39 deletions
diff --git a/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SftpTestHelper.kt b/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SftpTestHelper.kt index 69a5011..d692869 100644 --- a/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SftpTestHelper.kt +++ b/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SftpTestHelper.kt @@ -1,6 +1,9 @@ package org.the_jk.cleversync.sftp import com.google.common.truth.Truth.assertThat +import org.the_jk.cleversync.io.ModifiableTree +import org.the_jk.cleversync.io.sftp.SftpCredentials +import org.the_jk.cleversync.io.sftp.SftpHostsStorage import java.io.File class SftpTestHelper { @@ -14,6 +17,23 @@ class SftpTestHelper { private var dockerRunning = false + fun openTree(credentials: SftpCredentials, hostsStorage: SftpHostsStorage): ModifiableTree { + assertThat(_shareDir.listFiles()).isEmpty() + + return SftpTreeFactory.modifiableTree(_uri, credentials, hostsStorage).getOrThrow() + } + + fun closeTree(tree: ModifiableTree) { + tree.close() + + for (file in _shareDir.listFiles()!!) { + if (file.isDirectory) { + file.deleteRecursively() + } else { + file.delete() + } + } + } fun setUp() { _uri = "ssh://127.0.0.1:10022/share" _dockerDir = File(System.getProperty("dockerDir")!!) diff --git a/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SftpTreeTest.kt b/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SftpTreeTest.kt index fd8f83b..ff65994 100644 --- a/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SftpTreeTest.kt +++ b/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SftpTreeTest.kt @@ -37,26 +37,16 @@ class SftpTreeTest : TreeAbstractTest() { @Before fun setUpTest() { - assertThat(shareDir.listFiles()).isEmpty() - val credentials = getCredentials() hostsStorage = SftpHostsStorage(ApplicationProvider.getApplicationContext()) - tree = SftpTreeFactory.modifiableTree(helper.uri, credentials, hostsStorage).getOrThrow() + tree = helper.openTree(credentials, hostsStorage) } @After fun tearDownTest() { - tree.close() - - for (file in shareDir.listFiles()!!) { - if (file.isDirectory) { - file.deleteRecursively() - } else { - file.delete() - } - } + helper.closeTree(tree) } @Test diff --git a/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SingleMergeLocalSftpTest.kt b/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SingleMergeLocalSftpTest.kt index 0e61fa6..f3f84ee 100644 --- a/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SingleMergeLocalSftpTest.kt +++ b/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SingleMergeLocalSftpTest.kt @@ -1,7 +1,6 @@ package org.the_jk.cleversync.sftp import androidx.test.core.app.ApplicationProvider -import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.AfterClass import org.junit.BeforeClass @@ -28,15 +27,7 @@ class SingleMergeLocalSftpTest : BaseSingleMergeTest() { @After fun tearDownTest() { - sftp.close() - - for (file in helper.shareDir.listFiles()!!) { - if (file.isDirectory) { - file.deleteRecursively() - } else { - file.delete() - } - } + helper.closeTree(sftp) } override fun source(): ModifiableTree { @@ -46,13 +37,11 @@ class SingleMergeLocalSftpTest : BaseSingleMergeTest() { override fun sourceSupportsSymlinks() = true override fun target(): ModifiableTree { - assertThat(helper.shareDir.listFiles()).isEmpty() - val credentials = SftpCredentials.SftpPasswordCredentials("user", "notverysecret") hostsStorage = SftpHostsStorage(ApplicationProvider.getApplicationContext()) - sftp = SftpTreeFactory.modifiableTree(helper.uri, credentials, hostsStorage).getOrThrow() + sftp = helper.openTree(credentials, hostsStorage) return sftp } diff --git a/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SingleMergeSftpLocalTest.kt b/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SingleMergeSftpLocalTest.kt index eeb473c..757fd25 100644 --- a/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SingleMergeSftpLocalTest.kt +++ b/libs/sftp/src/test/java/org/the_jk/cleversync/sftp/SingleMergeSftpLocalTest.kt @@ -1,7 +1,6 @@ package org.the_jk.cleversync.sftp import androidx.test.core.app.ApplicationProvider -import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.AfterClass import org.junit.BeforeClass @@ -15,7 +14,6 @@ import org.the_jk.cleversync.io.ModifiableTree import org.the_jk.cleversync.io.sftp.SftpCredentials import org.the_jk.cleversync.io.sftp.SftpHostsStorage import org.the_jk.cleversync.local.LocalTreeFactory -import kotlin.time.Duration.Companion.milliseconds @Config(manifest=Config.NONE) @RunWith(RobolectricTestRunner::class) @@ -29,25 +27,15 @@ class SingleMergeSftpLocalTest : BaseSingleMergeTest() { @After fun tearDownTest() { - sftp.close() - - for (file in helper.shareDir.listFiles()!!) { - if (file.isDirectory) { - file.deleteRecursively() - } else { - file.delete() - } - } + helper.closeTree(sftp) } override fun source(): ModifiableTree { - assertThat(helper.shareDir.listFiles()).isEmpty() - val credentials = SftpCredentials.SftpPasswordCredentials("user", "notverysecret") hostsStorage = SftpHostsStorage(ApplicationProvider.getApplicationContext()) - sftp = SftpTreeFactory.modifiableTree(helper.uri, credentials, hostsStorage).getOrThrow() + sftp = helper.openTree(credentials, hostsStorage) return sftp } |