diff options
Diffstat (limited to 'components/kpi-computation-ms/src/test/java/org')
4 files changed, 81 insertions, 79 deletions
diff --git a/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/DmaapClientTest.java b/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/DmaapClientTest.java index cc23bab8..f51bf241 100644 --- a/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/DmaapClientTest.java +++ b/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/DmaapClientTest.java @@ -21,8 +21,15 @@ package org.onap.dcaegen2.kpi.dmaap; +import static org.mockito.Mockito.when; + +import com.att.nsa.cambria.client.CambriaTopicManager; +import com.google.gson.Gson; +import com.google.gson.JsonObject; + import java.io.BufferedReader; import java.io.FileReader; +import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -32,20 +39,20 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; +import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.onap.dcaegen2.kpi.models.Configuration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -//import com.att.nsa.cambria.client.CambriaTopicManager; -import com.google.gson.Gson; -import com.google.gson.JsonObject; - @RunWith(SpringRunner.class) @SpringBootTest(classes = DmaapClientTest.class) public class DmaapClientTest { + @Mock + private CambriaTopicManager topicManager; + @InjectMocks DmaapClient client; @@ -67,9 +74,18 @@ public class DmaapClientTest { configuration.setCid("cid"); configuration.setPollingInterval(30); configuration.setPollingTimeout(100); - client = Mockito.mock(DmaapClient.class); - client.initClient(); - Mockito.verify(client).initClient(); + + try { + when(topicManager.getTopics()).thenReturn(topics); + + client = Mockito.mock(DmaapClient.class); + client.initClient(); + Mockito.verify(client).initClient(); + // Mockito.verifycreateAndConfigureTopics(); + + } catch (IOException e) { + e.printStackTrace(); + } } @Test @@ -85,6 +101,9 @@ public class DmaapClientTest { configuration.updateConfigurationFromJsonObject(config); DmaapClient client = new DmaapClient(); client.initClient(); + // Mockito.verify(client).startClient(); + // Mockito.verifycreateAndConfigureTopics(); + } catch (Exception e) { e.printStackTrace(); } diff --git a/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/KpiDmaapClientTest.java b/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/KpiDmaapClientTest.java index 81699c20..bf5b6253 100644 --- a/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/KpiDmaapClientTest.java +++ b/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/KpiDmaapClientTest.java @@ -22,8 +22,6 @@ package org.onap.dcaegen2.kpi.dmaap; import static org.junit.Assert.assertTrue; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.when; import java.io.IOException; import java.util.HashMap; @@ -38,15 +36,10 @@ import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; import org.onap.dcaegen2.kpi.models.Configuration; import org.onap.dcaegen2.kpi.utils.DmaapUtils; -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.springframework.boot.test.context.SpringBootTest; -import com.google.gson.JsonPrimitive; - -import reactor.core.publisher.Flux; +import com.att.nsa.cambria.client.CambriaBatchingPublisher; +import com.att.nsa.cambria.client.CambriaConsumer; @RunWith(MockitoJUnitRunner.class) @SpringBootTest(classes = KpiDmaapClient.class) @@ -56,38 +49,42 @@ public class KpiDmaapClientTest { Configuration configurationMock; @Mock - DmaapUtils dmaapUtilsMock; - - @Mock - MessageRouterPublisher messageRouterPublisher; + DmaapUtils dmaapUtilsMock; + + @InjectMocks + KpiDmaapClient kpiDmaapClient; @Mock - MessageRouterPublishRequest messageRouterPublishRequest; + CambriaConsumer kpiResponseCambriaConsumerMock; @Mock - KpiDmaapClient kpiDmaapClient; + CambriaBatchingPublisher cambriaBatchingPublisherMock; @Mock NotificationProducer notificationProducerMock; + @Before + public void setup() { + kpiDmaapClient = new KpiDmaapClient(dmaapUtilsMock, configurationMock); + } + @Test - public void sendNotificationToPolicyTest() throws IOException { + public void sendNotificationToPolicyTest() { Map<String, Object> streamsPublishes = new HashMap<>(); Map<String, String> topics = new HashMap<>(); Map<String, Object> dmaapInfo = new HashMap<>(); topics.put("topic_url", "https://message-router.onap.svc.cluster.local:3905/events/DCAE_KPI_OUTPUT"); dmaapInfo.put("dmaap_info", topics); streamsPublishes.put("kpi_topic", dmaapInfo); - Mockito.when(configurationMock.getStreamsPublishes()).thenReturn(streamsPublishes); - Mockito.doNothing().when(notificationProducerMock).sendNotification(Mockito.anyString()); - io.vavr.collection.List<String> expectedItems = io.vavr.collection.List.of("kpi-1", "kpi-2", "kpi-3"); - MessageRouterPublishResponse expectedResponse = ImmutableMessageRouterPublishResponse - .builder().items(expectedItems.map(JsonPrimitive::new)) - .build(); - Flux<MessageRouterPublishResponse> responses = Flux.just(expectedResponse); - when(messageRouterPublisher.put(Mockito.any(), Mockito.any())).thenReturn(responses); - when(kpiDmaapClient.sendNotificationToDmaap(Mockito.anyString())).thenReturn(Boolean.TRUE); - Boolean response = kpiDmaapClient.sendNotificationToDmaap(Mockito.anyString()); - assertEquals(Boolean.TRUE, response); + Mockito.when(configurationMock.getStreamsPublishes()).thenReturn(streamsPublishes); + Mockito.when(dmaapUtilsMock.buildPublisher(configurationMock, "DCAE_KPI_OUTPUT")) + .thenReturn(cambriaBatchingPublisherMock); + try { + Mockito.when(cambriaBatchingPublisherMock.send("", "hello")).thenReturn(0); + } catch (IOException e) { + e.printStackTrace(); } + assertTrue(kpiDmaapClient.sendNotificationToDmaap("hello")); + + } } diff --git a/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/NotificationConsumerTest.java b/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/NotificationConsumerTest.java index 8d72d3cd..69d0daaa 100644 --- a/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/NotificationConsumerTest.java +++ b/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/NotificationConsumerTest.java @@ -21,53 +21,43 @@ package org.onap.dcaegen2.kpi.dmaap; -import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.when; -import java.time.Duration; +import java.util.ArrayList; +import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.MessageRouterSubscriber; -import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterSubscribeRequest; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import com.google.gson.JsonElement; - -import reactor.core.CoreSubscriber; -import reactor.core.publisher.Flux; +import com.att.nsa.cambria.client.CambriaConsumer; @RunWith(SpringRunner.class) @SpringBootTest(classes = NotificationConsumerTest.class) public class NotificationConsumerTest { @Mock + CambriaConsumer cambriaConsumer; + + @Mock NotificationCallback notificationCallback; @InjectMocks NotificationConsumer notificationConsumer; - - @Mock - MessageRouterSubscriber messageSubscriber; - - @Mock - MessageRouterSubscribeRequest subscriberRequest; @Test public void testNotificationConsumer() { try { - Flux<JsonElement> json = new Flux<JsonElement>() { - @Override - public void subscribe(CoreSubscriber<? super JsonElement> actual) { - } - }; + List<String> notifications = new ArrayList<>(); + notifications.add("notification1"); + when(cambriaConsumer.fetch()).thenReturn(notifications); Mockito.doNothing().when(notificationCallback).activateCallBack(Mockito.anyString()); - when(messageSubscriber.subscribeForElements(subscriberRequest, Duration.ofMinutes(1))).thenReturn(json); - assertNotNull(messageSubscriber.subscribeForElements(subscriberRequest, Duration.ofMinutes(1))); + notificationConsumer.run(); + } catch (Exception e) { e.printStackTrace(); } diff --git a/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/NotificationProducerTest.java b/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/NotificationProducerTest.java index f880ec7a..7ad5786c 100644 --- a/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/NotificationProducerTest.java +++ b/components/kpi-computation-ms/src/test/java/org/onap/dcaegen2/kpi/dmaap/NotificationProducerTest.java @@ -21,8 +21,14 @@ package org.onap.dcaegen2.kpi.dmaap; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.att.nsa.cambria.client.CambriaBatchingPublisher; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + import java.io.IOException; import org.junit.Test; @@ -32,19 +38,10 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.onap.dcaegen2.kpi.computation.FileUtils; import org.onap.dcaegen2.kpi.models.Configuration; -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.powermock.api.mockito.PowerMockito; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.google.gson.JsonPrimitive; - -import reactor.core.publisher.Flux; - @RunWith(SpringRunner.class) @SpringBootTest(classes = NotificationProducerTest.class) public class NotificationProducerTest { @@ -53,25 +50,24 @@ public class NotificationProducerTest { private static final String CBS_CONFIG_FILE = "kpi/cbs_config2.json"; @Mock - MessageRouterPublisher messageRouterPublisher; - - @Mock - MessageRouterPublishRequest messageRouterPublishRequest; - + CambriaBatchingPublisher cambriaBatchingPublisher; + @InjectMocks NotificationProducer notificationProducer; @Test - public void notificationProducerTest() throws IOException { - io.vavr.collection.List<String> expectedItems = io.vavr.collection.List.of("kpi-1", "kpi-2", "kpi-3"); - MessageRouterPublishResponse expectedResponse = ImmutableMessageRouterPublishResponse - .builder().items(expectedItems.map(JsonPrimitive::new)) - .build(); - Flux<MessageRouterPublishResponse> responses = Flux.just(expectedResponse); - when(messageRouterPublisher.put(Mockito.any(), Mockito.any())).thenReturn(responses); - notificationProducer.sendNotification("msg"); + public void notificationProducerTest() { + + try { + when(cambriaBatchingPublisher.send(Mockito.anyString(), Mockito.anyString())).thenReturn(0); + int result = notificationProducer.sendNotification("msg"); + assertEquals(0, result); + } catch (IOException e) { + e.printStackTrace(); + } + } - + @Test public void kpiResultWithoutConfigTest() { |