1 files changed, 38 insertions, 14 deletions
diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/CommonTestData.java b/services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/CommonTestData.java
index 08a33b94c..03f6ec2c5 100644
--- a/services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/CommonTestData.java
+++ b/services/services-onappf/src/test/java/org/onap/policy/apex/starter/parameters/CommonTestData.java
@@ -20,6 +20,8 @@
 
 package org.onap.policy.apex.starter.parameters;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -36,9 +38,29 @@ import org.onap.policy.common.utils.coder.StandardCoder;
 public class CommonTestData {
 
     public static final String APEX_STARTER_GROUP_NAME = "ApexStarterParameterGroup";
-    public static final int APEX_STARTER_TIME_INTERVAL = 5;
+    public static final int TIME_INTERVAL = 2;
+    public static final String PDP_NAME = "apex-pdp";
+    public static final String VERSION = "0.0.1";
+    public static final String PDP_TYPE = "apex";
+    public static final String DESCRIPTION = "Pdp status for HealthCheck";
+    public static final String POLICY_NAME = "onap.controllloop.operational.apex.BBS";
+    public static final String POLICY_VERSION = "0.0.1";
+    public static final List<PolicyTypeIdentParameters> SUPPORTED_POLICY_TYPES =
+            Arrays.asList(getSupportedPolicyTypes(POLICY_NAME, POLICY_VERSION));
+
+    public static final Coder coder = new StandardCoder();
 
-    private static final Coder coder = new StandardCoder();
+    /**
+     * Returns supported policy types for test cases.
+     *
+     * @return supported policy types
+     */
+    public static PolicyTypeIdentParameters getSupportedPolicyTypes(final String name, final String version) {
+        final PolicyTypeIdentParameters policyTypeIdentParameters = new PolicyTypeIdentParameters();
+        policyTypeIdentParameters.setName(name);
+        policyTypeIdentParameters.setVersion(version);
+        return policyTypeIdentParameters;
+    }
 
     /**
      * Converts the contents of a map to a parameter class.
@@ -67,26 +89,28 @@ public class CommonTestData {
         final Map<String, Object> map = new TreeMap<>();
 
         map.put("name", name);
-        map.put("timeInterval", getTimeInterval(false));
+        map.put("pdpStatusParameters", getPdpStatusParametersMap(false));
 
         return map;
     }
 
-
-
     /**
-     * Determines whether to return null or a valid time interval
+     * Returns a property map for a PdpStatusParameters map for test cases.
      *
-     * @param isNullField flag to determine what to return
-     * @return time interval based on the flag
+     * @param isEmpty boolean value to represent that object created should be empty or not
+     * @return a property map suitable for constructing an object
      */
-    public Object getTimeInterval(final boolean isNullField) {
-        if (isNullField) {
-            return null;
-        } else {
-            return APEX_STARTER_TIME_INTERVAL;
+    public Map<String, Object> getPdpStatusParametersMap(final boolean isEmpty) {
+        final Map<String, Object> map = new TreeMap<>();
+        if (!isEmpty) {
+            map.put("timeInterval", TIME_INTERVAL);
+            map.put("pdpName", PDP_NAME);
+            map.put("version", VERSION);
+            map.put("pdpType", PDP_TYPE);
+            map.put("description", DESCRIPTION);
+            map.put("supportedPolicyTypes", SUPPORTED_POLICY_TYPES);
         }
 
+        return map;
     }
-
 }