summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2018-12-21 17:26:57 +0000
committerGerrit Code Review <gerrit@onap.org>2018-12-21 17:26:57 +0000
commita3322831cd5efec598613e8335931944db222e9f (patch)
tree1d6feb90f56cf92df7609174cdbddca85854d493 /model
parent89817bf276d95091098dbd7ae9cb357ea4a38836 (diff)
parent4e3bb539cd8a678d8ea1e861c0cf04d472d50d9d (diff)
Merge "Rename test classes in apex-pdp/model,core"
Diffstat (limited to 'model')
-rw-r--r--model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java2
-rw-r--r--model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/DummyTestApexEngineModelCreator.java (renamed from model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/TestApexEngineModelCreator.java)2
-rw-r--r--model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java2
-rw-r--r--model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/DummyTestApexEventModelCreator.java (renamed from model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModelCreator.java)2
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexApiResultTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApiResult.java)2
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextAlbumTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiContextAlbum.java)2
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiContextSchemaTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiContextSchema.java)2
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiEventTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiEvent.java)2
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiKeyInfoTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiKeyInfo.java)2
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiPolicyTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiPolicy.java)2
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexEditorApiTaskTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexEditorApiTask.java)2
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ApexModelApiTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestApexModelApi.java)2
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelFacadeTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestModelFacade.java)2
-rw-r--r--model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/ModelHandlerFacadeTest.java (renamed from model/model-api/src/test/java/org/onap/policy/apex/model/modelapi/TestModelHandlerFacade.java)2
-rw-r--r--model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/SupportPolicyModelValidator.java (renamed from model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/utils/PolicyModelValidator.java)2
15 files changed, 15 insertions, 15 deletions
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