Rename test classes in apex-pdp/model,core
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: I6cb8d09799d7abd1b50ead1edbc4986649ad4ba7
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
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
similarity index 94%
rename from core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/TestMessageListener.java
rename to core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/SupportMessageListenerTester.java
index 8bb1c7e..3ee6a4b 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 @@
/**
* 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 2a80cf0..6d35adc 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 @@
}
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 @@
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 @@
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
similarity index 95%
rename from core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/BadListener.java
rename to core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyEnEventListener.java
index b829437..e67d256 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 @@
* 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
similarity index 96%
rename from core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/SlowListener.java
rename to core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummySlowEnEventListener.java
index f3f8859..fbb38c9 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 @@
* 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
similarity index 95%
rename from core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/TestMessageListener.java
rename to core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/DummyMessageListener.java
index 9e7562b..4d5aedb 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 @@
* 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
similarity index 98%
rename from core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/MessageTest.java
rename to core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/SupportMessageTester.java
index a9c86d6..233a1c2 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 @@
/**
* 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 32c4ff3..d0b8f3e 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 @@
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
similarity index 98%
rename from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/TestApexEngineModelCreator.java
rename to model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java
index 732fd22..fa79f89 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.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 aaed3cd..88736d1 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 @@
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
similarity index 99%
rename from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModelCreator.java
rename to model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java
index 039d230..11685a6 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.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
similarity index 98%
rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApiResult.java
rename to model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java
index e2717e5..43a9fa4 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 @@
* 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
similarity index 99%
rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiContextAlbum.java
rename to model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java
index f1b8fc8..0d442e9 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 @@
* 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
similarity index 99%
rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiContextSchema.java
rename to model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java
index 25ab6df..9f29720 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 @@
* 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
similarity index 99%
rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiEvent.java
rename to model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java
index b25c52c..6bb85a6 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 @@
* 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
similarity index 98%
rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiKeyInfo.java
rename to model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java
index 9dae132..3635abb 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 @@
* 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
similarity index 99%
rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiPolicy.java
rename to model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java
index 9295ffa..4c54b20 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 @@
* 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
similarity index 99%
rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiTask.java
rename to model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java
index 9faa365..0500255 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 @@
* 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
similarity index 99%
rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexModelApi.java
rename to model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java
index 9e2e1ce..462b1cd 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 @@
* 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
similarity index 98%
rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestModelFacade.java
rename to model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java
index 2c937e1..d5b8456 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 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
similarity index 98%
rename from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestModelHandlerFacade.java
rename to model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java
index 22ecaf6..9bbba1d 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 @@
* 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
similarity index 97%
rename from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/PolicyModelValidator.java
rename to model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java
index 9cee854..1c0d933 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 @@
/**
* Main class to run the policy model validator.
*/
-public class PolicyModelValidator {
+public class SupportPolicyModelValidator {
/**
* Main method.
* @param args the command line arguments