diff options
author | 2018-09-04 17:24:15 +0100 | |
---|---|---|
committer | 2018-09-04 17:25:22 +0100 | |
commit | 87be30582d1db37bee7c6b456c0c5c3ca9584963 (patch) | |
tree | 28806c5866fc5d07c89a06014d7c7d2705772b4f /model/model-api/src/test/java/org/onap | |
parent | f32508381ce0b555fc14978cbaa458aa4e2d91c5 (diff) |
Fix checkstyle issues in apex model basic
CHeckstyle issues in apex model basic and knock on changes
in other apex modules.
Issue-ID: POLICY-1034
Change-Id: I65823f5e2e344526abc74b0812877113acb056ec
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Diffstat (limited to 'model/model-api/src/test/java/org/onap')
2 files changed, 13 insertions, 13 deletions
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/TestApexModelAPI.java index 68341249c..c3521d307 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/TestApexModelAPI.java @@ -35,7 +35,7 @@ import java.util.UUID; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.policy.apex.model.basicmodel.dao.DAOParameters; +import org.onap.policy.apex.model.basicmodel.dao.DaoParameters; import org.onap.policy.apex.model.modelapi.impl.ApexModelImpl; import org.onap.policy.apex.model.utilities.TextFileUtils; @@ -114,29 +114,29 @@ public class TestApexModelAPI { ApexAPIResult result = apexModel.loadFromFile("src/test/resources/models/PolicyModel.json"); assertTrue(result.getResult().equals(ApexAPIResult.RESULT.SUCCESS)); - 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"); - result = apexModel.saveToDatabase(daoParameters); + result = apexModel.saveToDatabase(DaoParameters); assertTrue(result.getResult().equals(ApexAPIResult.RESULT.SUCCESS)); result = apexModel.deleteModel(); assertTrue(result.getResult().equals(ApexAPIResult.RESULT.SUCCESS)); - result = apexModel.loadFromDatabase("PolicyModel", "0.0.1", daoParameters); + result = apexModel.loadFromDatabase("PolicyModel", "0.0.1", DaoParameters); assertTrue(result.getResult().equals(ApexAPIResult.RESULT.SUCCESS)); result = apexModel.deleteModel(); assertTrue(result.getResult().equals(ApexAPIResult.RESULT.SUCCESS)); - result = apexModel.loadFromDatabase("PolicyModel", null, daoParameters); + result = apexModel.loadFromDatabase("PolicyModel", null, DaoParameters); assertTrue(result.getResult().equals(ApexAPIResult.RESULT.SUCCESS)); result = apexModel.deleteModel(); assertTrue(result.getResult().equals(ApexAPIResult.RESULT.SUCCESS)); - result = apexModel.loadFromDatabase("VPNPolicyModel", "0.0.1", daoParameters); + result = apexModel.loadFromDatabase("VPNPolicyModel", "0.0.1", DaoParameters); assertTrue(result.getResult().equals(ApexAPIResult.RESULT.FAILED)); } 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/TestModelHandlerFacade.java index f13b8dfd5..7439cd328 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/TestModelHandlerFacade.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.util.Properties; import org.junit.Test; -import org.onap.policy.apex.model.basicmodel.dao.DAOParameters; +import org.onap.policy.apex.model.basicmodel.dao.DaoParameters; import org.onap.policy.apex.model.modelapi.impl.ModelHandlerFacade; import org.onap.policy.apex.model.utilities.TextFileUtils; @@ -77,17 +77,17 @@ public class TestModelHandlerFacade { result = mhf.loadFromString(modelString); assertEquals(ApexAPIResult.RESULT.CONCEPT_EXISTS, result.getResult()); - final DAOParameters daoParameters = new DAOParameters(); - result = mhf.loadFromDatabase("SomeModel", null, daoParameters); + final DaoParameters DaoParameters = new DaoParameters(); + result = mhf.loadFromDatabase("SomeModel", null, DaoParameters); assertEquals(ApexAPIResult.RESULT.CONCEPT_EXISTS, result.getResult()); result = apexModel.deleteModel(); assertEquals(ApexAPIResult.RESULT.SUCCESS, result.getResult()); - result = mhf.loadFromDatabase("SomeModel", null, daoParameters); + result = mhf.loadFromDatabase("SomeModel", null, DaoParameters); assertEquals(ApexAPIResult.RESULT.FAILED, result.getResult()); - result = mhf.saveToDatabase(daoParameters); + result = mhf.saveToDatabase(DaoParameters); assertEquals(ApexAPIResult.RESULT.FAILED, result.getResult()); result = mhf.readFromURL("blah://somewhere/over/the/rainbow"); |