2 files changed, 57 insertions, 37 deletions

diff --git a/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java b/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java
index e0c9705..743b032 100644
--- a/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java
+++ b/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java
@@ -18,20 +18,17 @@
 
 package org.onap.pomba.contextaggregator.datatypes;
 
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
 import org.onap.pomba.contextaggregator.config.EventHeaderConfig;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest
 public class AggregatedModelsTest {
 
     AggregatedModels aggregatedModels;
@@ -43,27 +40,55 @@ public class AggregatedModelsTest {
     private String topEntityType;
     private String topicName;
 
-    EventHeaderConfig eventHeaderConfig = new EventHeaderConfig(
-            domain, sourceName, eventType, entityType, topEntityType, topicName);
+    EventHeaderConfig eventHeaderConfig = new EventHeaderConfig(domain, sourceName, eventType, entityType,
+            topEntityType, topicName);
 
     Map<String, String> jsonContextMap = new HashMap<>();
 
-    POAEvent pOAEvent = new POAEvent();
+    POAEvent poaEvent = new POAEvent();
 
+    /**
+     * JUnit setup.
+     */
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        pOAEvent.setServiceInstanceId("a");
-        pOAEvent.setModelVersionId("b");
-        pOAEvent.setModelInvariantId("c");
-        pOAEvent.setxFromAppId("e");
-        pOAEvent.setxTransactionId("f");
+        poaEvent.setServiceInstanceId("a");
+        poaEvent.setModelVersionId("b");
+        poaEvent.setModelInvariantId("c");
+        poaEvent.setxFromAppId("e");
+        poaEvent.setxTransactionId("f");
     }
 
     @Test
     public void testGenerateJsonPayload() throws Exception {
-        aggregatedModels = new AggregatedModels(eventHeaderConfig,jsonContextMap,pOAEvent);
+        aggregatedModels = new AggregatedModels(eventHeaderConfig, jsonContextMap, poaEvent);
         Assert.assertNotNull(aggregatedModels.generateJsonPayload());
         Assert.assertNotNull(aggregatedModels.getEntityHeader());
     }
+
+    @Test
+    public void testDataQualitySummaryError() throws Exception {
+        String filename = "src/test/resources/modelContextAAI-input.json";
+        String fileContent = new String(Files.readAllBytes(Paths.get(filename)));
+
+        jsonContextMap.put("aai", fileContent);
+        jsonContextMap.put("sdnc", fileContent);
+        aggregatedModels = new AggregatedModels(eventHeaderConfig, jsonContextMap, poaEvent);
+        Assert.assertNotNull(aggregatedModels.generateJsonPayload());
+        Assert.assertNotNull(aggregatedModels.getEntityHeader());
+        Assert.assertNotNull(poaEvent.getDataQualitySummary());
+        System.err.println(poaEvent.getDataQualitySummary());
+        Assert.assertEquals(DataQualitySummary.Status.error, poaEvent.getDataQualitySummary().getStatus());
+    }
+    
+    @Test
+    public void testDataQualitySummaryOk() throws Exception {
+        jsonContextMap.put("aai", "{}");
+        aggregatedModels = new AggregatedModels(eventHeaderConfig, jsonContextMap, poaEvent);
+        Assert.assertNotNull(aggregatedModels.generateJsonPayload());
+        Assert.assertNotNull(aggregatedModels.getEntityHeader());
+        Assert.assertNotNull(poaEvent.getDataQualitySummary());
+        Assert.assertEquals(DataQualitySummary.Status.ok, poaEvent.getDataQualitySummary().getStatus());
+    }
 }
diff --git a/src/test/java/org/onap/pomba/contextaggregator/datatypes/POAEventTest.java b/src/test/java/org/onap/pomba/contextaggregator/datatypes/POAEventTest.java
index 13f15dd..7041840 100644
--- a/src/test/java/org/onap/pomba/contextaggregator/datatypes/POAEventTest.java
+++ b/src/test/java/org/onap/pomba/contextaggregator/datatypes/POAEventTest.java
@@ -23,36 +23,31 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.onap.pomba.contextaggregator.exception.ContextAggregatorException;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest
 public class POAEventTest {
 
-    POAEvent pOAEvent = new POAEvent();
+    POAEvent poaEvent = new POAEvent();
 
     @Before
     public void setup() {
-        pOAEvent.setServiceInstanceId("a");
-        pOAEvent.setModelVersionId("b");
-        pOAEvent.setModelInvariantId("c");
-        pOAEvent.setxFromAppId("e");
-        pOAEvent.setxTransactionId("f");
+        poaEvent.setServiceInstanceId("a");
+        poaEvent.setModelVersionId("b");
+        poaEvent.setModelInvariantId("c");
+        poaEvent.setxFromAppId("e");
+        poaEvent.setxTransactionId("f");
     }
 
     @Test
     public void testValidate() throws ContextAggregatorException {
-        pOAEvent.validate();
+        poaEvent.validate();
     }
 
     @Test
     public void testValidateEmptyServiceInstanceId() throws ContextAggregatorException {
-        pOAEvent.setServiceInstanceId("");
+        poaEvent.setServiceInstanceId("");
         try {
-            pOAEvent.validate();
+            poaEvent.validate();
         }
         catch (ContextAggregatorException e) {
             assertTrue(e.getMessage().contains("is missing"));
@@ -61,10 +56,10 @@ public class POAEventTest {
 
     @Test
     public void testValidateEmptyModelVersionId() throws ContextAggregatorException {
-        pOAEvent.setModelVersionId("");
+        poaEvent.setModelVersionId("");
 
         try {
-            pOAEvent.validate();
+            poaEvent.validate();
         }
         catch (ContextAggregatorException e) {
             assertTrue(e.getMessage().contains("is missing"));
@@ -73,10 +68,10 @@ public class POAEventTest {
 
     @Test
     public void testValidateEmptyModelInvariantId() throws ContextAggregatorException {
-        pOAEvent.setModelInvariantId("");
+        poaEvent.setModelInvariantId("");
 
         try {
-            pOAEvent.validate();
+            poaEvent.validate();
         }
         catch (ContextAggregatorException e) {
             assertTrue(e.getMessage().contains("is missing"));
@@ -85,10 +80,10 @@ public class POAEventTest {
 
     @Test
     public void testValidateEmptyxFromAppId() throws ContextAggregatorException {
-        pOAEvent.setxFromAppId("");
+        poaEvent.setxFromAppId("");
 
         try {
-            pOAEvent.validate();
+            poaEvent.validate();
         }
         catch (ContextAggregatorException e) {
             assertTrue(e.getMessage().contains("is missing"));
@@ -97,10 +92,10 @@ public class POAEventTest {
 
     @Test
     public void testValidateEmptyxTransactionId() throws ContextAggregatorException {
-        pOAEvent.setxTransactionId("");
+        poaEvent.setxTransactionId("");
 
         try {
-            pOAEvent.validate();
+            poaEvent.validate();
         }
         catch (ContextAggregatorException e) {
             assertTrue(e.getMessage().contains("is missing"));
@@ -109,7 +104,7 @@ public class POAEventTest {
 
     @Test
     public void testToString() {
-        String result = pOAEvent.toString();
+        String result = poaEvent.toString();
         Assert.assertNotEquals("", result);
     }
 }