From 185bc70fa1c024e532649bea650183e05c2d3d87 Mon Sep 17 00:00:00 2001
From: fkrzywka <filip.krzywka@nokia.com>
Date: Tue, 31 Jul 2018 14:26:09 +0200
Subject: 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
---
 .../main/config/ArgXnfSimulatorConfiurationTest.kt | 30 +++++++---------------
 1 file changed, 9 insertions(+), 21 deletions(-)

(limited to 'hv-collector-xnf-simulator/src/test')

diff --git a/hv-collector-xnf-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/main/config/ArgXnfSimulatorConfiurationTest.kt b/hv-collector-xnf-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/main/config/ArgXnfSimulatorConfiurationTest.kt
index e3a20c70..8749dc5b 100644
--- a/hv-collector-xnf-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/main/config/ArgXnfSimulatorConfiurationTest.kt
+++ b/hv-collector-xnf-simulator/src/test/kotlin/org/onap/dcae/collectors/veshv/main/config/ArgXnfSimulatorConfiurationTest.kt
@@ -19,8 +19,6 @@
  */
 package org.onap.dcae.collectors.veshv.main.config
 
-import arrow.core.identity
-import org.assertj.core.api.Assertions
 import org.assertj.core.api.Assertions.assertThat
 import org.jetbrains.spek.api.Spek
 import org.jetbrains.spek.api.dsl.describe
@@ -31,6 +29,8 @@ import org.onap.dcae.collectors.veshv.domain.SecurityConfiguration
 import org.onap.dcae.collectors.veshv.simulators.xnf.config.ArgXnfSimulatorConfiguration
 import org.onap.dcae.collectors.veshv.simulators.xnf.config.ArgXnfSimulatorConfiguration.DefaultValues
 import org.onap.dcae.collectors.veshv.simulators.xnf.config.SimulatorConfiguration
+import org.onap.dcae.collectors.veshv.tests.utils.parseExpectingFailure
+import org.onap.dcae.collectors.veshv.tests.utils.parseExpectingSuccess
 import org.onap.dcae.collectors.veshv.utils.commandline.WrongArgumentError
 import java.nio.file.Paths
 import kotlin.test.assertTrue
@@ -49,25 +49,13 @@ object ArgXnfSimulatorConfiurationTest : Spek({
         cut = ArgXnfSimulatorConfiguration()
     }
 
-    fun parse(vararg cmdLine: String): SimulatorConfiguration =
-            cut.parse(cmdLine).fold(
-                    { throw AssertionError("Parsing result should be present") },
-                    ::identity
-            )
-
-    fun parseExpectingFailure(vararg cmdLine: String) =
-            cut.parse(cmdLine).fold(
-                    ::identity,
-                    { throw AssertionError("parsing should have failed") }
-            )
-
     describe("parsing arguments") {
         lateinit var result: SimulatorConfiguration
 
         given("all parameters are present in the long form") {
 
             beforeEachTest {
-                result = parse("--ssl-disable",
+                result = cut.parseExpectingSuccess("--ssl-disable",
                         "--listen-port", listenPort,
                         "--ves-host", vesHost,
                         "--ves-port", vesPort,
@@ -98,7 +86,7 @@ object ArgXnfSimulatorConfiurationTest : Spek({
         given("some parameters are present in the short form") {
 
             beforeEachTest {
-                result = parse("-p", listenPort, "-h", vesHost, "--ves-port", vesPort)
+                result = cut.parseExpectingSuccess("-p", listenPort, "-h", vesHost, "--ves-port", vesPort)
             }
 
             it("should set proper listen port") {
@@ -117,7 +105,7 @@ object ArgXnfSimulatorConfiurationTest : Spek({
         given("all optional parameters are absent") {
 
             beforeEachTest {
-                result = parse("-p", listenPort, "-h", vesHost, "-v", vesPort)
+                result = cut.parseExpectingSuccess("-p", listenPort, "-h", vesHost, "-v", vesPort)
             }
 
             on("security config") {
@@ -139,7 +127,7 @@ object ArgXnfSimulatorConfiurationTest : Spek({
 
         given("disabled ssl certs together with all other parameters") {
             beforeEachTest {
-                result = parse("--ssl-disable",
+                result = cut.parseExpectingSuccess("--ssl-disable",
                         "--listen-port", listenPort,
                         "--ves-port", "888",
                         "--ves-host", vesHost,
@@ -170,21 +158,21 @@ object ArgXnfSimulatorConfiurationTest : Spek({
         describe("required parameter is absent") {
             given("ves port is missing") {
                 it("should throw exception") {
-                    assertThat(parseExpectingFailure("-p", listenPort, "-h", vesHost))
+                    assertThat(cut.parseExpectingFailure("-p", listenPort, "-h", vesHost))
                             .isInstanceOf(WrongArgumentError::class.java)
                 }
             }
 
             given("ves host is missing") {
                 it("should throw exception") {
-                    assertThat(parseExpectingFailure("-p", listenPort, "-v", vesPort))
+                    assertThat(cut.parseExpectingFailure("-p", listenPort, "-v", vesPort))
                             .isInstanceOf(WrongArgumentError::class.java)
                 }
             }
 
             given("listen port is missing") {
                 it("should throw exception") {
-                    assertThat(parseExpectingFailure("-h", vesHost, "-v", vesPort))
+                    assertThat(cut.parseExpectingFailure("-h", vesHost, "-v", vesPort))
                             .isInstanceOf(WrongArgumentError::class.java)
                 }
             }
-- 
cgit 1.2.3-korg