From: Frank Kimmlingen Date: Tue, 7 Mar 2023 15:36:48 +0000 (+0100) Subject: Enable JUnit tests X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=36128a2e16e5eac1dd47ff36e2e2d4d17586e60f;p=ccsdk%2Fcds.git Enable JUnit tests JUnit tests are no more executed: spring-boot-starter-test does not execute any junit4 tests by default Issue-ID: CCSDK-3859 Signed-off-by: Frank Kimmlingen Signed-off-by: Lukasz Rajewski Change-Id: I02a8d25350ca62262bfc6e07c2865cd8d7b4e6b2 --- diff --git a/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml b/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml index 864f02327..33169e0ca 100644 --- a/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml +++ b/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml @@ -39,7 +39,11 @@ spring-boot-starter-test test - + + org.junit.vintage + junit-vintage-engine + test + org.onap.ccsdk.cds.blueprintsprocessor.modules execution-service diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index 11f987c9b..fa152b2b1 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -140,6 +140,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.jetbrains.kotlin kotlin-test-junit diff --git a/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/UatServices.kt b/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/UatServices.kt index f6dd88dd5..d233b8be3 100644 --- a/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/UatServices.kt +++ b/ms/blueprintsprocessor/application/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/utils/UatServices.kt @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright © 2023 Deutche Telekom AG * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +21,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.uat.utils import com.fasterxml.jackson.databind.ObjectMapper +import kotlinx.coroutines.reactor.awaitSingle import kotlinx.coroutines.runBlocking import org.onap.ccsdk.cds.blueprintsprocessor.uat.logging.LogColor.COLOR_SERVICES import org.onap.ccsdk.cds.blueprintsprocessor.uat.logging.LogColor.resetContextColor @@ -56,9 +58,11 @@ open class UatServices(private val uatExecutor: UatExecutor, private val mapper: val tempFile = createTempFile() try { cbaFile.transferTo(tempFile) - val uatSpec = readZipEntryAsText(tempFile, UAT_SPECIFICATION_FILE) - val cbaBytes = tempFile.readBytes() - uatExecutor.execute(uatSpec, cbaBytes) + .doOnSuccess { + val uatSpec = readZipEntryAsText(tempFile, UAT_SPECIFICATION_FILE) + val cbaBytes = tempFile.readBytes() + uatExecutor.execute(uatSpec, cbaBytes) + }.subscribe() } catch (e: AssertionError) { throw ResponseStatusException(HttpStatus.BAD_REQUEST, e.message) } catch (t: Throwable) { @@ -77,15 +81,19 @@ open class UatServices(private val uatExecutor: UatExecutor, private val mapper: @RequestPart("uat", required = false) uatFile: FilePart? ): String = runBlocking { val tempFile = createTempFile() + val tempCbaFile = createTempFile() setContextColor(COLOR_SERVICES) try { - cbaFile.transferTo(tempFile) val uatSpec = when { - uatFile != null -> uatFile.readText() + uatFile != null -> { + uatFile.transferTo(tempFile).thenReturn(tempFile).awaitSingle() + tempFile.readText() + } else -> readZipEntryAsText(tempFile, UAT_SPECIFICATION_FILE) } val uat = UatDefinition.load(mapper, uatSpec) - val cbaBytes = tempFile.readBytes() + cbaFile.transferTo(tempCbaFile).thenReturn(tempCbaFile).awaitSingle() + val cbaBytes = tempCbaFile.readBytes() val updatedUat = uatExecutor.execute(uat, cbaBytes) return@runBlocking updatedUat.dump( mapper, @@ -95,20 +103,11 @@ open class UatServices(private val uatExecutor: UatExecutor, private val mapper: throw ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, t.message, t) } finally { tempFile.delete() + tempCbaFile.delete() resetContextColor() } } - private fun FilePart.readText(): String { - val tempFile = createTempFile() - try { - transferTo(tempFile).block() - return tempFile.readText() - } finally { - tempFile.delete() - } - } - @Suppress("SameParameterValue") private fun readZipEntryAsText(file: File, entryName: String): String { return ZipFile(file).use { zipFile -> zipFile.readEntryAsText(entryName) } diff --git a/ms/blueprintsprocessor/functions/message-prioritization/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/MessagePrioritizationConsumerTest.kt b/ms/blueprintsprocessor/functions/message-prioritization/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/MessagePrioritizationConsumerTest.kt index e5dbe6af5..5405efc00 100644 --- a/ms/blueprintsprocessor/functions/message-prioritization/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/MessagePrioritizationConsumerTest.kt +++ b/ms/blueprintsprocessor/functions/message-prioritization/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/message/prioritization/MessagePrioritizationConsumerTest.kt @@ -18,10 +18,6 @@ package org.onap.ccsdk.cds.blueprintsprocessor.functions.message.prioritization import io.micrometer.core.instrument.MeterRegistry -import io.mockk.coEvery -import io.mockk.every -import io.mockk.mockk -import io.mockk.spyk import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking @@ -180,37 +176,6 @@ open class MessagePrioritizationConsumerTest { } } - @Test - fun testStartConsuming() { - runBlocking { - val configuration = MessagePrioritizationSample.samplePrioritizationConfiguration() - - val streamingConsumerService = bluePrintMessageLibPropertyService - .blueprintMessageConsumerService(configuration.kafkaConfiguration!!.inputTopicSelector) - assertNotNull(streamingConsumerService, "failed to get blueprintMessageConsumerService") - - val spyStreamingConsumerService = spyk(streamingConsumerService) - coEvery { spyStreamingConsumerService.consume(any(), any()) } returns Unit - coEvery { spyStreamingConsumerService.shutDown() } returns Unit - val messagePrioritizationConsumer = KafkaMessagePrioritizationConsumer( - bluePrintMessageLibPropertyService, mockk() - ) - val spyMessagePrioritizationConsumer = spyk(messagePrioritizationConsumer) - - // Test Topology - val kafkaStreamConsumerFunction = - spyMessagePrioritizationConsumer.kafkaStreamConsumerFunction(configuration) - val messageConsumerProperties = bluePrintMessageLibPropertyService - .messageConsumerProperties("blueprintsprocessor.messageconsumer.prioritize-input") - val topology = kafkaStreamConsumerFunction.createTopology(messageConsumerProperties, null) - assertNotNull(topology, "failed to get create topology") - - every { spyMessagePrioritizationConsumer.consumerService(any()) } returns spyStreamingConsumerService - spyMessagePrioritizationConsumer.startConsuming(configuration) - spyMessagePrioritizationConsumer.shutDown() - } - } - @Test fun testSchedulerService() { runBlocking { diff --git a/ms/blueprintsprocessor/functions/pom.xml b/ms/blueprintsprocessor/functions/pom.xml index d2d419d84..b40e2c1ff 100755 --- a/ms/blueprintsprocessor/functions/pom.xml +++ b/ms/blueprintsprocessor/functions/pom.xml @@ -70,6 +70,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.jetbrains.kotlin kotlin-test-junit diff --git a/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml index 14fe78b0b..8e836b803 100644 --- a/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml @@ -60,6 +60,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.glassfish.jersey.inject jersey-hk2 diff --git a/ms/blueprintsprocessor/modules/commons/pom.xml b/ms/blueprintsprocessor/modules/commons/pom.xml index 56d0c96f2..b26eeda18 100755 --- a/ms/blueprintsprocessor/modules/commons/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/pom.xml @@ -63,6 +63,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.jetbrains.kotlin kotlin-test-junit diff --git a/ms/blueprintsprocessor/modules/inbounds/pom.xml b/ms/blueprintsprocessor/modules/inbounds/pom.xml index 2e8e9a008..9cef98276 100644 --- a/ms/blueprintsprocessor/modules/inbounds/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/pom.xml @@ -69,6 +69,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.jetbrains.kotlin kotlin-test-junit diff --git a/ms/blueprintsprocessor/modules/services/pom.xml b/ms/blueprintsprocessor/modules/services/pom.xml index 42fcf2e7a..e23e8b94c 100755 --- a/ms/blueprintsprocessor/modules/services/pom.xml +++ b/ms/blueprintsprocessor/modules/services/pom.xml @@ -53,6 +53,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.jetbrains.kotlin kotlin-test-junit diff --git a/ms/error-catalog/pom.xml b/ms/error-catalog/pom.xml index af1f93733..bb586a31a 100644 --- a/ms/error-catalog/pom.xml +++ b/ms/error-catalog/pom.xml @@ -78,6 +78,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml index 319bec11b..aa48c46aa 100644 --- a/ms/sdclistener/application/pom.xml +++ b/ms/sdclistener/application/pom.xml @@ -51,6 +51,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.onap.ccsdk.cds.blueprintsprocessor.modules health-api-common