1 files changed, 292 insertions, 364 deletions

diff --git a/sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java
index 1e3db81..a70a537 100644
--- a/sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java
+++ b/sdc-distribution-client/src/test/java/org/onap/sdc/impl/NotificationConsumerTest.java
@@ -21,30 +21,20 @@
 
 package org.onap.sdc.impl;
 
-import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-import com.att.nsa.cambria.client.CambriaConsumer;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import org.awaitility.Durations;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -56,359 +46,297 @@ import org.onap.sdc.utils.ArtifactTypeEnum;
 import org.onap.sdc.utils.DistributionActionResultEnum;
 import org.onap.sdc.utils.DistributionClientConstants;
 import org.onap.sdc.utils.TestConfiguration;
+import org.onap.sdc.utils.kafka.SdcKafkaConsumer;
 
 class NotificationConsumerTest {
-
-    final static IDistributionClientResult DISTRIBUTION_SUCCESS_RESULT = buildSuccessResult();
-    private final CambriaConsumer cambriaConsumer = mock(CambriaConsumer.class);
-    private final INotificationCallback clientCallback = spy(INotificationCallback.class);
-    private final Queue<Iterable<String>> notificationsQueue = new LinkedList<>();
-    private final DistributionClientImpl distributionClient = Mockito.spy(DistributionClientImpl.class);
-    private List<String> artifactsTypes = List.of(ArtifactTypeEnum.HEAT.name());
-    private final List<Boolean> notificationStatusResults = new ArrayList<>();
-
-    private static IDistributionClientResult buildSuccessResult() {
-        return new IDistributionClientResult() {
-
-            @Override
-            public String getDistributionMessageResult() {
-                return "";
-            }
-
-            @Override
-            public DistributionActionResultEnum getDistributionActionResult() {
-                return DistributionActionResultEnum.SUCCESS;
-            }
-        };
-    }
-
-    private NotificationConsumer createNotificationConsumer() {
-        return new NotificationConsumer(cambriaConsumer, clientCallback, artifactsTypes, distributionClient);
-    }
-
-    @BeforeEach
-    public void beforeTest() throws IOException {
-        Mockito.reset(clientCallback, distributionClient);
-        when(cambriaConsumer.fetch()).then((Answer<Iterable<String>>) invocation -> {
-            if (!notificationsQueue.isEmpty()) {
-                return notificationsQueue.remove();
-            } else {
-                return new ArrayList<>();
-            }
-        });
-        when(distributionClient.sendNotificationStatus(anyLong(), anyString(), any(ArtifactInfoImpl.class), anyBoolean()))
-            .then((Answer<IDistributionClientResult>) invocation -> {
-                boolean isNotified = (boolean) invocation.getArguments()[3];
-                notificationStatusResults.add(isNotified);
-                return DISTRIBUTION_SUCCESS_RESULT;
-            });
-
-    }
-
-    @Test
-    void testNoNotificationsSent() {
-        ScheduledExecutorService executorPool = Executors.newScheduledThreadPool(DistributionClientConstants.POOL_SIZE);
-        ScheduledFuture<?> scheduledFuture = executorPool.scheduleAtFixedRate(createNotificationConsumer(), 0, 100, TimeUnit.MILLISECONDS);
-        await().atMost(Durations.ONE_SECOND).until(() -> !scheduledFuture.isDone());
-        executorPool.shutdown();
-
-        Mockito.verify(clientCallback, Mockito.times(0)).activateCallback(any(INotificationData.class));
-    }
-
-    @Test
-    void testNonRelevantNotificationSent() throws InterruptedException {
-
-        simulateNotificationFromUEB(getAsdcServiceNotificationWithoutHeatArtifact());
-        Mockito.verify(clientCallback, Mockito.times(0)).activateCallback(any(INotificationData.class));
-    }
-
-    @Test
-    void testRelevantNotificationSent() throws InterruptedException {
-        simulateNotificationFromUEB(getAsdcServiceNotificationWithHeatArtifact());
-        Mockito.verify(clientCallback, Mockito.times(1)).activateCallback(any(INotificationData.class));
-    }
-
-    @Test
-    void testNonExistingArtifactsNotificationSent() throws InterruptedException {
-        simulateNotificationFromUEB(getAsdcNotificationWithNonExistentArtifact());
-        Mockito.verify(clientCallback, Mockito.times(1)).activateCallback(any(INotificationData.class));
-    }
-
-    @Test
-    void testNotificationStatusSent() throws InterruptedException {
-        simulateNotificationFromUEB(getAsdcServiceNotificationWithHeatArtifact());
-
-        Mockito.verify(distributionClient, Mockito.times(3))
-            .sendNotificationStatus(anyLong(), anyString(), any(ArtifactInfoImpl.class), anyBoolean());
-        assertEquals(1, countInstances(notificationStatusResults, Boolean.TRUE));
-        assertEquals(2, countInstances(notificationStatusResults, Boolean.FALSE));
-    }
-
-    @Test
-    void testNotificationRelatedArtifacts() throws InterruptedException {
-        List<String> artifactTypesTmp = new ArrayList<>();
-        for (ArtifactTypeEnum artifactTypeEnum : ArtifactTypeEnum.values()) {
-            artifactTypesTmp.add(artifactTypeEnum.name());
-        }
-        artifactsTypes = artifactTypesTmp;
-        simulateNotificationFromUEB(getAsdcServiceNotificationWithRelatedArtifacts());
-
-        Mockito.verify(distributionClient, Mockito.times(3))
-            .sendNotificationStatus(anyLong(), anyString(), any(ArtifactInfoImpl.class), anyBoolean());
-        assertEquals(3, countInstances(notificationStatusResults, Boolean.TRUE));
-        assertEquals(0, countInstances(notificationStatusResults, Boolean.FALSE));
-    }
-
-    @Test
-    void testNotificationStatusWithServiceArtifatcs() throws InterruptedException {
-        simulateNotificationFromUEB(getNotificationWithServiceArtifatcs());
-        Mockito.verify(distributionClient, Mockito.times(6))
-            .sendNotificationStatus(anyLong(), anyString(), any(ArtifactInfoImpl.class), anyBoolean());
-        assertEquals(2, countInstances(notificationStatusResults, Boolean.TRUE));
-        assertEquals(4, countInstances(notificationStatusResults, Boolean.FALSE));
-
-    }
-
-    @Test
-    final void testBuildCallbackNotificationLogicFlagIsFalse() {
-        NotificationConsumer consumer = createNotificationConsumer();
-        Gson gson = new GsonBuilder().setPrettyPrinting().create();
-        TestConfiguration testConfiguration = new TestConfiguration();
-        testConfiguration.setFilterInEmptyResources(false);
-        when(distributionClient.getConfiguration()).thenReturn(testConfiguration);
-        NotificationDataImpl notification = gson.fromJson(getNotificationWithMultipleResources(), NotificationDataImpl.class);
-        NotificationDataImpl notificationBuiltInClient = consumer.buildCallbackNotificationLogic(0, notification);
-        assertEquals(1, notificationBuiltInClient.getResources().size());
-    }
-
-    @Test
-    final void testBuildCallbackNotificationLogicFlagIsTrue() {
-        NotificationConsumer consumer = createNotificationConsumer();
-        Gson gson = new GsonBuilder().setPrettyPrinting().create();
-        TestConfiguration testConfiguration = new TestConfiguration();
-        testConfiguration.setFilterInEmptyResources(true);
-        when(distributionClient.getConfiguration()).thenReturn(testConfiguration);
-        NotificationDataImpl notification = gson.fromJson(getNotificationWithMultipleResources(), NotificationDataImpl.class);
-        NotificationDataImpl notificationBuiltInClient = consumer.buildCallbackNotificationLogic(0, notification);
-        assertEquals(2, notificationBuiltInClient.getResources().size());
-    }
-
-    private void simulateNotificationFromUEB(final String notificationFromUEB) throws InterruptedException {
-        ScheduledExecutorService executorPool = Executors.newScheduledThreadPool(DistributionClientConstants.POOL_SIZE);
-        ScheduledFuture<?> scheduledFuture = executorPool.scheduleAtFixedRate(createNotificationConsumer(), 0, 100, TimeUnit.MILLISECONDS);
-
-        await().atMost(Durations.TWO_HUNDRED_MILLISECONDS).until(() -> !scheduledFuture.isDone());
-
-        List<String> nonHeatNotification = Collections.singletonList(notificationFromUEB);
-        notificationsQueue.add(nonHeatNotification);
-        Thread.sleep(800);
-        executorPool.shutdown();
-    }
-
-    private String getAsdcServiceNotificationWithHeatArtifact() {
-        return "{\"distributionID\" : \"bcc7a72e-90b1-4c5f-9a37-28dc3cd86416\",\r\n" + "	\"serviceName\" : \"Testnotificationser1\",\r\n"
-            + "	\"serviceVersion\" : \"1.0\",\r\n"
-            + "	\"serviceUUID\" : \"7f7f94f4-373a-4b71-a0e3-80ae2ba4eb5d\",\r\n" + "	\"serviceDescription\" : \"TestNotificationVF1\",\r\n"
-            + "	\"resources\" : [{\r\n" + "			\"resourceInstanceName\" : \"testnotificationvf11\",\r\n"
-            + "			\"resourceName\" : \"TestNotificationVF1\",\r\n" + "			\"resourceVersion\" : \"1.0\",\r\n"
-            + "			\"resoucreType\" : \"VF\",\r\n" + "			\"resourceUUID\" : \"907e1746-9f69-40f5-9f2a-313654092a2d\",\r\n"
-            + "			\"artifacts\" : [{\r\n" + "					\"artifactName\" : \"sample-xml-alldata-1-1.xml\",\r\n"
-            + "					\"artifactType\" : \"YANG_XML\",\r\n"
-            + "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/sample-xml-alldata-1-1.xml\",\r\n"
-            + "					\"artifactChecksum\" : \"MTUxODFkMmRlOTNhNjYxMGYyYTI1ZjA5Y2QyNWQyYTk\\u003d\",\r\n"
-            + "					\"artifactDescription\" : \"MyYang\",\r\n" + "					\"artifactTimeout\" : 0,\r\n"
-            + "					\"artifactUUID\" : \"0005bc4a-2c19-452e-be6d-d574a56be4d0\",\r\n" + "					\"artifactVersion\" : \"1\"\r\n"
-            + "				}, {\r\n" + "					\"artifactName\" : \"heat.yaml\",\r\n"
-            + "					\"artifactType\" : \"HEAT\",\r\n"
-            + "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.yaml\",\r\n"
-            + "					\"artifactChecksum\" : \"ODEyNjE4YTMzYzRmMTk2ODVhNTU2NTg3YWEyNmIxMTM\\u003d\",\r\n"
-            + "					\"artifactDescription\" : \"heat\",\r\n" + "					\"artifactTimeout\" : 60,\r\n"
-            + "					\"artifactUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" + "					\"artifactVersion\" : \"1\"\r\n"
-            + "				}, {\r\n" + "					\"artifactName\" : \"heat.env\",\r\n"
-            + "					\"artifactType\" : \"HEAT_ENV\",\r\n"
-            + "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.env\",\r\n"
-            + "					\"artifactChecksum\" : \"NGIzMjExZTM1NDc2NjBjOTQyMGJmMWNiMmU0NTE5NzM\\u003d\",\r\n"
-            + "					\"artifactDescription\" : \"Auto-generated HEAT Environment deployment artifact\",\r\n"
-            + "					\"artifactTimeout\" : 0,\r\n" + "					\"artifactUUID\" : \"ce65d31c-35c0-43a9-90c7-596fc51d0c86\",\r\n"
-            + "					\"artifactVersion\" : \"1\",\r\n"
-            + "					\"generatedFromUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\"\r\n" + "				}\r\n" + "			]\r\n"
-            + "		}\r\n" + "	]}";
-    }
-
-    private String getNotificationWithMultipleResources() {
-        return "{\"distributionID\" : \"bcc7a72e-90b1-4c5f-9a37-28dc3cd86416\",\r\n" +
-            "	\"serviceName\" : \"Testnotificationser1\",\r\n" +
-            "	\"serviceVersion\" : \"1.0\",\r\n" +
-            "	\"serviceUUID\" : \"7f7f94f4-373a-4b71-a0e3-80ae2ba4eb5d\",\r\n" +
-            "	\"serviceDescription\" : \"TestNotificationVF1\",\r\n" +
-            "	\"resources\" : [{\r\n" +
-            "			\"resourceInstanceName\" : \"testnotificationvf11\",\r\n" +
-            "			\"resourceName\" : \"TestNotificationVF1\",\r\n" +
-            "			\"resourceVersion\" : \"1.0\",\r\n" +
-            "			\"resoucreType\" : \"VF\",\r\n" +
-            "			\"resourceUUID\" : \"907e1746-9f69-40f5-9f2a-313654092a2d\",\r\n" +
-            "			\"artifacts\" : [{\r\n" +
-            "					\"artifactName\" : \"sample-xml-alldata-1-1.xml\",\r\n" +
-            "					\"artifactType\" : \"YANG_XML\",\r\n" +
-            "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/sample-xml-alldata-1-1.xml\",\r\n"
-            +
-            "					\"artifactChecksum\" : \"MTUxODFkMmRlOTNhNjYxMGYyYTI1ZjA5Y2QyNWQyYTk\\u003d\",\r\n" +
-            "					\"artifactDescription\" : \"MyYang\",\r\n" +
-            "					\"artifactTimeout\" : 0,\r\n" +
-            "					\"artifactUUID\" : \"0005bc4a-2c19-452e-be6d-d574a56be4d0\",\r\n" +
-            "					\"artifactVersion\" : \"1\"\r\n" +
-            "				}" +
-            "			]\r\n" +
-            "		},\r\n" +
-            "       {\r\n" +
-            "			\"resourceInstanceName\" : \"testnotificationvf12\",\r\n" +
-            "			\"resourceName\" : \"TestNotificationVF1\",\r\n" +
-            "			\"resourceVersion\" : \"1.0\",\r\n" +
-            "			\"resoucreType\" : \"VF\",\r\n" +
-            "			\"resourceUUID\" : \"907e1746-9f69-40f5-9f2a-313654092a2e\",\r\n" +
-            "			\"artifacts\" : [{\r\n" +
-            "					\"artifactName\" : \"heat.yaml\",\r\n" +
-            "					\"artifactType\" : \"HEAT\",\r\n" +
-            "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.yaml\",\r\n"
-            +
-            "					\"artifactChecksum\" : \"ODEyNjE4YTMzYzRmMTk2ODVhNTU2NTg3YWEyNmIxMTM\\u003d\",\r\n" +
-            "					\"artifactDescription\" : \"heat\",\r\n" +
-            "					\"artifactTimeout\" : 60,\r\n" +
-            "					\"artifactUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" +
-            "					\"artifactVersion\" : \"1\"\r\n" +
-            "				}" +
-            "			]\r\n" +
-            "		}\r\n" +
-            "	]}";
-    }
-
-
-    private String getAsdcNotificationWithNonExistentArtifact() {
-        return "{\"distributionID\" : \"bcc7a72e-90b1-4c5f-9a37-28dc3cd86416\",\r\n" + "	\"serviceName\" : \"Testnotificationser1\",\r\n"
-            + "	\"serviceVersion\" : \"1.0\",\r\n"
-            + "	\"serviceUUID\" : \"7f7f94f4-373a-4b71-a0e3-80ae2ba4eb5d\",\r\n" + "	\"serviceDescription\" : \"TestNotificationVF1\",\r\n"
-            + "	\"bugabuga\" : \"xyz\",\r\n" + "	\"resources\" : [{\r\n"
-            + "			\"resourceInstanceName\" : \"testnotificationvf11\",\r\n" + "			\"resourceName\" : \"TestNotificationVF1\",\r\n"
-            + "			\"resourceVersion\" : \"1.0\",\r\n" + "			\"resoucreType\" : \"VF\",\r\n"
-            + "			\"resourceUUID\" : \"907e1746-9f69-40f5-9f2a-313654092a2d\",\r\n" + "			\"artifacts\" : [{\r\n"
-            + "					\"artifactName\" : \"heat.yaml\",\r\n" + "					\"artifactType\" : \"HEAT\",\r\n"
-            + "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.yaml\",\r\n"
-            + "					\"artifactChecksum\" : \"ODEyNjE4YTMzYzRmMTk2ODVhNTU2NTg3YWEyNmIxMTM\\u003d\",\r\n"
-            + "					\"artifactDescription\" : \"heat\",\r\n" + "					\"artifactTimeout\" : 60,\r\n"
-            + "					\"artifactUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n"
-            + "					\"artifactBuga\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" + "					\"artifactVersion\" : \"1\"\r\n"
-            + "				}, {\r\n" + "					\"artifactName\" : \"buga.bug\",\r\n" + "					\"artifactType\" : \"BUGA_BUGA\",\r\n"
-            + "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.env\",\r\n"
-            + "					\"artifactChecksum\" : \"NGIzMjExZTM1NDc2NjBjOTQyMGJmMWNiMmU0NTE5NzM\\u003d\",\r\n"
-            + "					\"artifactDescription\" : \"Auto-generated HEAT Environment deployment artifact\",\r\n"
-            + "					\"artifactTimeout\" : 0,\r\n" + "					\"artifactUUID\" : \"ce65d31c-35c0-43a9-90c7-596fc51d0c86\",\r\n"
-            + "					\"artifactVersion\" : \"1\",\r\n"
-            + "					\"generatedFromUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\"\r\n" + "				}\r\n" + "			]\r\n"
-            + "		}\r\n" + "	]}";
-    }
-
-    private String getAsdcServiceNotificationWithRelatedArtifacts() {
-        return "{\"distributionID\" : \"bcc7a72e-90b1-4c5f-9a37-28dc3cd86416\",\r\n" + "	\"serviceName\" : \"Testnotificationser1\",\r\n"
-            + "	\"serviceVersion\" : \"1.0\",\r\n"
-            + "	\"serviceUUID\" : \"7f7f94f4-373a-4b71-a0e3-80ae2ba4eb5d\",\r\n" + "	\"serviceDescription\" : \"TestNotificationVF1\",\r\n"
-            + "	\"resources\" : [{\r\n" + "			\"resourceInstanceName\" : \"testnotificationvf11\",\r\n"
-            + "			\"resourceName\" : \"TestNotificationVF1\",\r\n" + "			\"resourceVersion\" : \"1.0\",\r\n"
-            + "			\"resoucreType\" : \"VF\",\r\n" + "			\"resourceUUID\" : \"907e1746-9f69-40f5-9f2a-313654092a2d\",\r\n"
-            + "			\"artifacts\" : [{\r\n" + "					\"artifactName\" : \"sample-xml-alldata-1-1.xml\",\r\n"
-            + "					\"artifactType\" : \"YANG_XML\",\r\n"
-            + "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/sample-xml-alldata-1-1.xml\",\r\n"
-            + "					\"artifactChecksum\" : \"MTUxODFkMmRlOTNhNjYxMGYyYTI1ZjA5Y2QyNWQyYTk\\u003d\",\r\n"
-            + "					\"artifactDescription\" : \"MyYang\",\r\n" + "					\"artifactTimeout\" : 0,\r\n"
-            + "					\"artifactUUID\" : \"0005bc4a-2c19-452e-be6d-d574a56be4d0\",\r\n" + "					\"artifactVersion\" : \"1\",\r\n"
-            + "                   \"relatedArtifacts\" : [\r\n"
-            + "  						\"ce65d31c-35c0-43a9-90c7-596fc51d0c86\"\r\n" + "  					]" + "				}, {\r\n"
-            + "					\"artifactName\" : \"heat.yaml\",\r\n"
-            + "					\"artifactType\" : \"HEAT\",\r\n"
-            + "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.yaml\",\r\n"
-            + "					\"artifactChecksum\" : \"ODEyNjE4YTMzYzRmMTk2ODVhNTU2NTg3YWEyNmIxMTM\\u003d\",\r\n"
-            + "					\"artifactDescription\" : \"heat\",\r\n" + "					\"artifactTimeout\" : 60,\r\n"
-            + "					\"artifactUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" + "					\"artifactVersion\" : \"1\", \r\n"
-            + "					\"relatedArtifacts\" : [\r\n"
-            + "  						\"0005bc4a-2c19-452e-be6d-d574a56be4d0\", \r\n" + "  						\"ce65d31c-35c0-43a9-90c7-596fc51d0c86\"\r\n"
-            + "  					]" + "				}, {\r\n"
-            + "					\"artifactName\" : \"heat.env\",\r\n" + "					\"artifactType\" : \"HEAT_ENV\",\r\n"
-            + "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.env\",\r\n"
-            + "					\"artifactChecksum\" : \"NGIzMjExZTM1NDc2NjBjOTQyMGJmMWNiMmU0NTE5NzM\\u003d\",\r\n"
-            + "					\"artifactDescription\" : \"Auto-generated HEAT Environment deployment artifact\",\r\n"
-            + "					\"artifactTimeout\" : 0,\r\n" + "					\"artifactUUID\" : \"ce65d31c-35c0-43a9-90c7-596fc51d0c86\",\r\n"
-            + "					\"artifactVersion\" : \"1\",\r\n"
-            + "					\"generatedFromUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\"\r\n" + "				}\r\n" + "			]\r\n"
-            + "		}\r\n" + "	]}";
-    }
-
-    private String getAsdcServiceNotificationWithoutHeatArtifact() {
-        return "{" + "   \"distributionID\" : \"5v1234d8-5b6d-42c4-7t54-47v95n58qb7\"," + "   \"serviceName\" : \"srv1\","
-            + "   \"serviceVersion\": \"2.0\"," + "   \"serviceUUID\" : \"4e0697d8-5b6d-42c4-8c74-46c33d46624c\","
-            + "   \"serviceArtifacts\":[" + "                    {" + "                       \"artifactName\" : \"ddd.yml\","
-            + "                       \"artifactType\" : \"DG_XML\"," + "                       \"artifactTimeout\" : \"65\","
-            + "                       \"artifactDescription\" : \"description\"," + "                       \"artifactURL\" :"
-            + "                      \"/sdc/v1/catalog/services/srv1/2.0/resources/ddd/3.0/artifacts/ddd.xml\" ,"
-            + "                       \"resourceUUID\" : \"4e5874d8-5b6d-42c4-8c74-46c33d90drw\" ,"
-            + "                       \"checksum\" : \"15e389rnrp58hsw==\"" + "                    }" + "                  ]" + "}";
-    }
-
-    private String getNotificationWithServiceArtifatcs() {
-        return "{\r\n" + "  \"distributionID\" : \"bcc7a72e-90b1-4c5f-9a37-28dc3cd86416\",\r\n" + "  \"serviceName\" : \"Testnotificationser1\",\r\n"
-            + "  \"serviceVersion\" : \"1.0\",\r\n"
-            + "  \"serviceUUID\" : \"7f7f94f4-373a-4b71-a0e3-80ae2ba4eb5d\",\r\n" + "  \"serviceDescription\" : \"TestNotificationVF1\",\r\n"
-            + "  \"serviceArtifacts\" : [{\r\n" + "          \"artifactName\" : \"sample-xml-alldata-1-1.xml\",\r\n"
-            + "          \"artifactType\" : \"YANG_XML\",\r\n"
-            + "          \"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/sample-xml-alldata-1-1.xml\",\r\n"
-            + "          \"artifactChecksum\" : \"MTUxODFkMmRlOTNhNjYxMGYyYTI1ZjA5Y2QyNWQyYTk\\u003d\",\r\n"
-            + "          \"artifactDescription\" : \"MyYang\",\r\n" + "          \"artifactTimeout\" : 0,\r\n"
-            + "          \"artifactUUID\" : \"0005bc4a-2c19-452e-be6d-d574a56be4d0\",\r\n" + "          \"artifactVersion\" : \"1\"\r\n"
-            + "        }, {\r\n" + "          \"artifactName\" : \"heat.yaml\",\r\n"
-            + "          \"artifactType\" : \"HEAT\",\r\n"
-            + "          \"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.yaml\",\r\n"
-            + "          \"artifactChecksum\" : \"ODEyNjE4YTMzYzRmMTk2ODVhNTU2NTg3YWEyNmIxMTM\\u003d\",\r\n"
-            + "          \"artifactDescription\" : \"heat\",\r\n" + "          \"artifactTimeout\" : 60,\r\n"
-            + "          \"artifactUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" + "          \"artifactVersion\" : \"1\"\r\n"
-            + "        }, {\r\n" + "          \"artifactName\" : \"heat.env\",\r\n"
-            + "          \"artifactType\" : \"HEAT_ENV\",\r\n"
-            + "          \"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.env\",\r\n"
-            + "          \"artifactChecksum\" : \"NGIzMjExZTM1NDc2NjBjOTQyMGJmMWNiMmU0NTE5NzM\\u003d\",\r\n"
-            + "          \"artifactDescription\" : \"Auto-generated HEAT Environment deployment artifact\",\r\n"
-            + "          \"artifactTimeout\" : 0,\r\n" + "          \"artifactUUID\" : \"ce65d31c-35c0-43a9-90c7-596fc51d0c86\",\r\n"
-            + "          \"artifactVersion\" : \"1\",\r\n"
-            + "          \"generatedFromUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\"\r\n" + "        }\r\n" + "      ],\r\n"
-            + "  \"resources\" : [{\r\n" + "      \"resourceInstanceName\" : \"testnotificationvf11\",\r\n"
-            + "      \"resourceName\" : \"TestNotificationVF1\",\r\n" + "      \"resourceVersion\" : \"1.0\",\r\n"
-            + "      \"resoucreType\" : \"VF\",\r\n" + "      \"resourceUUID\" : \"907e1746-9f69-40f5-9f2a-313654092a2d\",\r\n"
-            + "      \"artifacts\" : [{\r\n" + "          \"artifactName\" : \"sample-xml-alldata-1-1.xml\",\r\n"
-            + "          \"artifactType\" : \"YANG_XML\",\r\n"
-            + "          \"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/sample-xml-alldata-1-1.xml\",\r\n"
-            + "          \"artifactChecksum\" : \"MTUxODFkMmRlOTNhNjYxMGYyYTI1ZjA5Y2QyNWQyYTk\\u003d\",\r\n"
-            + "          \"artifactDescription\" : \"MyYang\",\r\n" + "          \"artifactTimeout\" : 0,\r\n"
-            + "          \"artifactUUID\" : \"0005bc4a-2c19-452e-be6d-d574a56be4d0\",\r\n" + "          \"artifactVersion\" : \"1\"\r\n"
-            + "        }, {\r\n" + "          \"artifactName\" : \"heat.yaml\",\r\n"
-            + "          \"artifactType\" : \"HEAT\",\r\n"
-            + "          \"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.yaml\",\r\n"
-            + "          \"artifactChecksum\" : \"ODEyNjE4YTMzYzRmMTk2ODVhNTU2NTg3YWEyNmIxMTM\\u003d\",\r\n"
-            + "          \"artifactDescription\" : \"heat\",\r\n" + "          \"artifactTimeout\" : 60,\r\n"
-            + "          \"artifactUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" + "          \"artifactVersion\" : \"1\"\r\n"
-            + "        }, {\r\n" + "          \"artifactName\" : \"heat.env\",\r\n"
-            + "          \"artifactType\" : \"HEAT_ENV\",\r\n"
-            + "          \"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.env\",\r\n"
-            + "          \"artifactChecksum\" : \"NGIzMjExZTM1NDc2NjBjOTQyMGJmMWNiMmU0NTE5NzM\\u003d\",\r\n"
-            + "          \"artifactDescription\" : \"Auto-generated HEAT Environment deployment artifact\",\r\n"
-            + "          \"artifactTimeout\" : 0,\r\n" + "          \"artifactUUID\" : \"ce65d31c-35c0-43a9-90c7-596fc51d0c86\",\r\n"
-            + "          \"artifactVersion\" : \"1\",\r\n"
-            + "          \"generatedFromUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\"\r\n" + "        }\r\n" + "      ]\r\n" + "    }\r\n"
-            + "  ]\r\n" + "}";
-    }
-
-    private <T> int countInstances(List<T> list, T element) {
-        int count = 0;
-        for (T curr : list) {
-            if (curr.equals(element)) {
-                count++;
-            }
-        }
-        return count;
-    }
-}
+	private final SdcKafkaConsumer consumer = mock(SdcKafkaConsumer.class);
+	private final INotificationCallback clientCallback = spy(INotificationCallback.class);
+	private final Queue<Iterable<String>> notificationsQueue = new LinkedList<>();
+	private final DistributionClientImpl distributionClient = Mockito.spy(DistributionClientImpl.class);
+	private List<String> artifactsTypes = List.of(ArtifactTypeEnum.HEAT.name());
+	private final List<Boolean> notificationStatusResults = new ArrayList<>();
+	final static IDistributionClientResult DISTRIBUTION_SUCCESS_RESULT = buildSuccessResult();
+
+	private NotificationConsumer createNotificationConsumer() {
+		return new NotificationConsumer(consumer, clientCallback, artifactsTypes, distributionClient);
+	}
+
+	@BeforeEach
+	public void beforeTest() {
+		Mockito.reset(clientCallback, distributionClient);
+		when(consumer.poll()).then((Answer<Iterable<String>>) invocation -> {
+			if (!notificationsQueue.isEmpty()) {
+				return notificationsQueue.remove();
+			} else {
+				return new ArrayList<>();
+			}
+		});
+		when(distributionClient.sendNotificationStatus(Mockito.anyLong(), Mockito.anyString(), Mockito.any(ArtifactInfoImpl.class), Mockito.anyBoolean())).then(
+			(Answer<IDistributionClientResult>) invocation -> {
+				boolean isNotified = (boolean) invocation.getArguments()[3];
+				notificationStatusResults.add(isNotified);
+				return DISTRIBUTION_SUCCESS_RESULT;
+			});
+
+	}
+
+	private static IDistributionClientResult buildSuccessResult() {
+		return new IDistributionClientResult() {
+
+			@Override
+			public String getDistributionMessageResult() {
+				return "";
+			}
+
+			@Override
+			public DistributionActionResultEnum getDistributionActionResult() {
+				return DistributionActionResultEnum.SUCCESS;
+			}
+		};
+	}
+
+	@Test
+	void testNoNotifiactionsSent() throws InterruptedException {
+
+		ScheduledExecutorService executorPool = Executors.newScheduledThreadPool(DistributionClientConstants.POOL_SIZE);
+		executorPool.scheduleAtFixedRate(createNotificationConsumer(), 0, 100, TimeUnit.MILLISECONDS);
+
+		Thread.sleep(1000);
+		executorPool.shutdown();
+
+		Mockito.verify(clientCallback, Mockito.times(0)).activateCallback(Mockito.any(INotificationData.class));
+
+	}
+
+	@Test
+	void testNonRelevantNotificationSent() throws InterruptedException {
+
+		simulateNotificationFromMessageBus(getSdcServiceNotificationWithoutHeatArtifact());
+		Mockito.verify(clientCallback, Mockito.times(0)).activateCallback(Mockito.any(INotificationData.class));
+
+	}
+
+	@Test
+	void testRelevantNotificationSent() throws InterruptedException {
+		simulateNotificationFromMessageBus(getSdcServiceNotificationWithHeatArtifact());
+		Mockito.verify(clientCallback, Mockito.times(1)).activateCallback(Mockito.any(INotificationData.class));
+
+	}
+
+	@Test
+	void testNonExistingArtifactsNotificationSent() throws InterruptedException {
+		simulateNotificationFromMessageBus(getSdcNotificationWithNonExistentArtifact());
+		Mockito.verify(clientCallback, Mockito.times(1)).activateCallback(Mockito.any(INotificationData.class));
+
+	}
+
+	@Test
+	void testNotificationStatusSent() throws InterruptedException {
+		simulateNotificationFromMessageBus(getSdcServiceNotificationWithHeatArtifact());
+
+		Mockito.verify(distributionClient, Mockito.times(3)).sendNotificationStatus(Mockito.anyLong(), Mockito.anyString(), Mockito.any(ArtifactInfoImpl.class), Mockito.anyBoolean());
+		assertEquals(1, countInstances(notificationStatusResults, Boolean.TRUE));
+		assertEquals(2, countInstances(notificationStatusResults, Boolean.FALSE));
+	}
+
+	@Test
+	void testNotificationRelatedArtifacts() throws InterruptedException {
+		List<String> artifactTypesTmp = new ArrayList<>();
+		for (ArtifactTypeEnum artifactTypeEnum : ArtifactTypeEnum.values()) {
+			artifactTypesTmp.add(artifactTypeEnum.name());
+		}
+		artifactsTypes = artifactTypesTmp;
+		simulateNotificationFromMessageBus(getSdcServiceNotificationWithRelatedArtifacts());
+
+		Mockito.verify(distributionClient, Mockito.times(3)).sendNotificationStatus(Mockito.anyLong(), Mockito.anyString(), Mockito.any(ArtifactInfoImpl.class), Mockito.anyBoolean());
+		assertEquals(3, countInstances(notificationStatusResults, Boolean.TRUE));
+		assertEquals(0, countInstances(notificationStatusResults, Boolean.FALSE));
+	}
+
+	@Test
+	void testNotificationStatusWithServiceArtifatcs() throws InterruptedException {
+		simulateNotificationFromMessageBus(getNotificationWithServiceArtifatcs());
+		Mockito.verify(distributionClient, Mockito.times(6)).sendNotificationStatus(Mockito.anyLong(), Mockito.anyString(), Mockito.any(ArtifactInfoImpl.class), Mockito.anyBoolean());
+		assertEquals(2, countInstances(notificationStatusResults, Boolean.TRUE));
+		assertEquals(4, countInstances(notificationStatusResults, Boolean.FALSE));
+
+	}
+
+	@Test
+	final void testBuildCallbackNotificationLogicFlagIsFalse() {
+		NotificationConsumer consumer = createNotificationConsumer();
+		Gson gson = new GsonBuilder().setPrettyPrinting().create();
+		TestConfiguration testConfiguration = new TestConfiguration();
+		testConfiguration.setFilterInEmptyResources(false);
+		when(distributionClient.getConfiguration()).thenReturn(testConfiguration);
+		NotificationDataImpl notification = gson.fromJson(getNotificationWithMultipleResources(), NotificationDataImpl.class);
+		NotificationDataImpl notificationBuiltInClient = consumer.buildCallbackNotificationLogic(0, notification);
+		assertEquals(1, notificationBuiltInClient.getResources().size());
+	}
+
+	@Test
+	final void testBuildCallbackNotificationLogicFlagIsTrue() {
+		NotificationConsumer consumer = createNotificationConsumer();
+		Gson gson = new GsonBuilder().setPrettyPrinting().create();
+		TestConfiguration testConfiguration = new TestConfiguration();
+		testConfiguration.setFilterInEmptyResources(true);
+		when(distributionClient.getConfiguration()).thenReturn(testConfiguration);
+		NotificationDataImpl notification = gson.fromJson(getNotificationWithMultipleResources(), NotificationDataImpl.class);
+		NotificationDataImpl notificationBuiltInClient = consumer.buildCallbackNotificationLogic(0, notification);
+		assertEquals(2, notificationBuiltInClient.getResources().size());
+	}
+
+	private void simulateNotificationFromMessageBus(final String notificationFromMessageBus) throws InterruptedException {
+		ScheduledExecutorService executorPool = Executors.newScheduledThreadPool(DistributionClientConstants.POOL_SIZE);
+		executorPool.scheduleAtFixedRate(createNotificationConsumer(), 0, 100, TimeUnit.MILLISECONDS);
+
+		Thread.sleep(200);
+
+		List<String> nonHeatNotification = List.of(notificationFromMessageBus);
+		notificationsQueue.add(nonHeatNotification);
+		Thread.sleep(800);
+		executorPool.shutdown();
+	}
+
+	private String getSdcServiceNotificationWithHeatArtifact() {
+		return "{\"distributionID\" : \"bcc7a72e-90b1-4c5f-9a37-28dc3cd86416\",\r\n" + "	\"serviceName\" : \"Testnotificationser1\",\r\n" + "	\"serviceVersion\" : \"1.0\",\r\n"
+			+ "	\"serviceUUID\" : \"7f7f94f4-373a-4b71-a0e3-80ae2ba4eb5d\",\r\n" + "	\"serviceDescription\" : \"TestNotificationVF1\",\r\n" + "	\"resources\" : [{\r\n" + "			\"resourceInstanceName\" : \"testnotificationvf11\",\r\n"
+			+ "			\"resourceName\" : \"TestNotificationVF1\",\r\n" + "			\"resourceVersion\" : \"1.0\",\r\n" + "			\"resoucreType\" : \"VF\",\r\n" + "			\"resourceUUID\" : \"907e1746-9f69-40f5-9f2a-313654092a2d\",\r\n"
+			+ "			\"artifacts\" : [{\r\n" + "					\"artifactName\" : \"sample-xml-alldata-1-1.xml\",\r\n" + "					\"artifactType\" : \"YANG_XML\",\r\n"
+			+ "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/sample-xml-alldata-1-1.xml\",\r\n"
+			+ "					\"artifactChecksum\" : \"MTUxODFkMmRlOTNhNjYxMGYyYTI1ZjA5Y2QyNWQyYTk\\u003d\",\r\n" + "					\"artifactDescription\" : \"MyYang\",\r\n" + "					\"artifactTimeout\" : 0,\r\n"
+			+ "					\"artifactUUID\" : \"0005bc4a-2c19-452e-be6d-d574a56be4d0\",\r\n" + "					\"artifactVersion\" : \"1\"\r\n" + "				}, {\r\n" + "					\"artifactName\" : \"heat.yaml\",\r\n"
+			+ "					\"artifactType\" : \"HEAT\",\r\n" + "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.yaml\",\r\n"
+			+ "					\"artifactChecksum\" : \"ODEyNjE4YTMzYzRmMTk2ODVhNTU2NTg3YWEyNmIxMTM\\u003d\",\r\n" + "					\"artifactDescription\" : \"heat\",\r\n" + "					\"artifactTimeout\" : 60,\r\n"
+			+ "					\"artifactUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" + "					\"artifactVersion\" : \"1\"\r\n" + "				}, {\r\n" + "					\"artifactName\" : \"heat.env\",\r\n"
+			+ "					\"artifactType\" : \"HEAT_ENV\",\r\n" + "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.env\",\r\n"
+			+ "					\"artifactChecksum\" : \"NGIzMjExZTM1NDc2NjBjOTQyMGJmMWNiMmU0NTE5NzM\\u003d\",\r\n" + "					\"artifactDescription\" : \"Auto-generated HEAT Environment deployment artifact\",\r\n"
+			+ "					\"artifactTimeout\" : 0,\r\n" + "					\"artifactUUID\" : \"ce65d31c-35c0-43a9-90c7-596fc51d0c86\",\r\n" + "					\"artifactVersion\" : \"1\",\r\n"
+			+ "					\"generatedFromUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\"\r\n" + "				}\r\n" + "			]\r\n" + "		}\r\n" + "	]}";
+	}
+
+	private String getNotificationWithMultipleResources(){
+		return "{\"distributionID\" : \"bcc7a72e-90b1-4c5f-9a37-28dc3cd86416\",\r\n" +
+			"	\"serviceName\" : \"Testnotificationser1\",\r\n" +
+			"	\"serviceVersion\" : \"1.0\",\r\n" +
+			"	\"serviceUUID\" : \"7f7f94f4-373a-4b71-a0e3-80ae2ba4eb5d\",\r\n" +
+			"	\"serviceDescription\" : \"TestNotificationVF1\",\r\n" +
+			"	\"resources\" : [{\r\n" +
+			"			\"resourceInstanceName\" : \"testnotificationvf11\",\r\n" +
+			"			\"resourceName\" : \"TestNotificationVF1\",\r\n" +
+			"			\"resourceVersion\" : \"1.0\",\r\n" +
+			"			\"resoucreType\" : \"VF\",\r\n" +
+			"			\"resourceUUID\" : \"907e1746-9f69-40f5-9f2a-313654092a2d\",\r\n" +
+			"			\"artifacts\" : [{\r\n" +
+			"					\"artifactName\" : \"sample-xml-alldata-1-1.xml\",\r\n" +
+			"					\"artifactType\" : \"YANG_XML\",\r\n" +
+			"					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/sample-xml-alldata-1-1.xml\",\r\n" +
+			"					\"artifactChecksum\" : \"MTUxODFkMmRlOTNhNjYxMGYyYTI1ZjA5Y2QyNWQyYTk\\u003d\",\r\n" +
+			"					\"artifactDescription\" : \"MyYang\",\r\n" +
+			"					\"artifactTimeout\" : 0,\r\n" +
+			"					\"artifactUUID\" : \"0005bc4a-2c19-452e-be6d-d574a56be4d0\",\r\n" +
+			"					\"artifactVersion\" : \"1\"\r\n" +
+			"				}" +
+			"			]\r\n" +
+			"		},\r\n" +
+			"       {\r\n" +
+			"			\"resourceInstanceName\" : \"testnotificationvf12\",\r\n" +
+			"			\"resourceName\" : \"TestNotificationVF1\",\r\n" +
+			"			\"resourceVersion\" : \"1.0\",\r\n" +
+			"			\"resoucreType\" : \"VF\",\r\n" +
+			"			\"resourceUUID\" : \"907e1746-9f69-40f5-9f2a-313654092a2e\",\r\n" +
+			"			\"artifacts\" : [{\r\n" +
+			"					\"artifactName\" : \"heat.yaml\",\r\n" +
+			"					\"artifactType\" : \"HEAT\",\r\n" +
+			"					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.yaml\",\r\n" +
+			"					\"artifactChecksum\" : \"ODEyNjE4YTMzYzRmMTk2ODVhNTU2NTg3YWEyNmIxMTM\\u003d\",\r\n" +
+			"					\"artifactDescription\" : \"heat\",\r\n" +
+			"					\"artifactTimeout\" : 60,\r\n" +
+			"					\"artifactUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" +
+			"					\"artifactVersion\" : \"1\"\r\n" +
+			"				}" +
+			"			]\r\n" +
+			"		}\r\n" +
+			"	]}";
+	}
+
+
+	private String getSdcNotificationWithNonExistentArtifact() {
+		return "{\"distributionID\" : \"bcc7a72e-90b1-4c5f-9a37-28dc3cd86416\",\r\n" + "	\"serviceName\" : \"Testnotificationser1\",\r\n" + "	\"serviceVersion\" : \"1.0\",\r\n"
+			+ "	\"serviceUUID\" : \"7f7f94f4-373a-4b71-a0e3-80ae2ba4eb5d\",\r\n" + "	\"serviceDescription\" : \"TestNotificationVF1\",\r\n" + "	\"bugabuga\" : \"xyz\",\r\n" + "	\"resources\" : [{\r\n"
+			+ "			\"resourceInstanceName\" : \"testnotificationvf11\",\r\n" + "			\"resourceName\" : \"TestNotificationVF1\",\r\n" + "			\"resourceVersion\" : \"1.0\",\r\n" + "			\"resoucreType\" : \"VF\",\r\n"
+			+ "			\"resourceUUID\" : \"907e1746-9f69-40f5-9f2a-313654092a2d\",\r\n" + "			\"artifacts\" : [{\r\n" + "					\"artifactName\" : \"heat.yaml\",\r\n" + "					\"artifactType\" : \"HEAT\",\r\n"
+			+ "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.yaml\",\r\n"
+			+ "					\"artifactChecksum\" : \"ODEyNjE4YTMzYzRmMTk2ODVhNTU2NTg3YWEyNmIxMTM\\u003d\",\r\n" + "					\"artifactDescription\" : \"heat\",\r\n" + "					\"artifactTimeout\" : 60,\r\n"
+			+ "					\"artifactUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" + "					\"artifactBuga\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" + "					\"artifactVersion\" : \"1\"\r\n"
+			+ "				}, {\r\n" + "					\"artifactName\" : \"buga.bug\",\r\n" + "					\"artifactType\" : \"BUGA_BUGA\",\r\n"
+			+ "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.env\",\r\n"
+			+ "					\"artifactChecksum\" : \"NGIzMjExZTM1NDc2NjBjOTQyMGJmMWNiMmU0NTE5NzM\\u003d\",\r\n" + "					\"artifactDescription\" : \"Auto-generated HEAT Environment deployment artifact\",\r\n"
+			+ "					\"artifactTimeout\" : 0,\r\n" + "					\"artifactUUID\" : \"ce65d31c-35c0-43a9-90c7-596fc51d0c86\",\r\n" + "					\"artifactVersion\" : \"1\",\r\n"
+			+ "					\"generatedFromUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\"\r\n" + "				}\r\n" + "			]\r\n" + "		}\r\n" + "	]}";
+	}
+
+	private String getSdcServiceNotificationWithRelatedArtifacts() {
+		return "{\"distributionID\" : \"bcc7a72e-90b1-4c5f-9a37-28dc3cd86416\",\r\n" + "	\"serviceName\" : \"Testnotificationser1\",\r\n" + "	\"serviceVersion\" : \"1.0\",\r\n"
+			+ "	\"serviceUUID\" : \"7f7f94f4-373a-4b71-a0e3-80ae2ba4eb5d\",\r\n" + "	\"serviceDescription\" : \"TestNotificationVF1\",\r\n" + "	\"resources\" : [{\r\n" + "			\"resourceInstanceName\" : \"testnotificationvf11\",\r\n"
+			+ "			\"resourceName\" : \"TestNotificationVF1\",\r\n" + "			\"resourceVersion\" : \"1.0\",\r\n" + "			\"resoucreType\" : \"VF\",\r\n" + "			\"resourceUUID\" : \"907e1746-9f69-40f5-9f2a-313654092a2d\",\r\n"
+			+ "			\"artifacts\" : [{\r\n" + "					\"artifactName\" : \"sample-xml-alldata-1-1.xml\",\r\n" + "					\"artifactType\" : \"YANG_XML\",\r\n"
+			+ "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/sample-xml-alldata-1-1.xml\",\r\n"
+			+ "					\"artifactChecksum\" : \"MTUxODFkMmRlOTNhNjYxMGYyYTI1ZjA5Y2QyNWQyYTk\\u003d\",\r\n" + "					\"artifactDescription\" : \"MyYang\",\r\n" + "					\"artifactTimeout\" : 0,\r\n"
+			+ "					\"artifactUUID\" : \"0005bc4a-2c19-452e-be6d-d574a56be4d0\",\r\n" + "					\"artifactVersion\" : \"1\",\r\n" + "                   \"relatedArtifacts\" : [\r\n"
+			+ "  						\"ce65d31c-35c0-43a9-90c7-596fc51d0c86\"\r\n" + "  					]" + "				}, {\r\n" + "					\"artifactName\" : \"heat.yaml\",\r\n"
+			+ "					\"artifactType\" : \"HEAT\",\r\n" + "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.yaml\",\r\n"
+			+ "					\"artifactChecksum\" : \"ODEyNjE4YTMzYzRmMTk2ODVhNTU2NTg3YWEyNmIxMTM\\u003d\",\r\n" + "					\"artifactDescription\" : \"heat\",\r\n" + "					\"artifactTimeout\" : 60,\r\n"
+			+ "					\"artifactUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" + "					\"artifactVersion\" : \"1\", \r\n" + "					\"relatedArtifacts\" : [\r\n"
+			+ "  						\"0005bc4a-2c19-452e-be6d-d574a56be4d0\", \r\n" + "  						\"ce65d31c-35c0-43a9-90c7-596fc51d0c86\"\r\n" + "  					]" + "				}, {\r\n"
+			+ "					\"artifactName\" : \"heat.env\",\r\n" + "					\"artifactType\" : \"HEAT_ENV\",\r\n"
+			+ "					\"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.env\",\r\n"
+			+ "					\"artifactChecksum\" : \"NGIzMjExZTM1NDc2NjBjOTQyMGJmMWNiMmU0NTE5NzM\\u003d\",\r\n" + "					\"artifactDescription\" : \"Auto-generated HEAT Environment deployment artifact\",\r\n"
+			+ "					\"artifactTimeout\" : 0,\r\n" + "					\"artifactUUID\" : \"ce65d31c-35c0-43a9-90c7-596fc51d0c86\",\r\n" + "					\"artifactVersion\" : \"1\",\r\n"
+			+ "					\"generatedFromUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\"\r\n" + "				}\r\n" + "			]\r\n" + "		}\r\n" + "	]}";
+	}
+
+	private String getSdcServiceNotificationWithoutHeatArtifact() {
+		return "{" + "   \"distributionID\" : \"5v1234d8-5b6d-42c4-7t54-47v95n58qb7\"," + "   \"serviceName\" : \"srv1\"," + "   \"serviceVersion\": \"2.0\"," + "   \"serviceUUID\" : \"4e0697d8-5b6d-42c4-8c74-46c33d46624c\","
+			+ "   \"serviceArtifacts\":[" + "                    {" + "                       \"artifactName\" : \"ddd.yml\"," + "                       \"artifactType\" : \"DG_XML\"," + "                       \"artifactTimeout\" : \"65\","
+			+ "                       \"artifactDescription\" : \"description\"," + "                       \"artifactURL\" :" + "                      \"/sdc/v1/catalog/services/srv1/2.0/resources/ddd/3.0/artifacts/ddd.xml\" ,"
+			+ "                       \"resourceUUID\" : \"4e5874d8-5b6d-42c4-8c74-46c33d90drw\" ," + "                       \"checksum\" : \"15e389rnrp58hsw==\"" + "                    }" + "                  ]" + "}";
+	}
+
+	private String getNotificationWithServiceArtifatcs() {
+		return "{\r\n" + "  \"distributionID\" : \"bcc7a72e-90b1-4c5f-9a37-28dc3cd86416\",\r\n" + "  \"serviceName\" : \"Testnotificationser1\",\r\n" + "  \"serviceVersion\" : \"1.0\",\r\n"
+			+ "  \"serviceUUID\" : \"7f7f94f4-373a-4b71-a0e3-80ae2ba4eb5d\",\r\n" + "  \"serviceDescription\" : \"TestNotificationVF1\",\r\n" + "  \"serviceArtifacts\" : [{\r\n" + "          \"artifactName\" : \"sample-xml-alldata-1-1.xml\",\r\n"
+			+ "          \"artifactType\" : \"YANG_XML\",\r\n" + "          \"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/sample-xml-alldata-1-1.xml\",\r\n"
+			+ "          \"artifactChecksum\" : \"MTUxODFkMmRlOTNhNjYxMGYyYTI1ZjA5Y2QyNWQyYTk\\u003d\",\r\n" + "          \"artifactDescription\" : \"MyYang\",\r\n" + "          \"artifactTimeout\" : 0,\r\n"
+			+ "          \"artifactUUID\" : \"0005bc4a-2c19-452e-be6d-d574a56be4d0\",\r\n" + "          \"artifactVersion\" : \"1\"\r\n" + "        }, {\r\n" + "          \"artifactName\" : \"heat.yaml\",\r\n"
+			+ "          \"artifactType\" : \"HEAT\",\r\n" + "          \"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.yaml\",\r\n"
+			+ "          \"artifactChecksum\" : \"ODEyNjE4YTMzYzRmMTk2ODVhNTU2NTg3YWEyNmIxMTM\\u003d\",\r\n" + "          \"artifactDescription\" : \"heat\",\r\n" + "          \"artifactTimeout\" : 60,\r\n"
+			+ "          \"artifactUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" + "          \"artifactVersion\" : \"1\"\r\n" + "        }, {\r\n" + "          \"artifactName\" : \"heat.env\",\r\n"
+			+ "          \"artifactType\" : \"HEAT_ENV\",\r\n" + "          \"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.env\",\r\n"
+			+ "          \"artifactChecksum\" : \"NGIzMjExZTM1NDc2NjBjOTQyMGJmMWNiMmU0NTE5NzM\\u003d\",\r\n" + "          \"artifactDescription\" : \"Auto-generated HEAT Environment deployment artifact\",\r\n"
+			+ "          \"artifactTimeout\" : 0,\r\n" + "          \"artifactUUID\" : \"ce65d31c-35c0-43a9-90c7-596fc51d0c86\",\r\n" + "          \"artifactVersion\" : \"1\",\r\n"
+			+ "          \"generatedFromUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\"\r\n" + "        }\r\n" + "      ],\r\n" + "  \"resources\" : [{\r\n" + "      \"resourceInstanceName\" : \"testnotificationvf11\",\r\n"
+			+ "      \"resourceName\" : \"TestNotificationVF1\",\r\n" + "      \"resourceVersion\" : \"1.0\",\r\n" + "      \"resoucreType\" : \"VF\",\r\n" + "      \"resourceUUID\" : \"907e1746-9f69-40f5-9f2a-313654092a2d\",\r\n"
+			+ "      \"artifacts\" : [{\r\n" + "          \"artifactName\" : \"sample-xml-alldata-1-1.xml\",\r\n" + "          \"artifactType\" : \"YANG_XML\",\r\n"
+			+ "          \"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/sample-xml-alldata-1-1.xml\",\r\n"
+			+ "          \"artifactChecksum\" : \"MTUxODFkMmRlOTNhNjYxMGYyYTI1ZjA5Y2QyNWQyYTk\\u003d\",\r\n" + "          \"artifactDescription\" : \"MyYang\",\r\n" + "          \"artifactTimeout\" : 0,\r\n"
+			+ "          \"artifactUUID\" : \"0005bc4a-2c19-452e-be6d-d574a56be4d0\",\r\n" + "          \"artifactVersion\" : \"1\"\r\n" + "        }, {\r\n" + "          \"artifactName\" : \"heat.yaml\",\r\n"
+			+ "          \"artifactType\" : \"HEAT\",\r\n" + "          \"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.yaml\",\r\n"
+			+ "          \"artifactChecksum\" : \"ODEyNjE4YTMzYzRmMTk2ODVhNTU2NTg3YWEyNmIxMTM\\u003d\",\r\n" + "          \"artifactDescription\" : \"heat\",\r\n" + "          \"artifactTimeout\" : 60,\r\n"
+			+ "          \"artifactUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\",\r\n" + "          \"artifactVersion\" : \"1\"\r\n" + "        }, {\r\n" + "          \"artifactName\" : \"heat.env\",\r\n"
+			+ "          \"artifactType\" : \"HEAT_ENV\",\r\n" + "          \"artifactURL\" : \"/sdc/v1/catalog/services/Testnotificationser1/1.0/resourceInstances/testnotificationvf11/artifacts/heat.env\",\r\n"
+			+ "          \"artifactChecksum\" : \"NGIzMjExZTM1NDc2NjBjOTQyMGJmMWNiMmU0NTE5NzM\\u003d\",\r\n" + "          \"artifactDescription\" : \"Auto-generated HEAT Environment deployment artifact\",\r\n"
+			+ "          \"artifactTimeout\" : 0,\r\n" + "          \"artifactUUID\" : \"ce65d31c-35c0-43a9-90c7-596fc51d0c86\",\r\n" + "          \"artifactVersion\" : \"1\",\r\n"
+			+ "          \"generatedFromUUID\" : \"8df6123c-f368-47d3-93be-1972cefbcc35\"\r\n" + "        }\r\n" + "      ]\r\n" + "    }\r\n" + "  ]\r\n" + "}";
+	}
+
+	private <T> int countInstances(List<T> list, T element) {
+		int count = 0;
+		for (T curr : list) {
+			if (curr.equals(element)) {
+				count++;
+			}
+		}
+		return count;
+	}
+}
\ No newline at end of file