summaryrefslogtreecommitdiffstats
path: root/ms/blueprintsprocessor
diff options
context:
space:
mode:
authorEliezio Oliveira <eliezio.oliveira@est.tech>2019-05-31 17:27:28 +0100
committerEliezio Oliveira <eliezio.oliveira@est.tech>2019-07-08 11:27:20 +0100
commit0ddc8914d59c697624f5bba2cb0c0de66641c9e2 (patch)
tree63df7bd12b5a77464e83bd8ee98a44eec690ba5a /ms/blueprintsprocessor
parent55c4a8812f030a2db17fc78845983afd89c2b36a (diff)
Re-enabled test for happy-path case on NetconfDeviceCommunicatorTest
Change-Id: I741e87f889b346ab63c29ce17231815a87a4e94d Issue-ID: CCSDK-1450 Signed-off-by: Eliezio Oliveira <eliezio.oliveira@est.tech>
Diffstat (limited to 'ms/blueprintsprocessor')
-rw-r--r--ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfDeviceCommunicatorTest.kt19
1 files changed, 9 insertions, 10 deletions
diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfDeviceCommunicatorTest.kt b/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfDeviceCommunicatorTest.kt
index cb023fd9a..47c729187 100644
--- a/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfDeviceCommunicatorTest.kt
+++ b/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/core/NetconfDeviceCommunicatorTest.kt
@@ -24,19 +24,15 @@ import io.mockk.mockk
import io.mockk.spyk
import io.mockk.verify
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.NetconfReceivedEvent
import org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor.api.NetconfSession
import org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor.api.NetconfSessionListener
import org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor.utils.RpcMessageUtils
-import java.io.ByteArrayInputStream
import java.io.IOException
import java.io.InputStream
import java.io.OutputStream
-import java.io.Reader
-import java.io.Writer
import java.nio.charset.StandardCharsets
import java.util.concurrent.CompletableFuture
import java.util.concurrent.ConcurrentHashMap
@@ -62,13 +58,12 @@ class NetconfDeviceCommunicatorTest {
|
|#4
|<rpc
- |
|#18
| message-id="102"
|
|#79
- | xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
- | <close-session/>
+ | xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+ | <close-session/>
|</rpc>
|##
|""".trimMargin()
@@ -176,7 +171,6 @@ class NetconfDeviceCommunicatorTest {
assertEquals("", eventSlot.captured.messagePayload)
}
- @Ignore //TODO: Not clear on validateChunkedFraming, the size validation part could be discarding valid msg..
@Test
fun `NetconfDeviceCommunicator in END_CHUNKED_PATTERN passing validation generates DEVICE_REPLY`() {
val eventSlot = CapturingSlot<NetconfReceivedEvent>()
@@ -190,7 +184,12 @@ class NetconfDeviceCommunicatorTest {
assertTrue { eventSlot.isCaptured }
//eventually, sessionListener is called with message type DEVICE_REPLY
assertEquals(NetconfReceivedEvent.Type.DEVICE_REPLY, eventSlot.captured.type)
- assertEquals("", eventSlot.captured.messagePayload)
+ assertEquals("""
+<rpc message-id="102"
+ xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+ <close-session/>
+</rpc>
+ """.trimIndent(), eventSlot.captured.messagePayload)
}
@Test
@@ -199,7 +198,7 @@ class NetconfDeviceCommunicatorTest {
fun `chunked sample is validated by the chunked response regex`() {
val test1 = "\n#10\nblah\n##\n"
val chunkedFramingPattern = Pattern.compile("(\\n#([1-9][0-9]*)\\n(.+))+\\n##\\n", Pattern.DOTALL)
- val matcher = chunkedFramingPattern.matcher(validChunkedEncodedMsg)
+ val matcher = chunkedFramingPattern.matcher(test1)
assertTrue { matcher.matches() }
}