From 11133da337c493fbef734e1961d800f4d2ae1aaf Mon Sep 17 00:00:00 2001 From: Eliezio Oliveira Date: Tue, 4 Jun 2019 22:58:35 +0100 Subject: Re-enabled @Ignored tests on NetconfSessionImplTest Change-Id: I7d223956c95d4effc6a6d6c4cc3bf6648ada28be Issue-ID: CCSDK-1451 Signed-off-by: Eliezio Oliveira --- .../executor/core/NetconfSessionImplTest.kt | 26 +++++++++++----------- 1 file 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 = 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 = 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 -- cgit 1.2.3-korg