From 74b598291ed2461e0e482f556baf2943a97a54f2 Mon Sep 17 00:00:00 2001
From: Maciej Malewski <maciej.malewski@nokia.com>
Date: Tue, 8 Jun 2021 09:04:48 +0200
Subject: Replace cambria with DmaaP client

- remove cambria, add DmaaP client
- sending event for many topics at once is no longer supported
- add backward compatibility status codes
- add additional validation for batchEvent

Issue-ID: DCAEGEN2-1483
Signed-off-by: Maciej Malewski <maciej.malewski@nokia.com>
Change-Id: I945c38b4ab04b697ecfabd5ce38502f83fa70d1a
---
 .../java/org/onap/dcae/common/EventSenderTest.java | 35 ++++++++--------------
 1 file changed, 12 insertions(+), 23 deletions(-)

(limited to 'src/test/java/org/onap/dcae/common/EventSenderTest.java')

diff --git a/src/test/java/org/onap/dcae/common/EventSenderTest.java b/src/test/java/org/onap/dcae/common/EventSenderTest.java
index 454cfb52..6d508d0a 100644
--- a/src/test/java/org/onap/dcae/common/EventSenderTest.java
+++ b/src/test/java/org/onap/dcae/common/EventSenderTest.java
@@ -1,9 +1,9 @@
 /*
  * ============LICENSE_START=======================================================
- * PROJECT
+ * VES Collector
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2018,2020 Nokia. All rights reserved.
+ * Copyright (C) 2018-2021 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.dcae.common.model.StndDefinedNamespaceParameterNotDefinedException;
 import org.onap.dcae.common.model.VesEvent;
 import org.onap.dcae.common.publishing.DMaaPEventPublisher;
+import org.onap.dcae.restapi.EventValidatorException;
 
 import java.io.IOException;
 import java.util.List;
@@ -53,31 +54,18 @@ public class EventSenderTest {
     List<VesEvent> eventToSend = createEventToSend("/eventsAfterTransformation/ves7_valid_event.json");
 
     // when
-    eventSender.send(eventToSend);
+    assertThatExceptionOfType(EventValidatorException.class)
+            .isThrownBy(() -> eventSender.send(eventToSend));
 
     // then
     verifyThatEventWasNotSendAtStream();
   }
 
-  @Test
-  public void shouldSendEventAtStreamsAssignedToEventDomain() throws IOException {
-    // given
-    EventSender eventSender = givenConfiguredEventSender(HashMap.of("fault", new String[]{"ves-fault", "fault-ves"}));
-    List<VesEvent> eventToSend = createEventToSend("/eventsAfterTransformation/ves7_valid_event.json");
-
-    // when
-    eventSender.send(eventToSend);
-
-    //then
-    verifyThatEventWasSendAtStream("ves-fault");
-    verifyThatEventWasSendAtStream("fault-ves");
-  }
-
   @Test
   public void shouldSendStdDefinedEventAtStreamAssignedToEventDomain() throws IOException {
     // given
     EventSender eventSender = givenConfiguredEventSender(
-            HashMap.of("3GPP-FaultSupervision", new String[]{"ves-3gpp-fault-supervision"})
+            HashMap.of("3GPP-FaultSupervision", "ves-3gpp-fault-supervision")
     );
     List<VesEvent> eventToSend = createEventToSend("/eventsAfterTransformation/ves_stdnDefined_valid.json");
 
@@ -95,7 +83,8 @@ public class EventSenderTest {
     List<VesEvent> eventToSend = createEventToSend("/eventsAfterTransformation/ves_stdnDefined_valid.json");
 
     // when
-    eventSender.send(eventToSend);
+    assertThatExceptionOfType(EventValidatorException.class)
+            .isThrownBy(() -> eventSender.send(eventToSend));
 
     // then
     verifyThatEventWasNotSendAtStream();
@@ -122,7 +111,7 @@ public class EventSenderTest {
     return givenEventToSend(event);
   }
 
-  private EventSender givenConfiguredEventSender(io.vavr.collection.Map<String, String[]> streamIds) {
+  private EventSender givenConfiguredEventSender(io.vavr.collection.Map<String, String> streamIds) {
     return new EventSender(eventPublisher, streamIds);
   }
 
@@ -132,10 +121,10 @@ public class EventSenderTest {
   }
 
   private void verifyThatEventWasNotSendAtStream() {
-    verify(eventPublisher,never()).sendEvent(any(),any());
+      verify(eventPublisher,never()).sendEvent(any(),any());
   }
 
   private void verifyThatEventWasSendAtStream(String s) {
-    verify(eventPublisher).sendEvent(any(), eq(s));
-  }
+      verify(eventPublisher).sendEvent(any(), eq(s));
+    }
 }
-- 
cgit 1.2.3-korg