From ff337763b49d7a262f862f3919b11a031e7b7223 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Fri, 20 Jan 2023 11:10:59 +0100 Subject: [PATCH] Fixed build issues --- .../com/jetpackduba/gitnuro/credentials/GRemoteSession.kt | 3 --- .../gitnuro/app/git/BeforeRepoAllTestsExtension.kt | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/credentials/GRemoteSession.kt b/src/main/kotlin/com/jetpackduba/gitnuro/credentials/GRemoteSession.kt index d86abb9..2408aab 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/credentials/GRemoteSession.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/credentials/GRemoteSession.kt @@ -13,13 +13,10 @@ import javax.inject.Provider private const val DEFAULT_SSH_PORT = 22 class GRemoteSession @Inject constructor( - private val processProvider: Provider, private val processSession: Provider, private val credentialsStateManager: CredentialsStateManager, ) : RemoteSession { private val client = SshClient.setUpDefaultClient() - - private var connectFuture: ConnectFuture? = null private var session: LibSshSession? = null override fun exec(commandName: String, timeout: Int): Process { diff --git a/src/test/kotlin/com/jetpackduba/gitnuro/app/git/BeforeRepoAllTestsExtension.kt b/src/test/kotlin/com/jetpackduba/gitnuro/app/git/BeforeRepoAllTestsExtension.kt index ec9ffb5..aeead36 100644 --- a/src/test/kotlin/com/jetpackduba/gitnuro/app/git/BeforeRepoAllTestsExtension.kt +++ b/src/test/kotlin/com/jetpackduba/gitnuro/app/git/BeforeRepoAllTestsExtension.kt @@ -4,6 +4,7 @@ import com.jetpackduba.gitnuro.credentials.* import com.jetpackduba.gitnuro.di.factories.HttpCredentialsFactory import com.jetpackduba.gitnuro.git.remote_operations.CloneRepositoryUseCase import com.jetpackduba.gitnuro.git.remote_operations.HandleTransportUseCase +import com.jetpackduba.gitnuro.ssh.libssh.LibSshSession import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.runBlocking @@ -13,6 +14,7 @@ import org.junit.jupiter.api.extension.BeforeAllCallback import org.junit.jupiter.api.extension.ExtensionContext import org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL import java.io.File +import javax.inject.Provider import kotlin.io.path.createTempDirectory private const val REPO_URL = "https://github.com/JetpackDuba/Gitnuro_TestsRepo.git" @@ -33,10 +35,13 @@ class BeforeRepoAllTestsExtension : BeforeAllCallback, AfterAllCallback { context.root.getStore(GLOBAL).put("gitnuro_tests", this) val credentialsStateManager = CredentialsStateManager() + val ssh = Provider { + LibSshSession() + } val cloneRepositoryUseCase = CloneRepositoryUseCase( HandleTransportUseCase( - sessionManager = GSessionManager { GRemoteSession({ GProcess() }, credentialsStateManager) }, + sessionManager = GSessionManager { GRemoteSession(ssh, credentialsStateManager) }, httpCredentialsProvider = object : HttpCredentialsFactory { override fun create(git: Git?): HttpCredentialsProvider = HttpCredentialsProvider(credentialsStateManager, git)