diff options
Diffstat (limited to 'model/event-model/src')
4 files changed, 20 insertions, 20 deletions
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEvents.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEvents.java index 5456dfad8..309359fa2 100644 --- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEvents.java +++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEvents.java @@ -60,8 +60,8 @@ public class TestEvents { final AxArtifactKey eventKey = new AxArtifactKey("EventName", "0.0.1"); event.setKey(eventKey); - assertEquals("EventName:0.0.1", event.getKey().getID()); - assertEquals("EventName:0.0.1", event.getKeys().get(0).getID()); + assertEquals("EventName:0.0.1", event.getKey().getId()); + assertEquals("EventName:0.0.1", event.getKeys().get(0).getId()); event.setNameSpace("namespace"); assertEquals("namespace", event.getNameSpace()); @@ -86,13 +86,13 @@ public class TestEvents { final AxArtifactKey newEventKey = new AxArtifactKey("NewEventName", "0.0.1"); event.setKey(newEventKey); - assertEquals("NewEventName:0.0.1", event.getKey().getID()); - assertEquals("NewEventName:0.0.1", event.getKeys().get(0).getID()); + assertEquals("NewEventName:0.0.1", event.getKey().getId()); + assertEquals("NewEventName:0.0.1", event.getKeys().get(0).getId()); assertEquals("NewEventName:0.0.1", - event.getParameterMap().get("Field0").getKey().getParentArtifactKey().getID()); + event.getParameterMap().get("Field0").getKey().getParentArtifactKey().getId()); event.setKey(eventKey); - assertEquals("EventName:0.0.1", event.getKey().getID()); - assertEquals("EventName:0.0.1", event.getKeys().get(0).getID()); + assertEquals("EventName:0.0.1", event.getKey().getId()); + assertEquals("EventName:0.0.1", event.getKeys().get(0).getId()); assertTrue("Field0", event.getFields().contains(eventField)); assertTrue(event.hasFields(new TreeSet<AxField>(parameterMap.values()))); @@ -223,7 +223,7 @@ public class TestEvents { // Invalid, no events in event map events.setKey(new AxArtifactKey("EventsKey", "0.0.1")); - assertEquals("EventsKey:0.0.1", events.getKey().getID()); + assertEquals("EventsKey:0.0.1", events.getKey().getId()); result = new AxValidationResult(); result = events.validate(result); diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestField.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestField.java index 11b8b745e..8d2e8a686 100644 --- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestField.java +++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestField.java @@ -68,12 +68,12 @@ public class TestField { final AxReferenceKey fieldKey = new AxReferenceKey("FieldName", "0.0.1", "PLN", "LN"); field.setKey(fieldKey); - assertEquals("FieldName:0.0.1:PLN:LN", field.getKey().getID()); - assertEquals("FieldName:0.0.1:PLN:LN", field.getKeys().get(0).getID()); + assertEquals("FieldName:0.0.1:PLN:LN", field.getKey().getId()); + assertEquals("FieldName:0.0.1:PLN:LN", field.getKeys().get(0).getId()); final AxArtifactKey schemaKey = new AxArtifactKey("SchemaName", "0.0.1"); field.setSchema(schemaKey); - assertEquals("SchemaName:0.0.1", field.getSchema().getID()); + assertEquals("SchemaName:0.0.1", field.getSchema().getId()); assertEquals(false, field.getOptional()); field.setOptional(true); diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModel.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModel.java index ee2638a54..abb3a3480 100644 --- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModel.java +++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModel.java @@ -30,7 +30,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult; -import org.onap.policy.apex.model.basicmodel.dao.DAOParameters; +import org.onap.policy.apex.model.basicmodel.dao.DaoParameters; import org.onap.policy.apex.model.basicmodel.test.TestApexModel; import org.onap.policy.apex.model.eventmodel.concepts.AxEventModel; @@ -84,21 +84,21 @@ public class TestApexEventModel { @Test public void testModelWriteReadXML() throws Exception { - testApexModel.testApexModelWriteReadXML(); + testApexModel.testApexModelWriteReadXml(); } @Test public void testModelWriteReadJSON() throws Exception { - testApexModel.testApexModelWriteReadJSON(); + testApexModel.testApexModelWriteReadJson(); } @Test public void testModelWriteReadJPA() throws Exception { - final DAOParameters daoParameters = new DAOParameters(); - daoParameters.setPluginClass("org.onap.policy.apex.model.basicmodel.dao.impl.DefaultApexDao"); - daoParameters.setPersistenceUnit("DAOTest"); + final DaoParameters DaoParameters = new DaoParameters(); + DaoParameters.setPluginClass("org.onap.policy.apex.model.basicmodel.dao.impl.DefaultApexDao"); + DaoParameters.setPersistenceUnit("DAOTest"); - testApexModel.testApexModelWriteReadJPA(daoParameters); + testApexModel.testApexModelWriteReadJpa(DaoParameters); } private static final String VALID_MODEL_STRING = "***validation of model successful***"; diff --git a/model/event-model/src/test/resources/META-INF/persistence.xml b/model/event-model/src/test/resources/META-INF/persistence.xml index db32612ab..9e61cbd73 100644 --- a/model/event-model/src/test/resources/META-INF/persistence.xml +++ b/model/event-model/src/test/resources/META-INF/persistence.xml @@ -23,8 +23,8 @@ <persistence-unit name="DAOTest" transaction-type="RESOURCE_LOCAL"> <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> - <class>org.onap.policy.apex.model.basicmodel.dao.converters.CDATAConditioner</class> - <class>org.onap.policy.apex.model.basicmodel.dao.converters.UUID2String</class> + <class>org.onap.policy.apex.model.basicmodel.dao.converters.CDataConditioner</class> + <class>org.onap.policy.apex.model.basicmodel.dao.converters.Uuid2String</class> <class>org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey</class> <class>org.onap.policy.apex.model.basicmodel.concepts.AxConcept</class> <class>org.onap.policy.apex.model.basicmodel.concepts.AxKeyInfo</class> |