diff options
author | Jorge Hernandez <jh1730@att.com> | 2018-09-14 13:19:52 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-09-14 13:19:52 +0000 |
commit | ec351d2ee36a37af78476feaff401fac47afe524 (patch) | |
tree | ba9de9c01422f471c18120e5e5be618597f3d706 /model/policy-model/src/test | |
parent | 330836ad1aa9c88dd3c308fcd750ccd1aaf3e4b9 (diff) | |
parent | cd68fc9bae7d6258f77ff59c1431e4f925f61a4c (diff) |
Merge "Address sonar/Checkstyle Issues"
Diffstat (limited to 'model/policy-model/src/test')
-rw-r--r-- | model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java | 8 | ||||
-rw-r--r-- | model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic (renamed from model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParent_LogicParentLocalName_LogicInstanceName.funkylogic) | 0 |
2 files changed, 4 insertions, 4 deletions
diff --git a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java index bb16c90d1..528898d30 100644 --- a/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java +++ b/model/policy-model/src/test/java/org/onap/policy/apex/model/policymodel/handling/TestPolicyLogicReader.java @@ -63,7 +63,7 @@ public class TestPolicyLogicReader { fail("test should throw an exception here"); } catch (final Exception e) { assertEquals("logic not found for logic " - + "\"somewhere/over/the/rainbow/funkylogic/LogicParent_LogicInstanceName.funkylogic\"", + + "\"somewhere/over/the/rainbow/funkylogic/LogicParentLogicInstanceName.funkylogic\"", e.getMessage()); } @@ -73,7 +73,7 @@ public class TestPolicyLogicReader { fail("test should throw an exception here"); } catch (final Exception e) { assertEquals("logic not found for logic " + "\"somewhere/over/the/rainbow/funkylogic/" - + "LogicParent_LogicParentLocalName_LogicInstanceName.funkylogic\"", e.getMessage()); + + "LogicParentLogicParentLocalNameLogicInstanceName.funkylogic\"", e.getMessage()); } plReader.setLogicPackage("path.to.apex.logic"); @@ -97,7 +97,7 @@ public class TestPolicyLogicReader { plReader.setDefaultLogic(null); try { final AxLogic logic = new AxLogic(logicKey, "JAVA", plReader); - assertEquals("somewhere.over.the.rainbow.java.LogicParent_LogicParentLocalName_LogicInstanceName", + assertEquals("somewhere.over.the.rainbow.java.LogicParentLogicParentLocalNameLogicInstanceName", logic.getLogic()); } catch (final Exception e) { fail("test should not throw an exception"); @@ -106,7 +106,7 @@ public class TestPolicyLogicReader { logicKey.setParentLocalName(AxKey.NULL_KEY_NAME); try { final AxLogic logic = new AxLogic(logicKey, "JAVA", plReader); - assertEquals("somewhere.over.the.rainbow.java.LogicParent_LogicInstanceName", logic.getLogic()); + assertEquals("somewhere.over.the.rainbow.java.LogicParentLogicInstanceName", logic.getLogic()); } catch (final Exception e) { fail("test should not throw an exception"); } diff --git a/model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParent_LogicParentLocalName_LogicInstanceName.funkylogic b/model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic index 7ccf3da88..7ccf3da88 100644 --- a/model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParent_LogicParentLocalName_LogicInstanceName.funkylogic +++ b/model/policy-model/src/test/resources/path/to/apex/logic/funkylogic/LogicParentLogicParentLocalNameLogicInstanceName.funkylogic |