From 5c094c6adc53d958b2079de67d9d26242e10d7ef Mon Sep 17 00:00:00 2001 From: Brinda Santh Date: Fri, 31 Jan 2020 14:41:41 -0500 Subject: Spring boot, Kotlin version upgrades Dependent Patch : https://gerrit.onap.org/r/c/ccsdk/parent/+/100990 Fixed Jackson set method according to latest version. Fixed Security properties issues for failed JUnit test cases. Reused maven properties from parent for Spring boot, Nats, Kafka, etc Issue-ID: CCSDK-1737 Signed-off-by: Brinda Santh Change-Id: I04bb0e535161e05897f587a0f08a2689e10c5f41 --- .../org/onap/ccsdk/cds/blueprintsprocessor/uat/UatServicesTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ms/blueprintsprocessor/application/src/test/kotlin') diff --git a/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/UatServicesTest.kt b/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/UatServicesTest.kt index 688ba663c..aebda8c07 100644 --- a/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/UatServicesTest.kt +++ b/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/UatServicesTest.kt @@ -41,7 +41,6 @@ import org.apache.http.message.BasicHeader import org.hamcrest.CoreMatchers import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.Matchers.equalToIgnoringCase -import org.jetbrains.kotlin.konan.util.prefixIfNot import org.onap.ccsdk.cds.blueprintsprocessor.uat.logging.LogColor.COLOR_WIREMOCK import org.onap.ccsdk.cds.blueprintsprocessor.uat.logging.LogColor.markerOf import org.onap.ccsdk.cds.blueprintsprocessor.uat.utils.MarkedSlf4jNotifier @@ -67,6 +66,9 @@ import kotlin.test.BeforeTest import kotlin.test.Test import kotlin.test.assertNotNull +fun String.prefixIfNot(prefix: String) = + if (this.startsWith(prefix)) this else "$prefix$this" + @ActiveProfiles("uat") @Suppress("MemberVisibilityCanBePrivate") class UatServicesTest : BaseUatTest() { -- cgit 1.2.3-korg