From 52b5f5276add6116a14ba671c35ff9d87c140421 Mon Sep 17 00:00:00 2001 From: Tomasz Wrobel Date: Fri, 15 Jan 2021 14:34:18 +0100 Subject: Add Native Kafka streams support in bp-generator Issue-ID: DCAEGEN2-1179 Signed-off-by: Tomasz Wrobel Change-Id: I541dca959707a41c56205e20c9f5a56ccec5ca41 --- .../service/common/StreamServiceTest.java | 63 ++++++++++++---------- 1 file changed, 34 insertions(+), 29 deletions(-) (limited to 'mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/StreamServiceTest.java') diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/StreamServiceTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/StreamServiceTest.java index 09bb176..fe93f5f 100644 --- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/StreamServiceTest.java +++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/common/StreamServiceTest.java @@ -35,6 +35,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.onap.blueprintgenerator.model.common.BaseStream; import org.onap.blueprintgenerator.model.common.Dmaap; import org.onap.blueprintgenerator.model.componentspec.OnapComponentSpec; import org.onap.blueprintgenerator.model.componentspec.common.Publishes; @@ -66,7 +67,7 @@ class StreamServiceTest { void whenStreamsIsNullCreateStreamPublishesShouldReturnEmptyMap() { when(onapComponentSpecMock.getStreams()).thenReturn(null); - Map streamPublishes = streamService.createStreamPublishes( + Map streamPublishes = streamService.createStreamPublishes( onapComponentSpecMock, blueprintHelperServiceMock, dmaapServiceMock, @@ -81,7 +82,7 @@ class StreamServiceTest { when(streamsMock.getPublishes()).thenReturn(null); when(onapComponentSpecMock.getStreams()).thenReturn(streamsMock); - Map streamPublishes = streamService.createStreamPublishes( + Map streamPublishes = streamService.createStreamPublishes( onapComponentSpecMock, blueprintHelperServiceMock, dmaapServiceMock, @@ -99,21 +100,22 @@ class StreamServiceTest { DmaapService dmaapService = new DmaapService(); - Map streamPublishes = streamService.createStreamPublishes( + Map streamPublishes = streamService.createStreamPublishes( onapComponentSpecMock, blueprintHelperServiceMock, dmaapService, createInputs(), true); - Map expectedMap = createExpectedMap("_feed"); + Map expectedMap = createExpectedMap("_feed"); assertNotNull(streamPublishes); assertEquals(expectedMap.size(), streamPublishes.size()); - for(Map.Entry entry : expectedMap.entrySet()) { + for (Map.Entry entry : expectedMap.entrySet()) { assertTrue(streamPublishes.containsKey(entry.getKey())); - assertTrue(streamPublishes.get(entry.getKey()).getType().equals(entry.getValue().getType())); - assertTrue(streamPublishes.get(entry.getKey()).getDmaap_info().equals(entry.getValue().getDmaap_info())); + assertEquals(streamPublishes.get(entry.getKey()).getType(), entry.getValue().getType()); + assertEquals(((Dmaap) streamPublishes.get(entry.getKey())).getDmaap_info(), + ((Dmaap) entry.getValue()).getDmaap_info()); } } @@ -125,21 +127,22 @@ class StreamServiceTest { DmaapService dmaapService = new DmaapService(); - Map streamPublishes = streamService.createStreamPublishes( + Map streamPublishes = streamService.createStreamPublishes( onapComponentSpecMock, blueprintHelperServiceMock, dmaapService, createInputs(), true); - Map expectedMap = createExpectedMap("_topic"); + Map expectedMap = createExpectedMap("_topic"); assertNotNull(streamPublishes); assertEquals(expectedMap.size(), streamPublishes.size()); - for(Map.Entry entry : expectedMap.entrySet()) { + for (Map.Entry entry : expectedMap.entrySet()) { assertTrue(streamPublishes.containsKey(entry.getKey())); - assertTrue(streamPublishes.get(entry.getKey()).getType().equals(entry.getValue().getType())); - assertTrue(streamPublishes.get(entry.getKey()).getDmaap_info().equals(entry.getValue().getDmaap_info())); + assertEquals(streamPublishes.get(entry.getKey()).getType(), entry.getValue().getType()); + assertEquals(((Dmaap) streamPublishes.get(entry.getKey())).getDmaap_info(), + ((Dmaap) entry.getValue()).getDmaap_info()); } } @@ -147,7 +150,7 @@ class StreamServiceTest { void whenStreamsIsNullCreateStreamSubscribesShouldReturnEmptyMap() { when(onapComponentSpecMock.getStreams()).thenReturn(null); - Map streamSubscribes = streamService.createStreamSubscribes( + Map streamSubscribes = streamService.createStreamSubscribes( onapComponentSpecMock, blueprintHelperServiceMock, dmaapServiceMock, @@ -162,7 +165,7 @@ class StreamServiceTest { when(streamsMock.getPublishes()).thenReturn(null); when(onapComponentSpecMock.getStreams()).thenReturn(streamsMock); - Map streamSubscribes = streamService.createStreamSubscribes( + Map streamSubscribes = streamService.createStreamSubscribes( onapComponentSpecMock, blueprintHelperServiceMock, dmaapServiceMock, @@ -180,21 +183,22 @@ class StreamServiceTest { DmaapService dmaapService = new DmaapService(); - Map streamSubscribes = streamService.createStreamSubscribes( + Map streamSubscribes = streamService.createStreamSubscribes( onapComponentSpecMock, blueprintHelperServiceMock, dmaapService, createInputs(), true); - Map expectedMap = createExpectedMap("_feed"); + Map expectedMap = createExpectedMap("_feed"); assertNotNull(streamSubscribes); assertEquals(expectedMap.size(), streamSubscribes.size()); - for(Map.Entry entry : expectedMap.entrySet()) { + for (Map.Entry entry : expectedMap.entrySet()) { assertTrue(streamSubscribes.containsKey(entry.getKey())); - assertTrue(streamSubscribes.get(entry.getKey()).getType().equals(entry.getValue().getType())); - assertTrue(streamSubscribes.get(entry.getKey()).getDmaap_info().equals(entry.getValue().getDmaap_info())); + assertEquals(streamSubscribes.get(entry.getKey()).getType(), entry.getValue().getType()); + assertEquals(((Dmaap) streamSubscribes.get(entry.getKey())).getDmaap_info(), + ((Dmaap) entry.getValue()).getDmaap_info()); } } @@ -206,26 +210,27 @@ class StreamServiceTest { DmaapService dmaapService = new DmaapService(); - Map streamSubscribes = streamService.createStreamSubscribes( + Map streamSubscribes = streamService.createStreamSubscribes( onapComponentSpecMock, blueprintHelperServiceMock, dmaapService, createInputs(), true); - Map expectedMap = createExpectedMap("_topic"); + Map expectedMap = createExpectedMap("_topic"); assertNotNull(streamSubscribes); assertEquals(expectedMap.size(), streamSubscribes.size()); - for(Map.Entry entry : expectedMap.entrySet()) { + for (Map.Entry entry : expectedMap.entrySet()) { assertTrue(streamSubscribes.containsKey(entry.getKey())); - assertTrue(streamSubscribes.get(entry.getKey()).getType().equals(entry.getValue().getType())); - assertTrue(streamSubscribes.get(entry.getKey()).getDmaap_info().equals(entry.getValue().getDmaap_info())); + assertEquals(streamSubscribes.get(entry.getKey()).getType(), entry.getValue().getType()); + assertEquals(((Dmaap) streamSubscribes.get(entry.getKey())).getDmaap_info(), + ((Dmaap) entry.getValue()).getDmaap_info()); } } - private Map createExpectedMap(String suffix) { - Map expectedMap = new HashMap<>(); + private Map createExpectedMap(String suffix) { + Map expectedMap = new HashMap<>(); Dmaap dmaap1 = new Dmaap(); dmaap1.setType("t1"); dmaap1.setDmaap_info("<>"); @@ -260,21 +265,21 @@ class StreamServiceTest { return new Subscribes[]{sub1, sub2, sub3}; } - private Publishes createPublishes(String key, String type){ + private Publishes createPublishes(String key, String type) { Publishes publishes = new Publishes(); publishes.setConfig_key(key); publishes.setType(type); return publishes; } - private Subscribes createSubscribes(String key, String type){ + private Subscribes createSubscribes(String key, String type) { Subscribes subscribes = new Subscribes(); subscribes.setConfig_key(key); subscribes.setType(type); return subscribes; } - private Map> createInputs(){ + private Map> createInputs() { LinkedHashMap map = new LinkedHashMap<>(); map.put("key-1", "obj-1"); -- cgit 1.2.3-korg