Extract test-utils module

- removed duplicate code that was creating VesMessages
and similiar objects
- removed duplicate code in command line parsing tests
- made minor refactorings to avoid passing unnecessary params
and to be as verbose as possible in tests

Closes ONAP-699

Change-Id: I2607f1f775054ae1c5f275c231895f838b415371
Signed-off-by: fkrzywka <filip.krzywka@nokia.com>
Issue-ID: DCAEGEN2-601

2 files changed, 17 insertions, 30 deletions

diff --git a/hv-collector-ves-message-generator/pom.xml b/hv-collector-ves-message-generator/pom.xml
index f049d78f..7da3bb21 100644
--- a/hv-collector-ves-message-generator/pom.xml
+++ b/hv-collector-ves-message-generator/pom.xml
@@ -63,6 +63,12 @@
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>hv-collector-test-utils</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
diff --git a/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/impl/MessageGeneratorImplTest.kt b/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/impl/MessageGeneratorImplTest.kt
index 1e38d46e..1b121ec4 100644
--- a/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/impl/MessageGeneratorImplTest.kt
+++ b/hv-collector-ves-message-generator/src/test/kotlin/org/onap/dcae/collectors/veshv/ves/message/generator/impl/impl/MessageGeneratorImplTest.kt
@@ -30,6 +30,7 @@ import org.jetbrains.spek.api.dsl.it
 import org.jetbrains.spek.api.dsl.on
 import org.onap.dcae.collectors.veshv.domain.ByteData
 import org.onap.dcae.collectors.veshv.domain.PayloadWireFrameMessage
+import org.onap.dcae.collectors.veshv.tests.utils.commonHeader
 import org.onap.dcae.collectors.veshv.ves.message.generator.api.MessageGenerator
 import org.onap.dcae.collectors.veshv.ves.message.generator.api.MessageParameters
 import org.onap.dcae.collectors.veshv.ves.message.generator.api.MessageType
@@ -53,7 +54,7 @@ object MessageGeneratorImplTest : Spek({
                     val limit = 1000L
                     generator
                             .createMessageFlux(listOf(MessageParameters(
-                                    createSampleCommonHeader(HVRANMEAS),
+                                    commonHeader(HVRANMEAS),
                                     MessageType.VALID
                             )))
                             .take(limit)
@@ -66,7 +67,7 @@ object MessageGeneratorImplTest : Spek({
                 it("should create message flux of specified size") {
                     generator
                             .createMessageFlux(listOf(MessageParameters(
-                                    createSampleCommonHeader(HVRANMEAS),
+                                    commonHeader(HVRANMEAS),
                                     MessageType.VALID,
                                     5
                             )))
@@ -79,7 +80,7 @@ object MessageGeneratorImplTest : Spek({
                 it("should create flux of valid messages with given domain") {
                     generator
                             .createMessageFlux(listOf(MessageParameters(
-                                    createSampleCommonHeader(FAULT),
+                                    commonHeader(FAULT),
                                     MessageType.VALID,
                                     1
                             )))
@@ -97,7 +98,7 @@ object MessageGeneratorImplTest : Spek({
 
                     generator
                             .createMessageFlux(listOf(MessageParameters(
-                                    createSampleCommonHeader(HVRANMEAS),
+                                    commonHeader(HVRANMEAS),
                                     MessageType.TOO_BIG_PAYLOAD,
                                     1
                             )))
@@ -114,7 +115,7 @@ object MessageGeneratorImplTest : Spek({
                 it("should create flux of messages with invalid payload") {
                     generator
                             .createMessageFlux(listOf(MessageParameters(
-                                    createSampleCommonHeader(HVRANMEAS),
+                                    commonHeader(HVRANMEAS),
                                     MessageType.INVALID_GPB_DATA,
                                     1
                             )))
@@ -132,7 +133,7 @@ object MessageGeneratorImplTest : Spek({
                 it("should create flux of messages with invalid version") {
                     generator
                             .createMessageFlux(listOf(MessageParameters(
-                                    createSampleCommonHeader(HVRANMEAS),
+                                    commonHeader(HVRANMEAS),
                                     MessageType.INVALID_WIRE_FRAME,
                                     1
                             )))
@@ -150,7 +151,7 @@ object MessageGeneratorImplTest : Spek({
                 it("should create flux of valid messages with fixed payload") {
                     generator
                             .createMessageFlux(listOf(MessageParameters(
-                                    createSampleCommonHeader(FAULT),
+                                    commonHeader(FAULT),
                                     MessageType.FIXED_PAYLOAD,
                                     1
                             )))
@@ -169,9 +170,9 @@ object MessageGeneratorImplTest : Spek({
             it("should create concatenated flux of messages") {
                 val singleFluxSize = 5L
                 val messageParameters = listOf(
-                        MessageParameters(createSampleCommonHeader(HVRANMEAS), MessageType.VALID, singleFluxSize),
-                        MessageParameters(createSampleCommonHeader(FAULT), MessageType.TOO_BIG_PAYLOAD, singleFluxSize),
-                        MessageParameters(createSampleCommonHeader(HEARTBEAT), MessageType.VALID, singleFluxSize)
+                        MessageParameters(commonHeader(HVRANMEAS), MessageType.VALID, singleFluxSize),
+                        MessageParameters(commonHeader(FAULT), MessageType.TOO_BIG_PAYLOAD, singleFluxSize),
+                        MessageParameters(commonHeader(HEARTBEAT), MessageType.VALID, singleFluxSize)
                 )
                 generator.createMessageFlux(messageParameters)
                         .test()
@@ -203,23 +204,3 @@ fun extractCommonEventHeader(bytes: ByteData): CommonEventHeader {
 fun extractHvRanMeasFields(bytes: ByteData): ByteString {
     return VesEvent.parseFrom(bytes.unsafeAsArray()).hvRanMeasFields
 }
-
-private fun createSampleCommonHeader(domain: CommonEventHeader.Domain): CommonEventHeader = CommonEventHeader.newBuilder()
-        .setVersion("sample-version")
-        .setDomain(domain)
-        .setSequence(1)
-        .setPriority(CommonEventHeader.Priority.NORMAL)
-        .setEventId("sample-event-id")
-        .setEventName("sample-event-name")
-        .setEventType("sample-event-type")
-        .setStartEpochMicrosec(120034455)
-        .setLastEpochMicrosec(120034455)
-        .setNfNamingCode("sample-nf-naming-code")
-        .setNfcNamingCode("sample-nfc-naming-code")
-        .setReportingEntityId("sample-reporting-entity-id")
-        .setReportingEntityName(ByteString.copyFromUtf8("sample-reporting-entity-name"))
-        .setSourceId(ByteString.copyFromUtf8("sample-source-id"))
-        .setSourceName("sample-source-name")
-        .build()
-
-