summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-07-09 17:45:41 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-09 17:45:41 +0000
commitf0a786e0ea883e57821a8d5dbed63058a6d95e44 (patch)
tree230fa6ceeac228e3c4b95e75883fc9c1c32b8136
parentf561e864bb5339400c7b70b0116a9ddaef4cb9ce (diff)
parent11133da337c493fbef734e1961d800f4d2ae1aaf (diff)
Merge "Re-enabled @Ignored tests on NetconfSessionImplTest"
-rw-r--r--ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfSessionImplTest.kt26
1 files changed, 13 insertions, 13 deletions
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 f5fd5410a..7f6c8d390 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
@@ -32,7 +32,6 @@ import org.apache.sshd.client.future.DefaultOpenFuture
import org.apache.sshd.client.session.ClientSession
import org.apache.sshd.common.FactoryManager
import org.junit.Before
-import org.junit.Ignore
import org.junit.Test
import org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor.api.DeviceInfo
import org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor.api.DeviceResponse
@@ -278,7 +277,6 @@ class NetconfSessionImplTest {
verify(exactly = 1) { netconfSessionSpy.clearReplies() }
}
- @Ignore //TODO
//Test for handling CompletableFuture.get returns InterruptedException inside NetconfDeviceCommunicator
@Test
fun `syncRpc throws NetconfException if InterruptedException is caught`() {
@@ -360,19 +358,21 @@ class NetconfSessionImplTest {
}
@Test
- @Ignore
- //TODO: get 't' inside asyncRpc to be a Throwable
fun `asyncRpc wraps exception`() {
- assertFailsWith(exceptionClass = NetconfException::class, message = futureMsg) {
- val netconfSessionSpy = spyk(netconfSession)
- val futureRet: CompletableFuture<String> = CompletableFuture.supplyAsync {
- throw Exception("blah")
- }
- futureRet.completeExceptionally(IOException("something is wrong"))
- every { netconfCommunicator.sendMessage(any(), any()) } returns futureRet
- //RUN
- val rpcResultFuture = netconfSessionSpy.asyncRpc("0", "0")
+ val netconfSessionSpy = spyk(netconfSession)
+ every { netconfSessionSpy.checkAndReestablish() } just Runs
+ val futureRet: CompletableFuture<String> = CompletableFuture.supplyAsync {
+ throw Exception("blah")
+ }
+ every { netconfCommunicator.sendMessage(any(), any()) } returns futureRet
+ //run the method
+ val rpcResultFuture = netconfSessionSpy.asyncRpc("0", "0")
+ every { netconfSessionSpy.checkAndReestablish() } just Runs
+ val e = assertFailsWith(exceptionClass = ExecutionException::class, message = futureMsg) {
+ rpcResultFuture.get()
}
+ val cause = e.cause
+ assertTrue { cause is NetconfException }
}
@Test