X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ms%2Fblueprintsprocessor%2Ffunctions%2Fnetconf-executor%2Fsrc%2Ftest%2Fkotlin%2Forg%2Fonap%2Fccsdk%2Fcds%2Fblueprintsprocessor%2Ffunctions%2Fnetconf%2Fexecutor%2Fcore%2FNetconfSessionImplTest.kt;fp=ms%2Fblueprintsprocessor%2Ffunctions%2Fnetconf-executor%2Fsrc%2Ftest%2Fkotlin%2Forg%2Fonap%2Fccsdk%2Fcds%2Fblueprintsprocessor%2Ffunctions%2Fnetconf%2Fexecutor%2Fcore%2FNetconfSessionImplTest.kt;h=22c68f18299029e992e590b1ef6bd0f3b96a19c9;hb=bffa7655e2fbd73a3975b650a9ec955c8a9d7d2f;hp=41e4f8290e832c36ba47298657e12e61799b678c;hpb=5b924a33f2b7cd936aab934d706c8f735f7570d6;p=ccsdk%2Fcds.git diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImplTest.kt b/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImplTest.kt index 41e4f8290..22c68f182 100644 --- a/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImplTest.kt +++ b/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImplTest.kt @@ -30,7 +30,7 @@ import org.apache.sshd.client.future.DefaultAuthFuture import org.apache.sshd.client.future.DefaultConnectFuture import org.apache.sshd.client.future.DefaultOpenFuture import org.apache.sshd.client.session.ClientSession -import org.apache.sshd.common.FactoryManager +import org.apache.sshd.core.CoreModuleProperties import org.junit.Before import org.junit.Test import org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor.api.DeviceInfo @@ -385,8 +385,8 @@ class NetconfSessionImplTest { netconfSessionSpy.setClient(mockSshClient) netconfSessionSpy.connect() verify { mockSshClient.start() } - assertTrue { propertiesMap.containsKey(FactoryManager.IDLE_TIMEOUT) } - assertTrue { propertiesMap.containsKey(FactoryManager.NIO2_READ_TIMEOUT) } + assertTrue { propertiesMap.containsKey(CoreModuleProperties.IDLE_TIMEOUT.name) } + assertTrue { propertiesMap.containsKey(CoreModuleProperties.NIO2_READ_TIMEOUT.name) } } @Test @@ -429,7 +429,7 @@ class NetconfSessionImplTest { val succeededSessionFuture = DefaultConnectFuture(Any(), Any()) succeededSessionFuture.value = mockClientSession every { mockSshClient.connect(deviceInfo.username, deviceInfo.ipAddress, deviceInfo.port) } returns succeededSessionFuture - every { mockClientSession.waitFor(any(), any()) } returns + every { mockClientSession.waitFor(any(), any()) } returns setOf(ClientSession.ClientSessionEvent.WAIT_AUTH, ClientSession.ClientSessionEvent.CLOSED) val netconfSessionSpy = spyk(netconfSession, recordPrivateCalls = true) every { netconfSessionSpy["setupNewSSHClient"]() as Unit } just Runs @@ -451,7 +451,7 @@ class NetconfSessionImplTest { val succeededSessionFuture = DefaultConnectFuture(Any(), Any()) succeededSessionFuture.value = mockClientSession every { mockSshClient.connect(deviceInfo.username, deviceInfo.ipAddress, deviceInfo.port) } returns succeededSessionFuture - every { mockClientSession.waitFor(any(), any()) } returns + every { mockClientSession.waitFor(any(), any()) } returns setOf( ClientSession.ClientSessionEvent.WAIT_AUTH, ClientSession.ClientSessionEvent.CLOSED,