Rename test classes in apex-pdp/services

Make test classes name consitence by adding 'Test' at end of junit test classes and adding 'Support' or 'Dummy' at start of util or dummy type of test classes

Issue-ID: POLICY-1263
Change-Id: I951f4e30736144010d69a0fb3b9181f7fee76013
Signed-off-by: Parshad Patel <pars.patel@samsung.com>

17 files changed, 53 insertions, 53 deletions

diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/BadAction.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/DummyAction.java
index 72cdb54b3..6b59b0754 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/BadAction.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/DummyAction.java
@@ -26,12 +26,12 @@ import org.onap.policy.apex.core.protocols.Action;
 /**
  * Bad action class.
  */
-public class BadAction implements Action {
+public class DummyAction implements Action {
     private static final long serialVersionUID = -6562765120898697138L;
     
     private String actionString;
 
-    public BadAction(final String actionString) {
+    public DummyAction(final String actionString) {
         this.actionString = actionString;
     }
     
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/BadMessage.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/DummyMessage.java
index acbfed83f..5d1b1ce8e 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/BadMessage.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/DummyMessage.java
@@ -27,7 +27,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 /**
  * Bad protocol message.
  */
-public class BadMessage extends Message {
+public class DummyMessage extends Message {
     private static final long serialVersionUID = 3827403727783909797L;
 
     /**
@@ -35,7 +35,7 @@ public class BadMessage extends Message {
      * @param action the message action
      * @param targetKey the message target key
      */
-    public BadMessage(Action action, AxArtifactKey targetKey) {
+    public DummyMessage(Action action, AxArtifactKey targetKey) {
         super(action, targetKey);
     }
 }
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/EngDepMessageListenerTest.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/EngDepMessageListenerTest.java
index f7ac43dbc..f755a669c 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/EngDepMessageListenerTest.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/engdep/EngDepMessageListenerTest.java
@@ -138,19 +138,19 @@ public class EngDepMessageListenerTest {
             assertEquals("UpdateModel:0.0.1", dummyEngineService.getUpdateModelKey().getId());
 
             messageList.clear();
-            Message badMessage0 = new BadMessage(null, null);
+            Message badMessage0 = new DummyMessage(null, null);
             messageList.add(badMessage0);
             listener.onMessage(new MessageBlock<>(messageList, webSocketMock));
             ThreadUtilities.sleep(50);
 
             messageList.clear();
-            Message badMessage1 = new BadMessage(new BadAction(null), null);
+            Message badMessage1 = new DummyMessage(new DummyAction(null), null);
             messageList.add(badMessage1);
             listener.onMessage(new MessageBlock<>(messageList, webSocketMock));
             ThreadUtilities.sleep(50);
 
             messageList.clear();
-            Message badMessage2 = new BadMessage(new BadAction("throw exception"), null);
+            Message badMessage2 = new DummyMessage(new DummyAction("throw exception"), null);
             messageList.add(badMessage2);
             listener.onMessage(new MessageBlock<>(messageList, webSocketMock));
             ThreadUtilities.sleep(50);
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/TestJsonEventConverter.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventConverterTest.java
index 3ccdd5926..99b2654ab 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/TestJsonEventConverter.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventConverterTest.java
@@ -32,7 +32,7 @@ import org.onap.policy.apex.service.parameters.eventprotocol.EventProtocolParame
  * Test the JSON event converter corner cases.
  *
  */
-public class TestJsonEventConverter {
+public class JsonEventConverterTest {
     @Test
     public void testJsonEventConverter() {
         Apex2JsonEventConverter converter = new Apex2JsonEventConverter();
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/TestJsonEventHandlerForPojo.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerForPojoTest.java
index 38f6da1b0..ee15d2745 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/TestJsonEventHandlerForPojo.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerForPojoTest.java
@@ -41,8 +41,8 @@ import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
 import org.onap.policy.apex.model.utilities.TextFileUtils;
 import org.onap.policy.apex.service.engine.event.impl.jsonprotocolplugin.Apex2JsonEventConverter;
 import org.onap.policy.apex.service.engine.event.impl.jsonprotocolplugin.JsonEventProtocolParameters;
-import org.onap.policy.apex.service.engine.event.testpojos.TestPojo;
-import org.onap.policy.apex.service.engine.event.testpojos.TestPojoList;
+import org.onap.policy.apex.service.engine.event.testpojos.DummyPojo;
+import org.onap.policy.apex.service.engine.event.testpojos.DummyPojoList;
 import org.onap.policy.common.parameters.ParameterService;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
@@ -52,8 +52,8 @@ import org.slf4j.ext.XLoggerFactory;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestJsonEventHandlerForPojo {
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestJsonEventHandlerForPojo.class);
+public class JsonEventHandlerForPojoTest {
+    private static final XLogger logger = XLoggerFactory.getXLogger(JsonEventHandlerForPojoTest.class);
 
     /**
      * Setup event model.
@@ -126,7 +126,7 @@ public class TestJsonEventHandlerForPojo {
         assertEquals("Outside", apexEvent.getSource());
         assertEquals("Apex", apexEvent.getTarget());
 
-        TestPojo testPojo = (TestPojo) apexEvent.get("POJO_PAR");
+        DummyPojo testPojo = (DummyPojo) apexEvent.get("POJO_PAR");
 
         assertEquals(1, testPojo.getAnInt());
         assertEquals(2, testPojo.getAnInteger().intValue());
@@ -177,9 +177,9 @@ public class TestJsonEventHandlerForPojo {
         assertEquals("Outside", apexEvent.getSource());
         assertEquals("Apex", apexEvent.getTarget());
 
-        TestPojoList testPojoList = (TestPojoList) apexEvent.get("POJO_LIST_PAR");
+        DummyPojoList testPojoList = (DummyPojoList) apexEvent.get("POJO_LIST_PAR");
 
-        for (TestPojo testPojo : testPojoList.getTestPojoList()) {
+        for (DummyPojo testPojo : testPojoList.getTestPojoList()) {
             assertEquals(1, testPojo.getAnInt());
             assertEquals(2, testPojo.getAnInteger().intValue());
             assertEquals("a string", testPojo.getSomeString());
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/TestJsonEventHandler.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerTest.java
index fa399e8c0..73dd9bbe0 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/TestJsonEventHandler.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventHandlerTest.java
@@ -56,8 +56,8 @@ import org.slf4j.ext.XLoggerFactory;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestJsonEventHandler {
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestJsonEventHandler.class);
+public class JsonEventHandlerTest {
+    private static final XLogger logger = XLoggerFactory.getXLogger(JsonEventHandlerTest.class);
 
     /**
      * Setup event model.
@@ -108,7 +108,7 @@ public class TestJsonEventHandler {
             assertNotNull(jsonEventConverter);
             jsonEventConverter.init(new JsonEventProtocolParameters());
 
-            final String apexEventJsonStringIn = JsonEventGenerator.jsonEvent();
+            final String apexEventJsonStringIn = SupportJsonEventGenerator.jsonEvent();
 
             logger.debug("input event\n" + apexEventJsonStringIn);
 
@@ -149,7 +149,7 @@ public class TestJsonEventHandler {
             String apexEventJsonStringIn = null;
 
             try {
-                apexEventJsonStringIn = JsonEventGenerator.jsonEventNoName();
+                apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventNoName();
                 jsonEventConverter.toApexEvent(null, apexEventJsonStringIn);
                 fail("Test should throw an exception here");
             } catch (final ApexEventException e) {
@@ -158,7 +158,7 @@ public class TestJsonEventHandler {
             }
 
             try {
-                apexEventJsonStringIn = JsonEventGenerator.jsonEventBadName();
+                apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventBadName();
                 jsonEventConverter.toApexEvent(null, apexEventJsonStringIn);
                 fail("Test should throw an exception here");
             } catch (final ApexEventException e) {
@@ -167,7 +167,7 @@ public class TestJsonEventHandler {
             }
 
             try {
-                apexEventJsonStringIn = JsonEventGenerator.jsonEventNoExName();
+                apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventNoExName();
                 jsonEventConverter.toApexEvent(null, apexEventJsonStringIn);
                 fail("Test should throw an exception here");
             } catch (final ApexEventException e) {
@@ -175,12 +175,12 @@ public class TestJsonEventHandler {
                                 e.getMessage().substring(0, 82));
             }
 
-            apexEventJsonStringIn = JsonEventGenerator.jsonEventNoVersion();
+            apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventNoVersion();
             ApexEvent event = jsonEventConverter.toApexEvent(null, apexEventJsonStringIn).get(0);
             assertEquals("0.0.1", event.getVersion());
 
             try {
-                apexEventJsonStringIn = JsonEventGenerator.jsonEventBadVersion();
+                apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventBadVersion();
                 jsonEventConverter.toApexEvent(null, apexEventJsonStringIn);
                 fail("Test should throw an exception here");
             } catch (final ApexEventException e) {
@@ -189,7 +189,7 @@ public class TestJsonEventHandler {
             }
 
             try {
-                apexEventJsonStringIn = JsonEventGenerator.jsonEventNoExVersion();
+                apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventNoExVersion();
                 jsonEventConverter.toApexEvent(null, apexEventJsonStringIn);
                 fail("Test should throw an exception here");
             } catch (final ApexEventException e) {
@@ -198,12 +198,12 @@ public class TestJsonEventHandler {
                                 e.getMessage().substring(0, 128));
             }
 
-            apexEventJsonStringIn = JsonEventGenerator.jsonEventNoNamespace();
+            apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventNoNamespace();
             event = jsonEventConverter.toApexEvent(null, apexEventJsonStringIn).get(0);
             assertEquals("org.onap.policy.apex.events", event.getNameSpace());
 
             try {
-                apexEventJsonStringIn = JsonEventGenerator.jsonEventBadNamespace();
+                apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventBadNamespace();
                 jsonEventConverter.toApexEvent(null, apexEventJsonStringIn);
                 fail("Test should throw an exception here");
             } catch (final ApexEventException e) {
@@ -213,7 +213,7 @@ public class TestJsonEventHandler {
             }
 
             try {
-                apexEventJsonStringIn = JsonEventGenerator.jsonEventNoExNamespace();
+                apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventNoExNamespace();
                 jsonEventConverter.toApexEvent(null, apexEventJsonStringIn);
                 fail("Test should throw an exception here");
             } catch (final ApexEventException e) {
@@ -223,12 +223,12 @@ public class TestJsonEventHandler {
                                 + "for that event in the Apex model", e.getMessage().substring(0, 168));
             }
 
-            apexEventJsonStringIn = JsonEventGenerator.jsonEventNoSource();
+            apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventNoSource();
             event = jsonEventConverter.toApexEvent(null, apexEventJsonStringIn).get(0);
             assertEquals("source", event.getSource());
 
             try {
-                apexEventJsonStringIn = JsonEventGenerator.jsonEventBadSource();
+                apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventBadSource();
                 jsonEventConverter.toApexEvent(null, apexEventJsonStringIn);
                 fail("Test should throw an exception here");
             } catch (final ApexEventException e) {
@@ -236,12 +236,12 @@ public class TestJsonEventHandler {
                                 e.getMessage().substring(0, 78));
             }
 
-            apexEventJsonStringIn = JsonEventGenerator.jsonEventNoTarget();
+            apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventNoTarget();
             event = jsonEventConverter.toApexEvent(null, apexEventJsonStringIn).get(0);
             assertEquals("target", event.getTarget());
 
             try {
-                apexEventJsonStringIn = JsonEventGenerator.jsonEventBadTarget();
+                apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventBadTarget();
                 jsonEventConverter.toApexEvent(null, apexEventJsonStringIn);
                 fail("Test should throw an exception here");
             } catch (final ApexEventException e) {
@@ -250,7 +250,7 @@ public class TestJsonEventHandler {
             }
 
             try {
-                apexEventJsonStringIn = JsonEventGenerator.jsonEventMissingFields();
+                apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventMissingFields();
                 jsonEventConverter.toApexEvent(null, apexEventJsonStringIn);
                 fail("Test should throw an exception here");
             } catch (final ApexEventException e) {
@@ -259,7 +259,7 @@ public class TestJsonEventHandler {
                                 e.getMessage().substring(0, 124));
             }
 
-            apexEventJsonStringIn = JsonEventGenerator.jsonEventNullFields();
+            apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventNullFields();
             event = jsonEventConverter.toApexEvent(null, apexEventJsonStringIn).get(0);
             assertEquals(null, event.get("TestSlogan"));
             assertEquals(-1, event.get("intPar"));
@@ -268,7 +268,7 @@ public class TestJsonEventHandler {
             final AxEvent eventDefinition = ModelService.getModel(AxEvents.class).get("BasicEvent");
             eventDefinition.getParameterMap().get("intPar").setOptional(true);
 
-            apexEventJsonStringIn = JsonEventGenerator.jsonEventMissingFields();
+            apexEventJsonStringIn = SupportJsonEventGenerator.jsonEventMissingFields();
             event = jsonEventConverter.toApexEvent(null, apexEventJsonStringIn).get(0);
             assertEquals(null, event.get("TestSlogan"));
             assertEquals(null, event.get("intPar"));
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/TestJsonEventProtocolPrameters.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventProtocolPrametersTest.java
index 139ea6b45..bf19d3f0b 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/TestJsonEventProtocolPrameters.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventProtocolPrametersTest.java
@@ -30,7 +30,7 @@ import org.onap.policy.apex.service.engine.event.impl.jsonprotocolplugin.JsonEve
  * Test the JSON event parameters.
  *
  */
-public class TestJsonEventProtocolPrameters {
+public class JsonEventProtocolPrametersTest {
 
     @Test
     public void testJsonParameters() {
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/TestJsonTaggedEventConsumer.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonTaggedEventConsumerTest.java
index e948ba67a..f313f1fd4 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/TestJsonTaggedEventConsumer.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonTaggedEventConsumerTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.apex.service.engine.event.impl.filecarrierplugin.consumer
  * Test JSON Tagged Event Consumer.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestJsonTaggedEventConsumer {
+public class JsonTaggedEventConsumerTest {
 
     @Test
     public void testGarbageText() throws IOException {
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/TestPluginFactories.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/PluginFactoriesTest.java
index db60b229d..d67087a7d 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/TestPluginFactories.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/PluginFactoriesTest.java
@@ -39,7 +39,7 @@ import org.onap.policy.common.parameters.ParameterException;
  * @author Liam Fallon (liam.fallon@ericsson.com)
  * @author John Keeney (john.keeney@ericsson.com)
  */
-public class TestPluginFactories {
+public class PluginFactoriesTest {
 
     @Test
     public void testEventConsumerFactory() throws ApexEventException, ParameterException {
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventGenerator.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/SupportJsonEventGenerator.java
index c2dbd48d6..4b022fb55 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/JsonEventGenerator.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/SupportJsonEventGenerator.java
@@ -25,7 +25,7 @@ package org.onap.policy.apex.service.engine.event;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class JsonEventGenerator {
+public class SupportJsonEventGenerator {
     /**
      * Json event.
      *
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/TestPojo.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummyPojo.java
index 009b2a756..f87c72521 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/TestPojo.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummyPojo.java
@@ -23,12 +23,12 @@ package org.onap.policy.apex.service.engine.event.testpojos;
 /**
  * A test Pojo for pojo decoding and encoding in Apex.
  */
-public class TestPojo {
+public class DummyPojo {
     private int anInt;
     private Integer anInteger;
     private String someString;
     
-    private TestSubPojo testSubPojo;
+    private DummySubPojo testSubPojo;
 
     /**
      * Gets the an int.
@@ -62,7 +62,7 @@ public class TestPojo {
      *
      * @return the test sub pojo
      */
-    public TestSubPojo getTestSubPojo() {
+    public DummySubPojo getTestSubPojo() {
         return testSubPojo;
     }
 
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/TestPojoList.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummyPojoList.java
index 0b39a30dc..13c0e9652 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/TestPojoList.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummyPojoList.java
@@ -25,15 +25,15 @@ import java.util.List;
 /**
  * A test list of POJO for decoding and encoding.
  */
-public class TestPojoList {
-    private List<TestPojo> testPojoList;
+public class DummyPojoList {
+    private List<DummyPojo> testPojoList;
 
     /**
      * Gets the test pojo list.
      *
      * @return the test pojo list
      */
-    public List<TestPojo> getTestPojoList() {
+    public List<DummyPojo> getTestPojoList() {
         return testPojoList;
     }
 }
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/TestSubPojo.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummySubPojo.java
index f5ea80efc..121cc81a8 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/TestSubPojo.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummySubPojo.java
@@ -23,12 +23,12 @@ package org.onap.policy.apex.service.engine.event.testpojos;
 /**
  * A test Pojo for pojo decoding and encoding in Apex.
  */
-public class TestSubPojo {
+public class DummySubPojo {
     private int anInt;
     private Integer anInteger;
     private String someString;
     
-    private TestSubSubPojo testSubSubPojo;
+    private DummySubSubPojo testSubSubPojo;
 
     /**
      * Gets the an int.
@@ -62,7 +62,7 @@ public class TestSubPojo {
      *
      * @return the test sub sub pojo
      */
-    public TestSubSubPojo getTestSubSubPojo() {
+    public DummySubSubPojo getTestSubSubPojo() {
         return testSubSubPojo;
     }
 
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/TestSubSubPojo.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummySubSubPojo.java
index 8e027f5d6..d2e55f462 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/TestSubSubPojo.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/event/testpojos/DummySubSubPojo.java
@@ -23,7 +23,7 @@ package org.onap.policy.apex.service.engine.event.testpojos;
 /**
  * A test Pojo for pojo decoding and encoding in Apex.
  */
-public class TestSubSubPojo {
+public class DummySubSubPojo {
     private int anInt;
     private Integer anInteger;
     private String someString;
diff --git a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/TestApexCommandLineArguments.java b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/ApexCommandLineArgumentsTest.java
index c26e4fcb7..40375b1f6 100644
--- a/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/TestApexCommandLineArguments.java
+++ b/services/services-engine/src/test/java/org/onap/policy/apex/service/engine/main/ApexCommandLineArgumentsTest.java
@@ -33,7 +33,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestApexCommandLineArguments {
+public class ApexCommandLineArgumentsTest {
     @After
     public void clearRelativeFileRoot() {
         System.clearProperty("APEX_RELATIVE_FILE_ROOT");
diff --git a/services/services-engine/src/test/resources/policymodels/PojoEventModel.apex b/services/services-engine/src/test/resources/policymodels/PojoEventModel.apex
index b7153a317..b62875f5c 100644
--- a/services/services-engine/src/test/resources/policymodels/PojoEventModel.apex
+++ b/services/services-engine/src/test/resources/policymodels/PojoEventModel.apex
@@ -1,7 +1,7 @@
 model create name=PojoEventModel version=0.0.1
 
-schema create name=TestPojoType version=0.0.1 flavour=Java schema=org.onap.policy.apex.service.engine.event.testpojos.TestPojo
-schema create name=TestPojoListType version=0.0.1 flavour=Java schema=org.onap.policy.apex.service.engine.event.testpojos.TestPojoList
+schema create name=TestPojoType version=0.0.1 flavour=Java schema=org.onap.policy.apex.service.engine.event.testpojos.DummyPojo
+schema create name=TestPojoListType version=0.0.1 flavour=Java schema=org.onap.policy.apex.service.engine.event.testpojos.DummyPojoList
 
 event create name=PojoEvent version=0.0.1 nameSpace=org.onap.policy.apex.service.engine.event.testpojos source=Outside target=Apex
 
diff --git a/services/services-engine/src/test/resources/policymodels/PojoEventModel.json b/services/services-engine/src/test/resources/policymodels/PojoEventModel.json
index 3bd04a375..59ff76ebb 100644
--- a/services/services-engine/src/test/resources/policymodels/PojoEventModel.json
+++ b/services/services-engine/src/test/resources/policymodels/PojoEventModel.json
@@ -343,7 +343,7 @@
                      "version" : "0.0.1"
                   },
                   "schemaFlavour" : "Java",
-                  "schemaDefinition" : "org.onap.policy.apex.service.engine.event.testpojos.TestPojoList"
+                  "schemaDefinition" : "org.onap.policy.apex.service.engine.event.testpojos.DummyPojoList"
                }
             }, {
                "key" : {
@@ -356,7 +356,7 @@
                      "version" : "0.0.1"
                   },
                   "schemaFlavour" : "Java",
-                  "schemaDefinition" : "org.onap.policy.apex.service.engine.event.testpojos.TestPojo"
+                  "schemaDefinition" : "org.onap.policy.apex.service.engine.event.testpojos.DummyPojo"
                }
             } ]
          }