diff options
author | sushant53 <sushant.jadhav@t-systems.com> | 2023-10-27 16:44:30 +0530 |
---|---|---|
committer | sushant53 <sushant.jadhav@t-systems.com> | 2023-10-27 16:45:02 +0530 |
commit | 62841e53e41fd8e12b75641806f76c11878260ee (patch) | |
tree | 624bc532ae85647cb8b5cb470ad3549be167473e /prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/integration/PrhWorkflowIntegrationForAutoCommitDisabledTest.java | |
parent | d82c53bd799b22660be17219da516415d4c56b46 (diff) |
[DCAEGEN2] Remove DMaaP dependency in PRH1.10.1
Removed DMaaP dependency in PRH by using new sdk library, which
uses Kafka API directly.
Issue-ID: DCAEGEN2-3402
Change-Id: I5456ce432a9fd4a58826275a17c603379b0c18ee
Signed-off-by: sushant53 <sushant.jadhav@t-systems.com>
Diffstat (limited to 'prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/integration/PrhWorkflowIntegrationForAutoCommitDisabledTest.java')
-rw-r--r-- | prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/integration/PrhWorkflowIntegrationForAutoCommitDisabledTest.java | 46 |
1 files changed, 39 insertions, 7 deletions
diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/integration/PrhWorkflowIntegrationForAutoCommitDisabledTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/integration/PrhWorkflowIntegrationForAutoCommitDisabledTest.java index b10c1ad8..21f9d099 100644 --- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/integration/PrhWorkflowIntegrationForAutoCommitDisabledTest.java +++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/integration/PrhWorkflowIntegrationForAutoCommitDisabledTest.java @@ -25,24 +25,35 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.github.tomakehurst.wiremock.client.WireMock; import com.google.gson.Gson; import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; import com.jayway.jsonpath.JsonPath; + +import io.vavr.collection.List; import reactor.core.publisher.Flux; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.Mock; import org.onap.dcaegen2.services.prh.MainApp; import org.onap.dcaegen2.services.prh.adapter.aai.api.ConsumerDmaapModel; import org.onap.dcaegen2.services.prh.adapter.kafka.ImmutableKafkaConfiguration; import org.onap.dcaegen2.services.prh.adapter.kafka.KafkaConfiguration; +import org.onap.dcaegen2.services.prh.configuration.CbsConfiguration; import org.onap.dcaegen2.services.prh.configuration.CbsConfigurationForAutoCommitDisabledMode; import org.onap.dcaegen2.services.prh.service.DmaapConsumerJsonParser; import org.onap.dcaegen2.services.prh.tasks.commit.KafkaConsumerTaskImpl; import org.onap.dcaegen2.services.prh.tasks.commit.ScheduledTasksRunnerWithCommit; import org.onap.dcaegen2.services.prh.tasks.commit.ScheduledTasksWithCommit; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.MessageRouterPublisher; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.ImmutableMessageRouterPublishResponse; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterPublishRequest; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterPublishResponse; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterSubscribeRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.configurationprocessor.json.JSONException; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -65,6 +76,9 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.util.ArrayList; import static java.lang.ClassLoader.getSystemResource; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** @@ -91,6 +105,12 @@ class PrhWorkflowIntegrationForAutoCommitDisabledTest { @Autowired private DmaapConsumerJsonParser dmaapConsumerJsonParser; + + @SpyBean + CbsConfiguration cbsConfiguration; + + @Mock + MessageRouterPublisher publisher; @Configuration @Import(MainApp.class) @@ -112,7 +132,12 @@ class PrhWorkflowIntegrationForAutoCommitDisabledTest { CbsConfigurationForAutoCommitDisabledMode cbsConfigurationForAutoCommitDisabledMode = new CbsConfigurationForAutoCommitDisabledMode(); try { - cbsConfigurationForAutoCommitDisabledMode.parseCBSConfig(cbsConfigJson); + withEnvironmentVariable("JAAS_CONFIG", "jaas_config") + .and("BOOTSTRAP_SERVERS", "localhost:9092") + .execute(() -> { + cbsConfigurationForAutoCommitDisabledMode.parseCBSConfig(cbsConfigJson); + }); + } catch (Exception e) { //Exception is expected as environment variable for JAAS_CONFIG is not available if (e.getMessage() == "kafkaJaasConfig") { @@ -136,7 +161,8 @@ class PrhWorkflowIntegrationForAutoCommitDisabledTest { @Test void beforeCbsConfigurationForAutoCommitDisabledMode() throws Exception { - withEnvironmentVariable("JAAS_CONFIG", "jaas_config").execute(() -> { + withEnvironmentVariable("JAAS_CONFIG", "jaas_config") + .execute(() -> { this.whenThereAreNoEventsInDmaap_WorkflowShouldFinish(); }); } @@ -153,7 +179,8 @@ class PrhWorkflowIntegrationForAutoCommitDisabledTest { @Test void beforeWhenThereIsAnEventsInDmaap_ShouldSendPnfReadyNotification() throws Exception { - withEnvironmentVariable("JAAS_CONFIG", "jaas_config").execute(() -> { + withEnvironmentVariable("JAAS_CONFIG", "jaas_config") + .execute(() -> { this.whenThereIsAnEventsInDmaap_ShouldSendPnfReadyNotification(); }); } @@ -175,11 +202,16 @@ class PrhWorkflowIntegrationForAutoCommitDisabledTest { stubFor(post(urlEqualTo("/events/unauthenticated.PNF_READY"))); when(kafkaConsumerTaskImpl.execute()).thenReturn(fluxList); - + + List<String> expectedItems = List.of(event); + Flux<MessageRouterPublishResponse> pubresp = Flux.just(ImmutableMessageRouterPublishResponse + .builder() + .items(expectedItems.map(JsonPrimitive::new)) + .build()); + when(cbsConfiguration.getMessageRouterPublisher()).thenReturn(publisher); + when(publisher.put(any(MessageRouterPublishRequest.class),any())).thenReturn(pubresp); scheduledTasksWithCommit.scheduleKafkaPrhEventTask(); - - verify(1, postRequestedFor(urlEqualTo("/events/unauthenticated.PNF_READY")) - .withRequestBody(matchingJsonPath("$[0].correlationId", equalTo(pnfName)))); + verify(publisher,times(1)).put(any(MessageRouterPublishRequest.class),any()); } |