Refactoring existing integration tests

Change-Id: I1aedd94d5197b8c6513fc701e9df2aab4edec088
Issue-ID: POLICY-865
Signed-off-by: waqas.ikram <waqas.ikram@ericsson.com>

2 files changed, 21 insertions, 15 deletions

diff --git a/context/context-management/src/main/java/org/onap/policy/apex/context/parameters/DistributorParameters.java b/context/context-management/src/main/java/org/onap/policy/apex/context/parameters/DistributorParameters.java
index 147e4eb35..cb4c6128e 100644
--- a/context/context-management/src/main/java/org/onap/policy/apex/context/parameters/DistributorParameters.java
+++ b/context/context-management/src/main/java/org/onap/policy/apex/context/parameters/DistributorParameters.java
@@ -20,25 +20,27 @@
 
 package org.onap.policy.apex.context.parameters;
 
+import org.onap.policy.apex.context.impl.distribution.jvmlocal.JVMLocalDistributor;
 import org.onap.policy.apex.model.basicmodel.service.AbstractParameters;
 import org.onap.policy.apex.model.basicmodel.service.ParameterService;
 
 /**
- * An empty distributor parameter class that may be specialized by context distributor plugins that require plugin
- * specific parameters. The class defines the default distributor plugin as the JVM local distributor.
+ * An empty distributor parameter class that may be specialized by context distributor plugins that
+ * require plugin specific parameters. The class defines the default distributor plugin as the JVM
+ * local distributor.
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
 public class DistributorParameters extends AbstractParameters {
     /** The default distributor makes context albums available to all threads in a single JVM. */
-    public static final String DEFAULT_DISTRIBUTOR_PLUGIN_CLASS =
-            "org.onap.policy.apex.context.impl.distribution.jvmlocal.JVMLocalDistributor";
+    public static final String DEFAULT_DISTRIBUTOR_PLUGIN_CLASS = JVMLocalDistributor.class.getCanonicalName();
 
     // Plugin class names
     private String pluginClass = DEFAULT_DISTRIBUTOR_PLUGIN_CLASS;
 
     /**
-     * Constructor to create a distributor parameters instance and register the instance with the parameter service.
+     * Constructor to create a distributor parameters instance and register the instance with the
+     * parameter service.
      */
     public DistributorParameters() {
         super(DistributorParameters.class.getCanonicalName());
@@ -46,8 +48,8 @@ public class DistributorParameters extends AbstractParameters {
     }
 
     /**
-     * Constructor to create a distributor parameters instance with the name of a sub class of this class and register
-     * the instance with the parameter service.
+     * Constructor to create a distributor parameters instance with the name of a sub class of this
+     * class and register the instance with the parameter service.
      *
      * @param parameterClassName the class name of a sub class of this class
      */
diff --git a/context/context-management/src/main/java/org/onap/policy/apex/context/parameters/LockManagerParameters.java b/context/context-management/src/main/java/org/onap/policy/apex/context/parameters/LockManagerParameters.java
index 93e422357..1aaee2cc7 100644
--- a/context/context-management/src/main/java/org/onap/policy/apex/context/parameters/LockManagerParameters.java
+++ b/context/context-management/src/main/java/org/onap/policy/apex/context/parameters/LockManagerParameters.java
@@ -20,25 +20,29 @@
 
 package org.onap.policy.apex.context.parameters;
 
+import org.onap.policy.apex.context.impl.locking.jvmlocal.JVMLocalLockManager;
 import org.onap.policy.apex.model.basicmodel.service.AbstractParameters;
 import org.onap.policy.apex.model.basicmodel.service.ParameterService;
 
 /**
- * An empty lock manager parameter class that may be specialized by context lock manager plugins that require plugin
- * specific parameters. The class defines the default lock manager plugin as the JVM local lock manager.
+ * An empty lock manager parameter class that may be specialized by context lock manager plugins
+ * that require plugin specific parameters. The class defines the default lock manager plugin as the
+ * JVM local lock manager.
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
 public class LockManagerParameters extends AbstractParameters {
-    /** The default lock manager can lock context album instance across all threads in a single JVM. */
-    public static final String DEFAULT_LOCK_MANAGER_PLUGIN_CLASS =
-            "org.onap.policy.apex.context.impl.locking.jvmlocal.JVMLocalLockManager";
+    /**
+     * The default lock manager can lock context album instance across all threads in a single JVM.
+     */
+    public static final String DEFAULT_LOCK_MANAGER_PLUGIN_CLASS = JVMLocalLockManager.class.getCanonicalName();
 
     // Plugin class names
     private String pluginClass = DEFAULT_LOCK_MANAGER_PLUGIN_CLASS;
 
     /**
-     * Constructor to create a lock manager parameters instance and register the instance with the parameter service.
+     * Constructor to create a lock manager parameters instance and register the instance with the
+     * parameter service.
      */
     public LockManagerParameters() {
         super(LockManagerParameters.class.getCanonicalName());
@@ -46,8 +50,8 @@ public class LockManagerParameters extends AbstractParameters {
     }
 
     /**
-     * Constructor to create a lock manager parameters instance with the name of a sub class of this class and register
-     * the instance with the parameter service.
+     * Constructor to create a lock manager parameters instance with the name of a sub class of this
+     * class and register the instance with the parameter service.
      *
      * @param parameterClassName the class name of a sub class of this class
      */