From 82e81ac60d97b93847a26accc071e7043d831ab0 Mon Sep 17 00:00:00 2001 From: Michael Mokry Date: Mon, 11 Dec 2017 10:07:43 -0600 Subject: Adding SONAR fixes for - pushPolicy defect fixes for POLICY-486 - Common Policy Validation feature for POLIYC-449 Change-Id: I8d54aa5a9b819c6eb4427dfa47c4ce963a21c2e0 Issue-ID: POLICY-449,POLICY-486 Signed-off-by: Michael Mokry --- .../org/onap/policy/pap/xacml/rest/components/ActionPolicyTest.java | 3 +-- .../org/onap/policy/pap/xacml/rest/components/DecisionPolicyTest.java | 3 +-- .../policy/pap/xacml/rest/components/FirewallConfigPolicyTest.java | 3 +-- ONAP-PAP-REST/src/test/resources/xacml.pap.properties | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) (limited to 'ONAP-PAP-REST/src/test') 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)); diff --git a/ONAP-PAP-REST/src/test/resources/xacml.pap.properties b/ONAP-PAP-REST/src/test/resources/xacml.pap.properties index f886435bf..c523d39ab 100644 --- a/ONAP-PAP-REST/src/test/resources/xacml.pap.properties +++ b/ONAP-PAP-REST/src/test/resources/xacml.pap.properties @@ -71,7 +71,7 @@ xacml.rest.config.webapps=src/test/resources/webapps/ #xacml.rest.pap.run.audit.flag=true #Turn the audit off to not synchronize the DB/file system #xacml.rest.pap.run.audit.flag=false -xacml.rest.pap.run.audit.flag=true +xacml.rest.pap.run.audit.flag=false #Audit will synchronize the file system to match the contents of the DB #xacml.rest.pap.filesystem.audit=true -- cgit 1.2.3-korg