2 files changed, 21 insertions, 24 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 ffb2a2f..e0c9705 100644
--- a/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java
+++ b/src/test/java/org/onap/pomba/contextaggregator/datatypes/AggregatedModelsTest.java
@@ -15,8 +15,12 @@
  * limitations under the License.
  * ============LICENSE_END=====================================================
  */
+
 package org.onap.pomba.contextaggregator.datatypes;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -26,13 +30,10 @@ import org.onap.pomba.contextaggregator.config.EventHeaderConfig;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
-public class AggregatedModelsTest
-{
+public class AggregatedModelsTest {
+
     AggregatedModels aggregatedModels;
 
     private String domain;
@@ -50,8 +51,7 @@ public class AggregatedModelsTest
     POAEvent pOAEvent = new POAEvent();
 
     @Before
-    public void setUp()
-    {
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
         pOAEvent.setServiceInstanceId("a");
         pOAEvent.setModelVersionId("b");
@@ -61,8 +61,7 @@ public class AggregatedModelsTest
     }
 
     @Test
-    public void testGenerateJsonPayload() throws Exception
-    {
+    public void testGenerateJsonPayload() throws Exception {
         aggregatedModels = new AggregatedModels(eventHeaderConfig,jsonContextMap,pOAEvent);
         Assert.assertNotNull(aggregatedModels.generateJsonPayload());
         Assert.assertNotNull(aggregatedModels.getEntityHeader());
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 2afa260..13f15dd 100644
--- a/src/test/java/org/onap/pomba/contextaggregator/datatypes/POAEventTest.java
+++ b/src/test/java/org/onap/pomba/contextaggregator/datatypes/POAEventTest.java
@@ -15,8 +15,11 @@
  * limitations under the License.
  * ============LICENSE_END=====================================================
  */
+
 package org.onap.pomba.contextaggregator.datatypes;
 
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -25,17 +28,14 @@ import org.onap.pomba.contextaggregator.exception.ContextAggregatorException;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.junit.Assert.assertTrue;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
-public class POAEventTest
-{
+public class POAEventTest {
+
     POAEvent pOAEvent = new POAEvent();
 
     @Before
-    public void setup()
-    {
+    public void setup() {
         pOAEvent.setServiceInstanceId("a");
         pOAEvent.setModelVersionId("b");
         pOAEvent.setModelInvariantId("c");
@@ -44,8 +44,7 @@ public class POAEventTest
     }
 
     @Test
-    public void testValidate() throws ContextAggregatorException
-    {
+    public void testValidate() throws ContextAggregatorException {
         pOAEvent.validate();
     }
 
@@ -55,7 +54,7 @@ public class POAEventTest
         try {
             pOAEvent.validate();
         }
-        catch (ContextAggregatorException e){
+        catch (ContextAggregatorException e) {
             assertTrue(e.getMessage().contains("is missing"));
         }
     }
@@ -67,7 +66,7 @@ public class POAEventTest
         try {
             pOAEvent.validate();
         }
-        catch (ContextAggregatorException e){
+        catch (ContextAggregatorException e) {
             assertTrue(e.getMessage().contains("is missing"));
         }
     }
@@ -79,7 +78,7 @@ public class POAEventTest
         try {
             pOAEvent.validate();
         }
-        catch (ContextAggregatorException e){
+        catch (ContextAggregatorException e) {
             assertTrue(e.getMessage().contains("is missing"));
         }
     }
@@ -91,7 +90,7 @@ public class POAEventTest
         try {
             pOAEvent.validate();
         }
-        catch (ContextAggregatorException e){
+        catch (ContextAggregatorException e) {
             assertTrue(e.getMessage().contains("is missing"));
         }
     }
@@ -103,14 +102,13 @@ public class POAEventTest
         try {
             pOAEvent.validate();
         }
-        catch (ContextAggregatorException e){
+        catch (ContextAggregatorException e) {
             assertTrue(e.getMessage().contains("is missing"));
         }
     }
 
     @Test
-    public void testToString()
-    {
+    public void testToString() {
         String result = pOAEvent.toString();
         Assert.assertNotEquals("", result);
     }