diff options
author | Jozsef Csongvai <jozsef.csongvai@bell.ca> | 2021-07-26 12:00:59 -0400 |
---|---|---|
committer | Jozsef Csongvai <jozsef.csongvai@bell.ca> | 2021-07-28 15:44:01 -0400 |
commit | daab14bd058de198c80b71d63e108fd788b7f5ee (patch) | |
tree | 252cfdef5b2e1500e5bd152f3f5c52602b6b0deb /ms/blueprintsprocessor/modules/commons/nats-lib/src/test | |
parent | 82e396d6917519468376d177dd6a2710e84fa23a (diff) |
Revert "Renaming Files having BluePrint to have Blueprint"
The renaming in CCSDK-3098 caused breaking changes to the grpc api and
compile issues for kotlin scripts.
Issue-ID: CCSDK-3385
Change-Id: I0d745cb858371678eabcb2284671c1fd76a1ab6d
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Diffstat (limited to 'ms/blueprintsprocessor/modules/commons/nats-lib/src/test')
4 files changed, 27 insertions, 27 deletions
diff --git a/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/NatsPropertiesDSLTest.kt b/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/NatsPropertiesDSLTest.kt index fa70f0738..a95b900fe 100644 --- a/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/NatsPropertiesDSLTest.kt +++ b/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/NatsPropertiesDSLTest.kt @@ -17,7 +17,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.nats import org.junit.Test -import org.onap.ccsdk.cds.controllerblueprints.core.BlueprintConstants +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintConstants import org.onap.ccsdk.cds.controllerblueprints.core.dsl.getInput import org.onap.ccsdk.cds.controllerblueprints.core.dsl.relationshipTypeConnectsTo import org.onap.ccsdk.cds.controllerblueprints.core.dsl.serviceTemplate @@ -59,12 +59,12 @@ class NatsPropertiesDSLTest { assertNotNull(relationshipTypes, "failed to get relationship types") assertEquals(2, relationshipTypes.size, "relationshipTypes doesn't match") assertNotNull( - relationshipTypes[BlueprintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO], - "failed to get ${BlueprintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO}" + relationshipTypes[BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO], + "failed to get ${BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO}" ) assertNotNull( - relationshipTypes[BlueprintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO_NATS], - "failed to get ${BlueprintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO_NATS}" + relationshipTypes[BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO_NATS], + "failed to get ${BluePrintConstants.MODEL_TYPE_RELATIONSHIPS_CONNECTS_TO_NATS}" ) } } diff --git a/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/BlueprintNatsExtensionsTest.kt b/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/BluePrintNatsExtensionsTest.kt index 816b6c809..ec120dc18 100644 --- a/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/BlueprintNatsExtensionsTest.kt +++ b/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/BluePrintNatsExtensionsTest.kt @@ -27,7 +27,7 @@ import org.onap.ccsdk.cds.controllerblueprints.core.jsonAsJsonType import java.nio.charset.Charset import kotlin.test.assertEquals -class BlueprintNatsExtensionsTest { +class BluePrintNatsExtensionsTest { @Test fun testMessageStrConversion() { diff --git a/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/BlueprintNatsLibPropertyServiceTest.kt b/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/BluePrintNatsLibPropertyServiceTest.kt index 5ef4a72c6..9a332d589 100644 --- a/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/BlueprintNatsLibPropertyServiceTest.kt +++ b/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/BluePrintNatsLibPropertyServiceTest.kt @@ -18,9 +18,9 @@ package org.onap.ccsdk.cds.blueprintsprocessor.nats.service import org.junit.Test import org.junit.runner.RunWith -import org.onap.ccsdk.cds.blueprintsprocessor.core.BlueprintPropertiesService -import org.onap.ccsdk.cds.blueprintsprocessor.core.BlueprintPropertyConfiguration -import org.onap.ccsdk.cds.blueprintsprocessor.nats.BlueprintNatsLibConfiguration +import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintPropertiesService +import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintPropertyConfiguration +import org.onap.ccsdk.cds.blueprintsprocessor.nats.BluePrintNatsLibConfiguration import org.onap.ccsdk.cds.blueprintsprocessor.nats.NatsLibConstants import org.springframework.beans.factory.annotation.Autowired import org.springframework.test.context.ContextConfiguration @@ -31,8 +31,8 @@ import kotlin.test.assertTrue @RunWith(SpringRunner::class) @ContextConfiguration( classes = [ - BlueprintNatsLibConfiguration::class, - BlueprintPropertyConfiguration::class, BlueprintPropertiesService::class + BluePrintNatsLibConfiguration::class, + BluePrintPropertyConfiguration::class, BluePrintPropertiesService::class ] ) @TestPropertySource( @@ -43,10 +43,10 @@ import kotlin.test.assertTrue "blueprintsprocessor.nats.cds-controller.token=tokenAuth" ] ) -class BlueprintNatsLibPropertyServiceTest { +class BluePrintNatsLibPropertyServiceTest { @Autowired - lateinit var bluePrintNatsLibPropertyService: BlueprintNatsLibPropertyService + lateinit var bluePrintNatsLibPropertyService: BluePrintNatsLibPropertyService @Test fun testNatsProperties() { diff --git a/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/BlueprintNatsServiceTest.kt b/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/BluePrintNatsServiceTest.kt index 8e7ee63f1..721828ac9 100644 --- a/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/BlueprintNatsServiceTest.kt +++ b/ms/blueprintsprocessor/modules/commons/nats-lib/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/nats/service/BluePrintNatsServiceTest.kt @@ -31,7 +31,7 @@ import org.onap.ccsdk.cds.blueprintsprocessor.nats.utils.SubscriptionOptionsUtil import org.onap.ccsdk.cds.controllerblueprints.core.jsonAsJsonType import kotlin.test.assertNotNull -class BlueprintNatsServiceTest { +class BluePrintNatsServiceTest { @Test fun testTokenAuthNatService() { @@ -42,18 +42,18 @@ class BlueprintNatsServiceTest { } """.trimIndent() - val bluePrintNatsLibPropertyService = BlueprintNatsLibPropertyService(mockk()) + val bluePrintNatsLibPropertyService = BluePrintNatsLibPropertyService(mockk()) - val spkBlueprintNatsLibPropertyService = spyk(bluePrintNatsLibPropertyService) + val spkBluePrintNatsLibPropertyService = spyk(bluePrintNatsLibPropertyService) every { - spkBlueprintNatsLibPropertyService + spkBluePrintNatsLibPropertyService .bluePrintNatsService(any<NatsConnectionProperties>()) } returns TokenAuthNatsService( mockk() ) val bluePrintNatsService = - spkBlueprintNatsLibPropertyService.bluePrintNatsService(configuration.jsonAsJsonType()) + spkBluePrintNatsLibPropertyService.bluePrintNatsService(configuration.jsonAsJsonType()) assertNotNull(bluePrintNatsService, "failed to get NATS Service") } @@ -65,18 +65,18 @@ class BlueprintNatsServiceTest { } """.trimIndent() - val bluePrintNatsLibPropertyService = BlueprintNatsLibPropertyService(mockk()) + val bluePrintNatsLibPropertyService = BluePrintNatsLibPropertyService(mockk()) - val spkBlueprintNatsLibPropertyService = spyk(bluePrintNatsLibPropertyService) + val spkBluePrintNatsLibPropertyService = spyk(bluePrintNatsLibPropertyService) every { - spkBlueprintNatsLibPropertyService + spkBluePrintNatsLibPropertyService .bluePrintNatsService(any<NatsConnectionProperties>()) } returns TLSAuthNatsService( mockk() ) val bluePrintNatsService = - spkBlueprintNatsLibPropertyService.bluePrintNatsService(configuration.jsonAsJsonType()) + spkBluePrintNatsLibPropertyService.bluePrintNatsService(configuration.jsonAsJsonType()) assertNotNull(bluePrintNatsService, "failed to get NATS Service") } @@ -114,7 +114,7 @@ class BlueprintNatsServiceTest { } } - private fun testMultiPublish(natsService: BlueprintNatsService) { + private fun testMultiPublish(natsService: BluePrintNatsService) { runBlocking { /** Multiple Publish Message Test **/ val messageHandler1 = @@ -131,7 +131,7 @@ class BlueprintNatsServiceTest { } } - private fun testLoadBalance(natsService: BlueprintNatsService) { + private fun testLoadBalance(natsService: BluePrintNatsService) { runBlocking { /** Load balance Publish Message Test **/ val lbMessageHandler1 = @@ -150,7 +150,7 @@ class BlueprintNatsServiceTest { } } - private fun testLimitSubscription(natsService: BlueprintNatsService) { + private fun testLimitSubscription(natsService: BluePrintNatsService) { runBlocking { /** Load balance Publish Message Test **/ val lbMessageHandler1 = @@ -185,7 +185,7 @@ class BlueprintNatsServiceTest { } } - private fun testRequestReply(natsService: BlueprintNatsService) { + private fun testRequestReply(natsService: BluePrintNatsService) { runBlocking { val lbMessageHandler1 = io.nats.client.MessageHandler { message -> println("LB RR Request Handler 1: ${String(message.data)} will reply to(${message.replyTo})") @@ -217,7 +217,7 @@ class BlueprintNatsServiceTest { } } - private fun testMultiRequestReply(natsService: BlueprintNatsService) { + private fun testMultiRequestReply(natsService: BluePrintNatsService) { runBlocking { /** Request Reply **/ val lbMessageHandler1 = io.nats.client.MessageHandler { message -> |