diff options
author | Pamela Dragosh <pdragosh@research.att.com> | 2018-01-03 16:35:39 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-01-03 16:35:39 +0000 |
commit | 84dfe2ecbdb18041ddfc49ac0beeb650238ff37c (patch) | |
tree | 233e2676cb42534976fe7eefda8ced6aeb563cad /ONAP-PAP-REST/src/test/java | |
parent | 85e767c65b23a1fef35e5a0199a57bf755070815 (diff) | |
parent | 82e81ac60d97b93847a26accc071e7043d831ab0 (diff) |
Merge "Adding SONAR fixes for"
Diffstat (limited to 'ONAP-PAP-REST/src/test/java')
3 files changed, 3 insertions, 6 deletions
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/ActionPolicyTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/ActionPolicyTest.java index b93cca36d..55879ca53 100644 --- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/ActionPolicyTest.java +++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/ActionPolicyTest.java @@ -69,8 +69,7 @@ public class ActionPolicyTest { policyAdapter.setRuleCombiningAlgId("urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides"); policyAdapter.setPolicyType("Action"); policyAdapter.setEditPolicy(false); - policyAdapter.setDomainDir("src/test/resources/client.properties"); - policyAdapter.setDomain("Test"); + policyAdapter.setDomainDir("Test"); policyAdapter.setNewFileName("Test.Action_junitTest.1.xml"); policyAdapter.setHighestVersion(1); policyAdapter.setPolicyID("urn:xacml:policy:id:"+UUID.randomUUID()); diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicyTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicyTest.java index 3854ab984..caa5707cc 100644 --- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicyTest.java +++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/DecisionPolicyTest.java @@ -72,8 +72,7 @@ public class DecisionPolicyTest { policyAdapter.setRuleCombiningAlgId("urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides"); policyAdapter.setPolicyType("Decision"); policyAdapter.setEditPolicy(false); - policyAdapter.setDomainDir("src/test/resources/client.properties"); - policyAdapter.setDomain("Test"); + policyAdapter.setDomainDir("Test"); policyAdapter.setNewFileName("/src/test/resources/Test/client.properties"); policyAdapter.setHighestVersion(1); policyAdapter.setPolicyID("urn:xacml:policy:id:"+UUID.randomUUID()); diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/FirewallConfigPolicyTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/FirewallConfigPolicyTest.java index 99285e77f..a2c6ddf4e 100644 --- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/FirewallConfigPolicyTest.java +++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/FirewallConfigPolicyTest.java @@ -63,8 +63,7 @@ public class FirewallConfigPolicyTest { policyAdapter.setPolicyType("Config"); policyAdapter.setConfigPolicyType("Firewall Config"); policyAdapter.setEditPolicy(false); - policyAdapter.setDomainDir("src/test/resources/client.properties"); - policyAdapter.setDomain("Test"); + policyAdapter.setDomainDir("Test"); policyAdapter.setNewFileName("Test.Config_FW_junitTest.1.xml"); policyAdapter.setHighestVersion(1); policyAdapter.setVersion(String.valueOf(1)); |