21 files changed, 24 insertions, 24 deletions
diff --git a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/TestMessageListener.java b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/SupportMessageListenerTester.java
index 8bb1c7e37..3ee6a4b51 100644
--- a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/TestMessageListener.java
+++ b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/SupportMessageListenerTester.java
@@ -29,7 +29,7 @@ import org.onap.policy.apex.core.protocols.Message;
 /**
  * A test message listener.
  */
-public class TestMessageListener implements MessageListener<Message> {
+public class SupportMessageListenerTester implements MessageListener<Message> {
     @Override
     public void onMessage(String messageString) {
         fail("Message should not be received");
diff --git a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImplTest.java b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImplTest.java
index 2a80cf06b..6d35adc54 100644
--- a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImplTest.java
+++ b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImplTest.java
@@ -371,7 +371,7 @@ public class ApexEngineImplTest {
         }
 
         try {
-            engine.addEventListener("badListener", new BadListener());
+            engine.addEventListener("badListener", new DummyEnEventListener());
         } catch (Exception e) {
             fail("test should not throw an exception");
         }
@@ -394,7 +394,7 @@ public class ApexEngineImplTest {
 
         try {
             engine.removeEventListener("badListener");
-            engine.addEventListener("slowListener", new SlowListener());
+            engine.addEventListener("slowListener", new DummySlowEnEventListener());
         } catch (Exception e) {
             fail("test should not throw an exception");
         }
@@ -414,7 +414,7 @@ public class ApexEngineImplTest {
             fail("test should not throw an exception");
         }
 
-        SlowListener slowListener = new SlowListener();
+        DummySlowEnEventListener slowListener = new DummySlowEnEventListener();
         try {
             engine.addEventListener("slowListener", slowListener);
         } catch (Exception e) {
diff --git a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/BadListener.java b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyEnEventListener.java
index b829437d6..e67d256fe 100644
--- a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/BadListener.java
+++ b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyEnEventListener.java
@@ -28,7 +28,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
  * Dummy engine event listener for unit test.
  *
  */
-public class BadListener implements EnEventListener {
+public class DummyEnEventListener implements EnEventListener {
 
     /*
      * (non-Javadoc)
diff --git a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/SlowListener.java b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummySlowEnEventListener.java
index f3f885911..fbb38c99e 100644
--- a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/SlowListener.java
+++ b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummySlowEnEventListener.java
@@ -28,7 +28,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
  * Dummy engine event listener for unit test.
  *
  */
-public class SlowListener implements EnEventListener {
+public class DummySlowEnEventListener implements EnEventListener {
 
     private long waitTime;
 
diff --git a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/TestMessageListener.java b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/DummyMessageListener.java
index 9e7562b5e..4d5aedb3d 100644
--- a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/TestMessageListener.java
+++ b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/DummyMessageListener.java
@@ -33,10 +33,10 @@ import org.slf4j.ext.XLoggerFactory;
  * method is invoked.
  *
  */
-public abstract class TestMessageListener implements MessageListener<String> {
+public abstract class DummyMessageListener implements MessageListener<String> {
 
     /** The Constant logger. */
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestMessageListener.class);
+    private static final XLogger logger = XLoggerFactory.getXLogger(DummyMessageListener.class);
 
     /**
      * On command.
diff --git a/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/MessageTest.java b/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/SupportMessageTester.java
index a9c86d618..233a1c2ac 100644
--- a/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/MessageTest.java
+++ b/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/SupportMessageTester.java
@@ -32,7 +32,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 /**
  * Test of the abstract Message class.
  */
-public class MessageTest {
+public class SupportMessageTester {
 
     @SuppressWarnings("unlikely-arg-type")
     @Test
diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java
index 32c4ff38b..d0b8f3e78 100644
--- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java
+++ b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java
@@ -48,7 +48,7 @@ public class ApexEngineModelTest {
         Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
         connection = DriverManager.getConnection("jdbc:derby:memory:apex_test;create=true");
 
-        testApexModel = new TestApexModel<AxEngineModel>(AxEngineModel.class, new TestApexEngineModelCreator());
+        testApexModel = new TestApexModel<AxEngineModel>(AxEngineModel.class, new DummyTestApexEngineModelCreator());
     }
 
     @After
diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/TestApexEngineModelCreator.java b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java
index 732fd2235..fa79f8921 100644
--- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/TestApexEngineModelCreator.java
+++ b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java
@@ -35,7 +35,7 @@ import org.onap.policy.apex.model.enginemodel.concepts.AxEngineModel;
 import org.onap.policy.apex.model.enginemodel.concepts.AxEngineState;
 import org.onap.policy.apex.model.enginemodel.concepts.AxEngineStats;
 
-public class TestApexEngineModelCreator implements TestApexModelCreator<AxEngineModel> {
+public class DummyTestApexEngineModelCreator implements TestApexModelCreator<AxEngineModel> {
 
     @Override
     public AxEngineModel getModel() {
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java
index aaed3cd7f..88736d1f0 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java
@@ -48,7 +48,7 @@ public class ApexEventModelTest {
         Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
         connection = DriverManager.getConnection("jdbc:derby:memory:apex_test;create=true");
 
-        testApexModel = new TestApexModel<AxEventModel>(AxEventModel.class, new TestApexEventModelCreator());
+        testApexModel = new TestApexModel<AxEventModel>(AxEventModel.class, new DummyTestApexEventModelCreator());
     }
 
     @After
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModelCreator.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java
index 039d2305b..11685a6b4 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModelCreator.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java
@@ -32,7 +32,7 @@ import org.onap.policy.apex.model.eventmodel.concepts.AxEventModel;
 import org.onap.policy.apex.model.eventmodel.concepts.AxEvents;
 import org.onap.policy.apex.model.eventmodel.concepts.AxField;
 
-public class TestApexEventModelCreator implements TestApexModelCreator<AxEventModel> {
+public class DummyTestApexEventModelCreator implements TestApexModelCreator<AxEventModel> {
 
     @Override
     public AxEventModel getModel() {
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApiResult.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java
index e2717e542..43a9fa42e 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApiResult.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java
@@ -35,7 +35,7 @@ import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
  * Test API results.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestApiResult {
+public class ApexApiResultTest {
 
     @Test
     public void testApiResult() {
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiContextAlbum.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java
index f1b8fc84b..0d442e95f 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiContextAlbum.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
  * Context album for API tests.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestApexEditorApiContextAlbum {
+public class ApexEditorApiContextAlbumTest {
     @Test
     public void testContextAlbumCrud() {
         final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiContextSchema.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java
index 25ab6df6b..9f297203b 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiContextSchema.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
  * Context schema for API tests.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestApexEditorApiContextSchema {
+public class ApexEditorApiContextSchemaTest {
     @Test
     public void testContextSchemaCrud() {
         final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiEvent.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java
index b25c52c9c..6bb85a634 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiEvent.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
  * Test events for API tests.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestApexEditorApiEvent {
+public class ApexEditorApiEventTest {
     @Test
     public void testEventCrud() {
         final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiKeyInfo.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java
index 9dae13272..3635abbe0 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiKeyInfo.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
  * Key information for API tests.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestApexEditorApiKeyInfo {
+public class ApexEditorApiKeyInfoTest {
 
     @Test
     public void testKeyInfoCrud() {
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiPolicy.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java
index 9295ffa5f..4c54b2062 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiPolicy.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
  * Test policies for API tests.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestApexEditorApiPolicy {
+public class ApexEditorApiPolicyTest {
     @Test
     public void myTestPolicyCrud() {
         final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiTask.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java
index 9faa3653c..050025537 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiTask.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
  * Test tasks for API tests.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestApexEditorApiTask {
+public class ApexEditorApiTaskTest {
     @Test
     public void testTaskCrud() {
         final ApexModel apexModel = new ApexModelFactory().createApexModel(null, false);
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexModelApi.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
index 9e2e1ce56..462b1cd8b 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexModelApi.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
@@ -43,7 +43,7 @@ import org.onap.policy.apex.model.utilities.TextFileUtils;
  * Test the apex model API.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestApexModelApi {
+public class ApexModelApiTest {
     private Connection connection;
 
     @Before
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestModelFacade.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java
index 2c937e175..d5b845658 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestModelFacade.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java
@@ -30,7 +30,7 @@ import java.util.UUID;
 import org.junit.Test;
 import org.onap.policy.apex.model.modelapi.impl.ModelFacade;
 
-public class TestModelFacade {
+public class ModelFacadeTest {
 
     @Test
     public void testModelFacade() {
diff --git a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestModelHandlerFacade.java b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java
index 22ecaf631..9bbba1d99 100644
--- a/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestModelHandlerFacade.java
+++ b/model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.apex.model.utilities.TextFileUtils;
  * Test the model handler facade.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestModelHandlerFacade {
+public class ModelHandlerFacadeTest {
 
     @Test
     public void testModelHandlerFacade() throws IOException {
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/PolicyModelValidator.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java
index 9cee85491..1c0d933e5 100644
--- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/PolicyModelValidator.java
+++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java
@@ -31,7 +31,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
 /**
  * Main class to run the policy model validator.
  */
-public class PolicyModelValidator {
+public class SupportPolicyModelValidator {
     /**
      * Main method.
      * @param args the command line arguments