1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderTest.java
index cae94f18..7d6743e1 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/apex/pdp/ApexPdpPolicyForwarderTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +46,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.common.parameters.ParameterGroup;
 import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.distribution.forwarding.PolicyForwardingException;
+import org.onap.policy.distribution.forwarding.xacml.pdp.testclasses.CommonTestData;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
 
@@ -56,8 +58,6 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
 @RunWith(MockitoJUnitRunner.class)
 public class ApexPdpPolicyForwarderTest {
 
-    private static final String HOST_NAME = "10.10.10.10";
-    private static final int PORT = 1234;
     private static final boolean IGNORE_CONFLICTS = false;
     private static final boolean FORCE_UPDATE = true;
     private static final String GROUP_NAME = "apexPdpConfiguration";
@@ -70,9 +70,10 @@ public class ApexPdpPolicyForwarderTest {
      */
     @BeforeClass
     public static void setUp() {
-        final ApexPdpPolicyForwarderParameterBuilder builder = new ApexPdpPolicyForwarderParameterBuilder();
-        builder.setHostname(HOST_NAME).setPort(PORT).setIgnoreConflicts(IGNORE_CONFLICTS).setForceUpdate(FORCE_UPDATE);
-        final ParameterGroup parameterGroup = new ApexPdpPolicyForwarderParameterGroup(builder);
+        final ParameterGroup parameterGroup = CommonTestData.getPolicyForwarderParameters(
+                "src/test/resources/parameters/ApexPdpPolicyForwarderParameters.json",
+                ApexPdpPolicyForwarderParameterGroup.class);
+
         parameterGroup.setName(GROUP_NAME);
         ParameterService.register(parameterGroup);
     }