Remove topic.properties and incorporate into overall config file

[policy/pap.git] / main / src / test / java / org / onap / policy / pap / main / parameters / TestPapParameterGroup.java

diff --git a/main/src/test/java/org/onap/policy/pap/main/parameters/TestPapParameterGroup.java b/main/src/test/java/org/onap/policy/pap/main/parameters/TestPapParameterGroup.java
index 2450a75..c22f5e1 100644 (file)
--- a/main/src/test/java/org/onap/policy/pap/main/parameters/TestPapParameterGroup.java
+++ b/main/src/test/java/org/onap/policy/pap/main/parameters/TestPapParameterGroup.java
@@ -25,9 +25,12 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import java.util.Map;
 import org.junit.Test;
+import org.onap.policy.common.endpoints.parameters.RestServerParameters;
+import org.onap.policy.common.endpoints.parameters.TopicParameterGroup;
 import org.onap.policy.common.parameters.GroupValidationResult;
+import org.onap.policy.common.utils.coder.Coder;
+import org.onap.policy.common.utils.coder.StandardCoder;
 
 /**
  * Class to perform unit test of {@link PapParameterGroup}.
@@ -35,6 +38,8 @@ import org.onap.policy.common.parameters.GroupValidationResult;
  * @author Ram Krishna Verma (ram.krishna.verma@est.tech)
  */
 public class TestPapParameterGroup {
+    private static final Coder coder = new StandardCoder();
+
     CommonTestData commonTestData = new CommonTestData();
 
     @Test
@@ -45,9 +50,9 @@ public class TestPapParameterGroup {
 
     @Test
     public void testPapParameterGroup() {
-        final PapParameterGroup papParameters = commonTestData.toObject(
-                        commonTestData.getPapParameterGroupMap(CommonTestData.PAP_GROUP_NAME), PapParameterGroup.class);
+        final PapParameterGroup papParameters = commonTestData.getPapParameterGroup(1);
         final RestServerParameters restServerParameters = papParameters.getRestServerParameters();
+        final TopicParameterGroup topicParameterGroup = papParameters.getTopicParameterGroup();
         final GroupValidationResult validationResult = papParameters.validate();
         assertTrue(validationResult.isValid());
         assertEquals(CommonTestData.PAP_GROUP_NAME, papParameters.getName());
@@ -57,12 +62,14 @@ public class TestPapParameterGroup {
         assertEquals(restServerParameters.getPassword(), papParameters.getRestServerParameters().getPassword());
         assertTrue(papParameters.getRestServerParameters().isHttps());
         assertFalse(papParameters.getRestServerParameters().isAaf());
+        assertEquals(topicParameterGroup.getTopicSinks(), papParameters.getTopicParameterGroup().getTopicSinks());
+        assertEquals(topicParameterGroup.getTopicSources(), papParameters.getTopicParameterGroup().getTopicSources());
     }
 
     @Test
-    public void testPapParameterGroup_NullName() {
-        final PapParameterGroup papParameters = commonTestData.toObject(
-                        commonTestData.getPapParameterGroupMap(null), PapParameterGroup.class);
+    public void testPapParameterGroup_NullName() throws Exception {
+        String json = commonTestData.getPapParameterGroupAsString(1).replace("\"PapGroup\"", "null");
+        final PapParameterGroup papParameters = coder.decode(json, PapParameterGroup.class);
         final GroupValidationResult validationResult = papParameters.validate();
         assertFalse(validationResult.isValid());
         assertEquals(null, papParameters.getName());
@@ -70,9 +77,9 @@ public class TestPapParameterGroup {
     }
 
     @Test
-    public void testPapParameterGroup_EmptyName() {
-        final PapParameterGroup papParameters = commonTestData.toObject(
-                        commonTestData.getPapParameterGroupMap(""), PapParameterGroup.class);
+    public void testPapParameterGroup_EmptyName() throws Exception {
+        String json = commonTestData.getPapParameterGroupAsString(1).replace(CommonTestData.PAP_GROUP_NAME, "");
+        final PapParameterGroup papParameters = coder.decode(json, PapParameterGroup.class);
         final GroupValidationResult validationResult = papParameters.validate();
         assertFalse(validationResult.isValid());
         assertEquals("", papParameters.getName());
@@ -82,8 +89,7 @@ public class TestPapParameterGroup {
 
     @Test
     public void testPapParameterGroup_SetName() {
-        final PapParameterGroup papParameters = commonTestData.toObject(
-                        commonTestData.getPapParameterGroupMap(CommonTestData.PAP_GROUP_NAME), PapParameterGroup.class);
+        final PapParameterGroup papParameters = commonTestData.getPapParameterGroup(1);
         papParameters.setName("PapNewGroup");
         final GroupValidationResult validationResult = papParameters.validate();
         assertTrue(validationResult.isValid());
@@ -91,16 +97,14 @@ public class TestPapParameterGroup {
     }
 
     @Test
-    public void testApiParameterGroup_EmptyRestServerParameters() {
-        Map<String, Object> map = commonTestData.getPapParameterGroupMap(CommonTestData.PAP_GROUP_NAME);
-        map.put("restServerParameters", commonTestData.getRestServerParametersMap(true));
-
-        final PapParameterGroup papParameters = commonTestData.toObject(
-                        map, PapParameterGroup.class);
+    public void testApiParameterGroup_EmptyRestServerParameters() throws Exception {
+        String json = commonTestData.getPapParameterGroupAsString(1);
+        json = commonTestData.nullifyField(json, "restServerParameters");
+        final PapParameterGroup papParameters = commonTestData.getPapParameterGroup(0);
         final GroupValidationResult validationResult = papParameters.validate();
         assertFalse(validationResult.isValid());
         assertTrue(validationResult.getResult()
-                .contains("\"org.onap.policy.pap.main.parameters.RestServerParameters\" INVALID, "
+                .contains("\"org.onap.policy.common.endpoints.parameters.RestServerParameters\" INVALID, "
                         + "parameter group has status INVALID"));
     }
 }