From d089848fdb0beef8446bdcf60cdb14e4655a93e5 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Tue, 12 Nov 2019 14:48:30 -0500 Subject: Format ONAP-XACML and add JUnit Formatting and sonar issues. Cleaned up JUnit tests. Added more JUnit test coverage. Issue-ID: POLICY-2242 Change-Id: Ife0921971c6eb97de2a64b2f303cd16f992b4bd3 Signed-off-by: Pamela Dragosh --- .../xacml/test/api/XACMLErrorConstantsTest.java | 11 +- .../xacml/test/std/pap/StdEngineFactoryTest.java | 12 +- .../policy/xacml/test/std/pap/StdEngineTest.java | 63 +- .../xacml/test/std/pap/StdPAPPolicyTest.java | 980 +++++---------------- .../xacml/test/std/pap/StdPDPGroupStatusTest.java | 23 +- .../policy/xacml/test/std/pap/StdPDPGroupTest.java | 6 +- .../xacml/test/std/pap/StdPDPPIPConfigTest.java | 16 +- .../xacml/test/std/pap/StdPDPPolicyTest.java | 17 +- .../xacml/test/std/pap/StdPDPStatusTest.java | 148 ++-- .../onap/policy/xacml/test/std/pap/StdPDPTest.java | 19 +- .../pip/engines/OperationHistoryEngineTest.java | 11 +- .../onap/policy/xacml/test/util/AAFEngineTest.java | 18 +- .../policy/xacml/test/util/MetricsUtilTest.java | 4 +- .../xacml/test/util/XACMLPolicyScannerTest.java | 180 +++- .../xacml/test/util/XACMLPolicyWriterTest.java | 22 +- 15 files changed, 575 insertions(+), 955 deletions(-) (limited to 'ONAP-XACML/src/test/java/org') diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/api/XACMLErrorConstantsTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/api/XACMLErrorConstantsTest.java index 0166a128a..3f9c99bcd 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/api/XACMLErrorConstantsTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/api/XACMLErrorConstantsTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -23,18 +23,19 @@ package org.onap.policy.xacml.test.api; import static org.junit.Assert.assertTrue; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; + import org.junit.Test; import org.onap.policy.xacml.api.XACMLErrorConstants; public class XACMLErrorConstantsTest { @Test - public void testConstructorIsPrivate1() throws NoSuchMethodException, IllegalAccessException, - InvocationTargetException, InstantiationException { - Constructor constructor = - XACMLErrorConstants.class.getDeclaredConstructor(); + public void testConstructorIsPrivate1() + throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { + Constructor constructor = XACMLErrorConstants.class.getDeclaredConstructor(); assertTrue(Modifier.isPrivate(constructor.getModifiers())); constructor.setAccessible(true); constructor.newInstance(); diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java index 6ab9790c1..43d019d6d 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -19,17 +19,21 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.policy.xacml.test.std.pap; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; + +import com.att.research.xacml.api.pap.PAPException; +import com.att.research.xacml.std.pap.StdEngine; +import com.att.research.xacml.util.FactoryException; + import java.io.IOException; import java.util.Properties; + import org.junit.Test; import org.onap.policy.xacml.std.pap.StdEngineFactory; -import com.att.research.xacml.api.pap.PAPException; -import com.att.research.xacml.std.pap.StdEngine; -import com.att.research.xacml.util.FactoryException; public class StdEngineFactoryTest { @Test diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineTest.java index 79b43b130..b57a6be78 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -19,12 +19,17 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.policy.xacml.test.std.pap; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; + +import com.att.research.xacml.api.pap.PAPException; +import com.att.research.xacml.api.pap.PDPPolicy; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -35,6 +40,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import java.util.Properties; + import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; @@ -46,8 +52,6 @@ import org.onap.policy.xacml.api.pap.OnapPDP; import org.onap.policy.xacml.api.pap.OnapPDPGroup; import org.onap.policy.xacml.std.pap.StdEngine; import org.onap.policy.xacml.std.pap.StdPDPGroup; -import com.att.research.xacml.api.pap.PAPException; -import com.att.research.xacml.api.pap.PDPPolicy; public class StdEngineTest { @@ -63,8 +67,7 @@ public class StdEngineTest { new File("target/test/resources/pdps").mkdirs(); new File("target/test/resources/emptyPapGroupsDefault").mkdirs(); Files.copy(Paths.get("src/test/resources/pdps/xacml.properties"), - Paths.get("target/test/resources/pdps/xacml.properties"), - StandardCopyOption.REPLACE_EXISTING); + Paths.get("target/test/resources/pdps/xacml.properties"), StandardCopyOption.REPLACE_EXISTING); Files.copy(Paths.get("src/test/resources/emptyPapGroupsDefault/xacml.properties"), Paths.get("target/test/resources/emptyPapGroupsDefault/xacml.properties"), StandardCopyOption.REPLACE_EXISTING); @@ -114,10 +117,8 @@ public class StdEngineTest { repository = Paths.get("target/test/resources/nonExisting"); new StdEngine(repository); - assertTrue(Files.exists( - Paths.get("target/test/resources/nonExisting/default/xacml.pip.properties"))); - assertTrue(Files.exists( - Paths.get("target/test/resources/nonExisting/default/xacml.policy.properties"))); + assertTrue(Files.exists(Paths.get("target/test/resources/nonExisting/default/xacml.pip.properties"))); + assertTrue(Files.exists(Paths.get("target/test/resources/nonExisting/default/xacml.policy.properties"))); assertTrue(Files.exists(Paths.get("target/test/resources/nonExisting/xacml.properties"))); FileUtils.deleteDirectory(repository.toFile()); } @@ -128,17 +129,14 @@ public class StdEngineTest { repository = Paths.get("target/test/resources/emptyPapGroupsDefault"); new StdEngine(repository); - assertTrue(Files.exists(Paths - .get("target/test/resources/emptyPapGroupsDefault/default/xacml.pip.properties"))); - assertTrue(Files.exists(Paths.get( - "target/test/resources/emptyPapGroupsDefault/default/xacml.policy.properties"))); - assertTrue(Files - .exists(Paths.get("target/test/resources/emptyPapGroupsDefault/xacml.properties"))); + assertTrue(Files.exists(Paths.get("target/test/resources/emptyPapGroupsDefault/default/xacml.pip.properties"))); + assertTrue( + Files.exists(Paths.get("target/test/resources/emptyPapGroupsDefault/default/xacml.policy.properties"))); + assertTrue(Files.exists(Paths.get("target/test/resources/emptyPapGroupsDefault/xacml.properties"))); } @Test - public void testNewGroupAndRemoveGroup() - throws NullPointerException, PAPException, IOException { + public void testNewGroupAndRemoveGroup() throws NullPointerException, PAPException, IOException { OnapPDPGroup newGroup = createGroup("newGroup", "Description of new group"); assertNotNull(newGroup); @@ -270,8 +268,7 @@ public class StdEngineTest { assertEquals(0, group2.getPdps().size()); expectedException.expect(NullPointerException.class); - expectedException.expectMessage( - "Group targeted for deletion has PDPs, you must provide a new group for them."); + expectedException.expectMessage("Group targeted for deletion has PDPs, you must provide a new group for them."); stdEngine.removeGroup(group1, null); } @@ -285,17 +282,15 @@ public class StdEngineTest { assertNull(stdEngine.getGroup("newGroup")); assertNotNull(stdEngine.getGroup("AnUpdatedName")); assertEquals("AnUpdatedName", stdEngine.getGroup("AnUpdatedName").getName()); - assertEquals("Description of new group", - stdEngine.getGroup("AnUpdatedName").getDescription()); + assertEquals("Description of new group", stdEngine.getGroup("AnUpdatedName").getDescription()); } @Test - public void testUpdateGroupDescription() - throws NullPointerException, PAPException, IOException { + public void testUpdateGroupDescription() throws NullPointerException, PAPException, IOException { OnapPDPGroup newGroup = createGroup("newGroup", "Description of new group"); - OnapPDPGroup updatedGroup = new StdPDPGroup(newGroup.getId(), newGroup.getName(), - "An updated description", Paths.get("target/test/resources/pdps/newGroup")); + OnapPDPGroup updatedGroup = new StdPDPGroup(newGroup.getId(), newGroup.getName(), "An updated description", + Paths.get("target/test/resources/pdps/newGroup")); updatedGroup.setDescription("An updated description"); stdEngine.updateGroup(updatedGroup); assertEquals("newGroup", stdEngine.getGroup("newGroup").getName()); @@ -326,8 +321,7 @@ public class StdEngineTest { } @Test - public void testUpdateGroupNameEmptyString() - throws NullPointerException, PAPException, IOException { + public void testUpdateGroupNameEmptyString() throws NullPointerException, PAPException, IOException { StdPDPGroup group = new StdPDPGroup("groupId", "", "description", null); expectedException.expect(PAPException.class); expectedException.expectMessage("New name for group cannot be null or blank"); @@ -343,8 +337,7 @@ public class StdEngineTest { } @Test - public void testPublishAndRemovePolicy() - throws NullPointerException, PAPException, FileNotFoundException { + public void testPublishAndRemovePolicy() throws NullPointerException, PAPException, FileNotFoundException { OnapPDPGroup newGroup = createGroup("newGroup", "Description of new group"); InputStream inputStream = new FileInputStream( "src/test/resources/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml"); @@ -358,15 +351,13 @@ public class StdEngineTest { } @Test - public void testPublishPolicyNull() - throws NullPointerException, PAPException, FileNotFoundException { + public void testPublishPolicyNull() throws NullPointerException, PAPException, FileNotFoundException { expectedException.expect(NullPointerException.class); stdEngine.publishPolicy(null, null, true, null, null); } @Test - public void testPublishPolicyUnknownGroup() - throws NullPointerException, PAPException, FileNotFoundException { + public void testPublishPolicyUnknownGroup() throws NullPointerException, PAPException, FileNotFoundException { OnapPDPGroup unknownGroup = new StdPDPGroup("unknownId", null); expectedException.expect(PAPException.class); @@ -375,15 +366,13 @@ public class StdEngineTest { } @Test - public void testRemovePolicyNull() - throws NullPointerException, PAPException, FileNotFoundException { + public void testRemovePolicyNull() throws NullPointerException, PAPException, FileNotFoundException { expectedException.expect(NullPointerException.class); stdEngine.removePolicy(null, null); } @Test - public void testRemovePolicyUnknownGroup() - throws NullPointerException, PAPException, FileNotFoundException { + public void testRemovePolicyUnknownGroup() throws NullPointerException, PAPException, FileNotFoundException { OnapPDPGroup unknownGroup = new StdPDPGroup("unknownId", null); expectedException.expect(PAPException.class); diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPAPPolicyTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPAPPolicyTest.java index d5146d05a..3c32cb24f 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPAPPolicyTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPAPPolicyTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,14 +18,15 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.policy.xacml.test.std.pap; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.net.URI; import java.net.URISyntaxException; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -47,556 +48,146 @@ public class StdPAPPolicyTest { @Before public void setUp() { - - Paths.get("src/test/resources/pdps"); - try { - stdPAPPolicy = new StdPAPPolicy(); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetActionAttribute() { - try { - stdPAPPolicy.setActionAttribute("test"); - assertTrue(stdPAPPolicy.getActionAttribute() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetActionBody() { - try { - stdPAPPolicy.setActionBody("actionBody"); - assertTrue(stdPAPPolicy.getActionBody() != null); - } catch (Exception e) { - logger.info(e); - } - - } - - @Test - public void testGetActionDictHeader() { - try { - stdPAPPolicy.setActionDictHeader("actionDictHeader"); - assertTrue(stdPAPPolicy.getActionDictHeader() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetActionDictMethod() { - try { - stdPAPPolicy.setActionDictMethod("actionDictMethod"); - assertTrue(stdPAPPolicy.getActionDictMethod() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetActionDictType() { - try { - stdPAPPolicy.setActionDictType("actionDictType"); - assertTrue(stdPAPPolicy.getActionDictType() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetActionDictUrl() { - try { - stdPAPPolicy.setActionDictUrl("actionDictUrl"); - assertTrue(stdPAPPolicy.getActionDictUrl() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetActionPerformer() { - try { - stdPAPPolicy.setActionPerformer("actionPerformer"); - assertTrue(stdPAPPolicy.getActionPerformer() != null); - } catch (Exception e) { - logger.info(e); - } - - } - - @Test - public void testGetBrmsController() { - try { - stdPAPPolicy.setBrmsController("brmsController"); - assertTrue(stdPAPPolicy.getBrmsController() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetBrmsDependency() { - try { - stdPAPPolicy.setBrmsDependency(new ArrayList<>()); - assertTrue(stdPAPPolicy.getBrmsDependency() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetConfigBodyData() { - try { - stdPAPPolicy.setConfigBodyData("configBodyData"); - assertTrue(stdPAPPolicy.getConfigBodyData() != null); - } catch (Exception e) { - logger.info(e); - } - } - - - @Test - public void testGetConfigName() { - try { - stdPAPPolicy.setConfigName("configName"); - assertTrue(stdPAPPolicy.getConfigName() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetConfigPolicyType() { - try { - stdPAPPolicy.setConfigPolicyType("configPolicyType"); - assertTrue(stdPAPPolicy.getConfigPolicyType() != null); - } catch (Exception e) { - logger.info(e); - } - - } - - @Test - public void testGetConfigType() { - try { - stdPAPPolicy.setConfigType("configType"); - assertTrue(stdPAPPolicy.getConfigType() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetDataTypeList() { - try { - stdPAPPolicy.setDataTypeList(new ArrayList()); - assertTrue(stdPAPPolicy.getDataTypeList() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetDeleteCondition() { - try { - stdPAPPolicy.setDeleteCondition("deleteCondition"); - assertTrue(stdPAPPolicy.getDeleteCondition() != null); - } catch (Exception e) { - logger.info(e); - } - } - - - @Test - public void testGetDrlRuleAndUIParams() { - try { - stdPAPPolicy.setDrlRuleAndUIParams(new HashMap<>()); - assertTrue(stdPAPPolicy.getDrlRuleAndUIParams() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetDropDownMap() { - try { - stdPAPPolicy.setDropDownMap(new HashMap<>()); - assertTrue(stdPAPPolicy.getDropDownMap() != null); - } catch (Exception e) { - logger.info(e); - } - - } - - @Test - public void testGetDynamicFieldConfigAttributes() { - try { - assertTrue(stdPAPPolicy.getDynamicFieldConfigAttributes() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetDynamicRuleAlgorithmCombo() { - try { - stdPAPPolicy.setDynamicRuleAlgorithmCombo(new ArrayList<>()); - assertTrue(stdPAPPolicy.getDynamicRuleAlgorithmCombo() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetDynamicRuleAlgorithmField1() { - try { - stdPAPPolicy.setDynamicRuleAlgorithmField1(new ArrayList<>()); - assertTrue(stdPAPPolicy.getDynamicRuleAlgorithmField1() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetDictionary() { - try { - stdPAPPolicy.setDictionary("dictionary"); - assertTrue(stdPAPPolicy.getDictionary() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetDictionaryFields() { - try { - stdPAPPolicy.setDictionaryFields("dictionaryFields"); - assertTrue(stdPAPPolicy.getDictionaryFields() != null); - } catch (Exception e) { - logger.info(e); - } - - } - - @Test - public void testGetDictionaryType() { - try { - stdPAPPolicy.setDictionaryType("dictionaryType"); - assertTrue(stdPAPPolicy.getDictionaryType() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetDomainDir() { - try { - stdPAPPolicy.setDomainDir("domain"); - assertTrue(stdPAPPolicy.getDomainDir() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testIsDraft() { - try { - stdPAPPolicy.setDraft(true); - assertTrue(stdPAPPolicy.isDraft() == true); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetDynamicRuleAlgorithmLabels() { - try { - stdPAPPolicy.setDynamicRuleAlgorithmLabels(new ArrayList<>()); - assertTrue(stdPAPPolicy.getDynamicRuleAlgorithmLabels() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetDynamicSettingsMap() { - try { - stdPAPPolicy.setDynamicSettingsMap(new HashMap<>()); - assertTrue(stdPAPPolicy.getDynamicSettingsMap() != null); - } catch (Exception e) { - logger.info(e); - } - - } - - @Test - public void testGetDynamicVariableList() { - try { - stdPAPPolicy.setDynamicVariableList(new ArrayList<>()); - assertTrue(stdPAPPolicy.getDynamicVariableList() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetGuard() { - try { - stdPAPPolicy.setGuard("domain"); - assertTrue(stdPAPPolicy.getGuard() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetHighestVersion() { - try { - stdPAPPolicy.setHighestVersion(123); - assertTrue(stdPAPPolicy.getHighestVersion() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testgGtJsonBody() { - try { - stdPAPPolicy.setJsonBody("jsonBoby"); - assertTrue(stdPAPPolicy.getJsonBody() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetLocation() { - try { - stdPAPPolicy.setLocation(new URI("test")); - assertTrue(stdPAPPolicy.getLocation() != null); - } catch (Exception e) { - logger.info(e); - } - - } - - @Test - public void testGetMsLocation() { - try { - stdPAPPolicy.setMsLocation("MsLocation"); - assertTrue(stdPAPPolicy.getMsLocation() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testSetOldPolicyFileName() { - try { - stdPAPPolicy.setOldPolicyFileName("domain"); - assertTrue(stdPAPPolicy.getOldPolicyFileName() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetOnapName() { - try { - stdPAPPolicy.setOnapName("onap"); - assertTrue(stdPAPPolicy.getOnapName() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetPolicyDescription() { - try { - stdPAPPolicy.setPolicyDescription("description test"); - assertTrue(stdPAPPolicy.getPolicyDescription() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetPolicyID() { - try { - stdPAPPolicy.setPolicyID("test"); - assertTrue(stdPAPPolicy.getPolicyID() != null); - } catch (Exception e) { - logger.info(e); - } - - } - - @Test - public void testSetPolicyName() { - try { - stdPAPPolicy.setPolicyName("MsLocation"); - assertTrue(stdPAPPolicy.getPolicyName() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testSetPriority() { - try { - stdPAPPolicy.setPriority("domain"); - assertTrue(stdPAPPolicy.getPriority() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetProviderComboBox() { - try { - stdPAPPolicy.setProviderComboBox("onap"); - assertTrue(stdPAPPolicy.getProviderComboBox() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetRiskLevel() { - try { - stdPAPPolicy.setRiskLevel("test"); - assertTrue(stdPAPPolicy.getRiskLevel() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetRiskType() { - try { - stdPAPPolicy.setRiskType("test"); - assertTrue(stdPAPPolicy.getRiskType() != null); - } catch (Exception e) { - logger.info(e); - } - - } - - @Test - public void testGetRuleID() { - try { - stdPAPPolicy.setRuleID("MsLocation"); - assertTrue(stdPAPPolicy.getRuleID() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetServiceType() { - try { - stdPAPPolicy.setServiceType("domain"); - assertTrue(stdPAPPolicy.getServiceType() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetTTLDate() { - try { - stdPAPPolicy.setTTLDate("09/20/17"); - assertTrue(stdPAPPolicy.getTTLDate() != null); - } catch (Exception e) { - logger.info(e); - } - } - - - @Test - public void testGetUuid() { - try { - stdPAPPolicy.setUuid("11212122"); - assertTrue(stdPAPPolicy.getUuid() != null); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testGetVersion() { - try { - stdPAPPolicy.setVersion("testv01"); - assertTrue(stdPAPPolicy.getVersion() != null); - } catch (Exception e) { - logger.info(e); - } - - } - - @Test - public void testIsEditPolicy() { - try { - stdPAPPolicy.setEditPolicy(true); - assertTrue(stdPAPPolicy.isEditPolicy() == true); - } catch (Exception e) { - logger.info(e); - } - } - - @Test - public void testToString() { - try { - assertTrue(stdPAPPolicy.toString() != null); - } catch (Exception e) { - logger.info(e); - } + stdPAPPolicy = new StdPAPPolicy(); + } + + @Test + public void testGetActionAttribute() throws URISyntaxException { + stdPAPPolicy.setActionAttribute("test"); + assertEquals("test", stdPAPPolicy.getActionAttribute()); + stdPAPPolicy.setActionBody("actionBody"); + assertNotNull(stdPAPPolicy.getActionBody()); + stdPAPPolicy.setActionDictHeader("actionDictHeader"); + assertNotNull(stdPAPPolicy.getActionDictHeader()); + stdPAPPolicy.setActionDictMethod("actionDictMethod"); + assertNotNull(stdPAPPolicy.getActionDictMethod()); + stdPAPPolicy.setActionDictType("actionDictType"); + assertNotNull(stdPAPPolicy.getActionDictType()); + stdPAPPolicy.setActionDictUrl("actionDictUrl"); + assertNotNull(stdPAPPolicy.getActionDictUrl()); + stdPAPPolicy.setActionPerformer("actionPerformer"); + assertNotNull(stdPAPPolicy.getActionPerformer()); + stdPAPPolicy.setBrmsController("brmsController"); + assertNotNull(stdPAPPolicy.getBrmsController()); + stdPAPPolicy.setBrmsDependency(new ArrayList<>()); + assertNotNull(stdPAPPolicy.getBrmsDependency()); + stdPAPPolicy.setConfigBodyData("configBodyData"); + assertNotNull(stdPAPPolicy.getConfigBodyData()); + stdPAPPolicy.setConfigName("configName"); + assertNotNull(stdPAPPolicy.getConfigName()); + stdPAPPolicy.setConfigPolicyType("configPolicyType"); + assertNotNull(stdPAPPolicy.getConfigPolicyType()); + stdPAPPolicy.setConfigType("configType"); + assertNotNull(stdPAPPolicy.getConfigType()); + stdPAPPolicy.setDataTypeList(new ArrayList()); + assertNotNull(stdPAPPolicy.getDataTypeList()); + stdPAPPolicy.setDeleteCondition("deleteCondition"); + assertNotNull(stdPAPPolicy.getDeleteCondition()); + stdPAPPolicy.setDrlRuleAndUIParams(new HashMap<>()); + assertNotNull(stdPAPPolicy.getDrlRuleAndUIParams()); + stdPAPPolicy.setDropDownMap(new HashMap<>()); + assertNotNull(stdPAPPolicy.getDropDownMap() ); + Map dynamic = new HashMap<>(); + dynamic.put("foo", "bar"); + stdPAPPolicy.setDynamicFieldConfigAttributes(dynamic); + assertEquals(dynamic, stdPAPPolicy.getDynamicFieldConfigAttributes()); + stdPAPPolicy.setDynamicRuleAlgorithmCombo(new ArrayList<>()); + assertNotNull(stdPAPPolicy.getDynamicRuleAlgorithmCombo()); + stdPAPPolicy.setDynamicRuleAlgorithmField1(new ArrayList<>()); + assertNotNull(stdPAPPolicy.getDynamicRuleAlgorithmField1()); + stdPAPPolicy.setDynamicRuleAlgorithmField2(new ArrayList<>()); + assertNotNull(stdPAPPolicy.getDynamicRuleAlgorithmField2()); + stdPAPPolicy.setDictionary("dictionary"); + assertNotNull(stdPAPPolicy.getDictionary()); + stdPAPPolicy.setDictionaryFields("dictionaryFields"); + assertNotNull(stdPAPPolicy.getDictionaryFields()); + stdPAPPolicy.setDictionaryType("dictionaryType"); + assertNotNull(stdPAPPolicy.getDictionaryType()); + stdPAPPolicy.setDomainDir("domain"); + assertNotNull(stdPAPPolicy.getDomainDir()); + stdPAPPolicy.setDraft(true); + assertTrue(stdPAPPolicy.isDraft() == true); + stdPAPPolicy.setDynamicRuleAlgorithmLabels(new ArrayList<>()); + assertNotNull(stdPAPPolicy.getDynamicRuleAlgorithmLabels()); + stdPAPPolicy.setDynamicSettingsMap(new HashMap<>()); + assertNotNull(stdPAPPolicy.getDynamicSettingsMap()); + stdPAPPolicy.setDynamicVariableList(new ArrayList<>()); + assertNotNull(stdPAPPolicy.getDynamicVariableList()); + stdPAPPolicy.setGuard("domain"); + assertNotNull(stdPAPPolicy.getGuard()); + stdPAPPolicy.setHighestVersion(123); + assertNotNull(stdPAPPolicy.getHighestVersion()); + stdPAPPolicy.setJsonBody("jsonBoby"); + assertNotNull(stdPAPPolicy.getJsonBody()); + stdPAPPolicy.setLocation(new URI("test")); + assertNotNull(stdPAPPolicy.getLocation()); + stdPAPPolicy.setMsLocation("MsLocation"); + assertNotNull(stdPAPPolicy.getMsLocation()); + stdPAPPolicy.setOldPolicyFileName("domain"); + assertNotNull(stdPAPPolicy.getOldPolicyFileName()); + stdPAPPolicy.setOnapName("onap"); + assertTrue(stdPAPPolicy.getOnapName() != null); + stdPAPPolicy.setPolicyDescription("description test"); + assertNotNull(stdPAPPolicy.getPolicyDescription()); + stdPAPPolicy.setPolicyID("test"); + assertNotNull(stdPAPPolicy.getPolicyID()); + stdPAPPolicy.setPolicyName("MsLocation"); + assertNotNull(stdPAPPolicy.getPolicyName()); + stdPAPPolicy.setPriority("domain"); + assertNotNull(stdPAPPolicy.getPriority()); + stdPAPPolicy.setProviderComboBox("onap"); + assertNotNull(stdPAPPolicy.getProviderComboBox()); + stdPAPPolicy.setRiskLevel("test"); + assertNotNull(stdPAPPolicy.getRiskLevel()); + stdPAPPolicy.setRiskType("test"); + assertNotNull(stdPAPPolicy.getRiskType()); + stdPAPPolicy.setRuleID("MsLocation"); + assertNotNull(stdPAPPolicy.getRuleID()); + stdPAPPolicy.setServiceType("domain"); + assertNotNull(stdPAPPolicy.getServiceType()); + stdPAPPolicy.setTTLDate("09/20/17"); + assertNotNull(stdPAPPolicy.getTTLDate()); + stdPAPPolicy.setUuid("11212122"); + assertNotNull(stdPAPPolicy.getUuid()); + stdPAPPolicy.setVersion("testv01"); + assertNotNull(stdPAPPolicy.getVersion()); + stdPAPPolicy.setEditPolicy(true); + assertTrue(stdPAPPolicy.isEditPolicy()); + assertNotNull(stdPAPPolicy.toString()); + Map treatments = new HashMap<>(); + stdPAPPolicy.setTreatments(treatments); + assertEquals(treatments, stdPAPPolicy.getTreatments()); + stdPAPPolicy.setRawXacmlPolicy("raw"); + assertEquals("raw", stdPAPPolicy.getRawXacmlPolicy()); } @Test public void testConstructorUri() throws URISyntaxException { URI location = new URI("testUri"); - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(location); - assertEquals(location, stdPAPPolicy.getLocation()); + StdPAPPolicy stdPapPolicy = new StdPAPPolicy(location); + assertEquals(location, stdPapPolicy.getLocation()); } @Test public void testConstructorStringStringStringString() throws URISyntaxException { - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("policyName", "body", "configType", "configTypePolicy"); - assertEquals("policyName", stdPAPPolicy.getPolicyName()); - assertEquals("body", stdPAPPolicy.getConfigBodyData()); - assertEquals("configType", stdPAPPolicy.getConfigType()); - assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); + StdPAPPolicy stdPapPolicy = new StdPAPPolicy("policyName", "body", "configType", "configTypePolicy"); + assertEquals("policyName", stdPapPolicy.getPolicyName()); + assertEquals("body", stdPapPolicy.getConfigBodyData()); + assertEquals("configType", stdPapPolicy.getConfigType()); + assertEquals("configTypePolicy", stdPapPolicy.getConfigPolicyType()); } - @Test public void testConstructorStringStringStringStringStringMapStringStringStringStringBooleanStringStringStringStringString() throws URISyntaxException { Map attributes = new HashMap<>(); attributes.put("aKey", "aValue"); - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy( - StdPAPPolicyParams.builder() - .configPolicyType("configTypePolicy") - .policyName("policyName") - .description("description") - .onapName("onapName") - .configName("configName") - .dynamicFieldConfigAttributes(attributes) - .configType("configType") - .configBodyData("body") - .editPolicy(true) - .domain("domain") - .highestVersion(1) - .riskLevel("riskLevel") - .riskType("riskType") - .guard("guard") - .ttlDate("ttlDate").build()); + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().configPolicyType("configTypePolicy") + .policyName("policyName").description("description").onapName("onapName").configName("configName") + .dynamicFieldConfigAttributes(attributes).configType("configType").configBodyData("body") + .editPolicy(true).domain("domain").highestVersion(1).riskLevel("riskLevel").riskType("riskType") + .guard("guard").ttlDate("ttlDate").build()); assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("description", stdPAPPolicy.getPolicyDescription()); @@ -625,18 +216,13 @@ public class StdPAPPolicyTest { dynamicRuleAlgorithmField1.add("dynamicRuleAlgorithmField1"); List dynamicRuleAlgorithmField2 = new ArrayList<>(); dynamicRuleAlgorithmField2.add("dynamicRuleAlgorithmField2"); - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().policyName("policyName").description("description") - .dynamicFieldConfigAttributes(attributes) + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().policyName("policyName") + .description("description").dynamicFieldConfigAttributes(attributes) .dynamicRuleAlgorithmLabels(dynamicRuleAlgorithmLabels) .dynamicRuleAlgorithmCombo(dynamicRuleAlgorithmCombo) .dynamicRuleAlgorithmField1(dynamicRuleAlgorithmField1) - .dynamicRuleAlgorithmField2(dynamicRuleAlgorithmField2) - .actionPerformer("actionPerformer") - .actionAttribute("actionAttribute") - .editPolicy(true) - .domain("domain") - .highestVersion(1) - .build()); + .dynamicRuleAlgorithmField2(dynamicRuleAlgorithmField2).actionPerformer("actionPerformer") + .actionAttribute("actionAttribute").editPolicy(true).domain("domain").highestVersion(1).build()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("description", stdPAPPolicy.getPolicyDescription()); assertEquals(attributes, stdPAPPolicy.getDynamicFieldConfigAttributes()); @@ -673,25 +259,15 @@ public class StdPAPPolicyTest { dynamicVariableList.add("dynamicVariableList"); List dataTypeList = new ArrayList<>(); dataTypeList.add("dataTypeList"); - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .policyName("policyName") - .description("description") - .onapName("onapName") - .providerComboBox("providerComboBox") - .dynamicFieldConfigAttributes(attributes) - .dynamicSettingsMap(settings) - .treatments(treatments) + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().policyName("policyName") + .description("description").onapName("onapName").providerComboBox("providerComboBox") + .dynamicFieldConfigAttributes(attributes).dynamicSettingsMap(settings).treatments(treatments) .dynamicRuleAlgorithmLabels(dynamicRuleAlgorithmLabels) .dynamicRuleAlgorithmCombo(dynamicRuleAlgorithmCombo) .dynamicRuleAlgorithmField1(dynamicRuleAlgorithmField1) - .dynamicRuleAlgorithmField2(dynamicRuleAlgorithmField2) - .dropDownMap(dropDownMap) - .dynamicVariableList(dynamicVariableList) - .dataTypeList(dataTypeList) - .editPolicy(true) - .domain("domain") - .highestVersion(1) - .build()); + .dynamicRuleAlgorithmField2(dynamicRuleAlgorithmField2).dropDownMap(dropDownMap) + .dynamicVariableList(dynamicVariableList).dataTypeList(dataTypeList).editPolicy(true).domain("domain") + .highestVersion(1).build()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("description", stdPAPPolicy.getPolicyDescription()); assertEquals("onapName", stdPAPPolicy.getOnapName()); @@ -716,26 +292,11 @@ public class StdPAPPolicyTest { throws URISyntaxException { Map attributes = new HashMap<>(); attributes.put("aKey", "aValue"); - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .configPolicyType("configTypePolicy") - .policyName("policyName") - .description("description") - .onapName("onapName") - .configName("configName") - .dynamicFieldConfigAttributes(attributes) - .configBodyData("body") - .policyID("policyId") - .ruleID("ruleId") - .configType("configType") - .editPolicy(true) - .version("version") - .domain("domain") - .highestVersion(1) - .riskLevel("riskLevel") - .riskType("riskType") - .guard("guard") - .ttlDate("ttlDate") - .build()); + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().configPolicyType("configTypePolicy") + .policyName("policyName").description("description").onapName("onapName").configName("configName") + .dynamicFieldConfigAttributes(attributes).configBodyData("body").policyID("policyId").ruleID("ruleId") + .configType("configType").editPolicy(true).version("version").domain("domain").highestVersion(1) + .riskLevel("riskLevel").riskType("riskType").guard("guard").ttlDate("ttlDate").build()); assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("description", stdPAPPolicy.getPolicyDescription()); @@ -759,20 +320,10 @@ public class StdPAPPolicyTest { @Test public void testConstructorStringStringStringStringBooleanStringStringIntegerStringStringStringString() throws URISyntaxException { - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .configPolicyType("configTypePolicy") - .policyName("policyName") - .description("description") - .configName("configName") - .editPolicy(true) - .domain("domain") - .jsonBody("jasonBody") - .highestVersion(1) - .riskLevel("riskLevel") - .riskType("riskType") - .guard("guard") - .ttlDate("ttlDate") - .build()); + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().configPolicyType("configTypePolicy") + .policyName("policyName").description("description").configName("configName").editPolicy(true) + .domain("domain").jsonBody("jasonBody").highestVersion(1).riskLevel("riskLevel").riskType("riskType") + .guard("guard").ttlDate("ttlDate").build()); assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("description", stdPAPPolicy.getPolicyDescription()); @@ -790,21 +341,10 @@ public class StdPAPPolicyTest { @Test public void testConstructorStringStringStringStringBooleanStringStringIntegerStringStringStringStringString() throws URISyntaxException { - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .configPolicyType("configTypePolicy") - .policyName("policyName") - .description("description") - .configName("configName") - .editPolicy(true) - .domain("domain") - .jsonBody("jasonBody") - .highestVersion(1) - .onapName("eCompName") - .riskLevel("riskLevel") - .riskType("riskType") - .guard("guard") - .ttlDate("ttlDate") - .build()); + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().configPolicyType("configTypePolicy") + .policyName("policyName").description("description").configName("configName").editPolicy(true) + .domain("domain").jsonBody("jasonBody").highestVersion(1).onapName("eCompName").riskLevel("riskLevel") + .riskType("riskType").guard("guard").ttlDate("ttlDate").build()); assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("description", stdPAPPolicy.getPolicyDescription()); @@ -827,23 +367,11 @@ public class StdPAPPolicyTest { dyanamicFieldConfigAttributes.put("aKey", "aValue"); ArrayList brmsDependency = new ArrayList<>(); brmsDependency.add("brmsDependency"); - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .configPolicyType("configTypePolicy") - .policyName("policyName") - .description("description") - .configName("configName") - .editPolicy(true) - .domain("domain") - .dynamicFieldConfigAttributes(dyanamicFieldConfigAttributes) - .highestVersion(1) - .onapName("eCompName") - .configBodyData("configBodyData") - .riskLevel("riskLevel") - .riskType("riskType") - .guard("guard") - .ttlDate("ttlDate") - .brmsController("brmsController") - .brmsDependency(brmsDependency) + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().configPolicyType("configTypePolicy") + .policyName("policyName").description("description").configName("configName").editPolicy(true) + .domain("domain").dynamicFieldConfigAttributes(dyanamicFieldConfigAttributes).highestVersion(1) + .onapName("eCompName").configBodyData("configBodyData").riskLevel("riskLevel").riskType("riskType") + .guard("guard").ttlDate("ttlDate").brmsController("brmsController").brmsDependency(brmsDependency) .build()); assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); @@ -872,26 +400,13 @@ public class StdPAPPolicyTest { drlRuleAndUIParams.put("aDrlRuleKey", "aDrlRuleValue"); ArrayList brmsDependency = new ArrayList<>(); brmsDependency.add("brmsDependency"); - //Creating BRMS Param Policies from the Admin Console - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .configPolicyType("configTypePolicy") - .policyName("policyName") - .description("description") - .configName("configName") - .editPolicy(true) - .domain("domain") - .dynamicFieldConfigAttributes(dyanamicFieldConfigAttributes) - .highestVersion(1) - .onapName("eCompName") - .configBodyData("configBodyData") - .drlRuleAndUIParams(drlRuleAndUIParams) - .riskLevel("riskLevel") - .riskType("riskType") - .guard("guard") - .ttlDate("ttlDate") - .brmsController("brmsController") - .brmsDependency(brmsDependency) - .build()); + // Creating BRMS Param Policies from the Admin Console + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().configPolicyType("configTypePolicy") + .policyName("policyName").description("description").configName("configName").editPolicy(true) + .domain("domain").dynamicFieldConfigAttributes(dyanamicFieldConfigAttributes).highestVersion(1) + .onapName("eCompName").configBodyData("configBodyData").drlRuleAndUIParams(drlRuleAndUIParams) + .riskLevel("riskLevel").riskType("riskType").guard("guard").ttlDate("ttlDate") + .brmsController("brmsController").brmsDependency(brmsDependency).build()); assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("description", stdPAPPolicy.getPolicyDescription()); @@ -914,24 +429,12 @@ public class StdPAPPolicyTest { @Test public void testConstructorStringStringStringStringStringBooleanStringStringBooleanStringIntegerStringStringStringString() throws URISyntaxException { - //Creating CloseLoop_Fault and Performance Metric Policies - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .configPolicyType("configTypePolicy") - .policyName("policyName") - .description("description") - .onapName("onapName") - .jsonBody("jasonBody") - .draft(true) - .oldPolicyFileName("oldPolicyFileName") - .serviceType("serviceType") - .editPolicy(true) - .domain("domain") - .highestVersion(1) - .riskLevel("riskLevel") - .riskType("riskType") - .guard("guard") - .ttlDate("ttlDate") - .build()); + // Creating CloseLoop_Fault and Performance Metric Policies + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().configPolicyType("configTypePolicy") + .policyName("policyName").description("description").onapName("onapName").jsonBody("jasonBody") + .draft(true).oldPolicyFileName("oldPolicyFileName").serviceType("serviceType").editPolicy(true) + .domain("domain").highestVersion(1).riskLevel("riskLevel").riskType("riskType").guard("guard") + .ttlDate("ttlDate").build()); assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("description", stdPAPPolicy.getPolicyDescription()); @@ -952,23 +455,11 @@ public class StdPAPPolicyTest { @Test public void testConstructorStringStringStringStringBooleanStringStringStringStringStringIntegerStringStringStringString() throws URISyntaxException { - //test for Updating Config Firewall Policies from the Admin Console - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .configPolicyType("configTypePolicy") - .policyName("policyName") - .description("description") - .configName("configName") - .editPolicy(true) - .domain("domain") - .policyID("policyId") - .ruleID("ruleId") - .version("version") - .jsonBody("jasonBody") - .highestVersion(1) - .riskLevel("riskLevel") - .riskType("riskType") - .guard("guard") - .ttlDate("ttlDate") + // test for Updating Config Firewall Policies from the Admin Console + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().configPolicyType("configTypePolicy") + .policyName("policyName").description("description").configName("configName").editPolicy(true) + .domain("domain").policyID("policyId").ruleID("ruleId").version("version").jsonBody("jasonBody") + .highestVersion(1).riskLevel("riskLevel").riskType("riskType").guard("guard").ttlDate("ttlDate") .build()); assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); @@ -990,27 +481,12 @@ public class StdPAPPolicyTest { @Test public void testConstructorStringStringStringStringStringStringStringStringStringStringStringBooleanStringintStringStringStringString() throws URISyntaxException { - //for Micro Service Creating/Updating Policies from the Admin Console - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .configPolicyType("configTypePolicy") - .policyName("policyName") - .description("description") - .onapName("onapName") - .configName("configName") - .serviceType("serviceType") - .uuid("uuid") - .msLocation("msLocation") - .jsonBody("jasonBody") - .priority("priority") - .version("version") - .editPolicy(true) - .domain("domain") - .highestVersion(1) - .riskLevel("riskLevel") - .riskType("riskType") - .guard("guard") - .ttlDate("ttlDate") - .build()); + // for Micro Service Creating/Updating Policies from the Admin Console + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().configPolicyType("configTypePolicy") + .policyName("policyName").description("description").onapName("onapName").configName("configName") + .serviceType("serviceType").uuid("uuid").msLocation("msLocation").jsonBody("jasonBody") + .priority("priority").version("version").editPolicy(true).domain("domain").highestVersion(1) + .riskLevel("riskLevel").riskType("riskType").guard("guard").ttlDate("ttlDate").build()); assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("description", stdPAPPolicy.getPolicyDescription()); @@ -1034,25 +510,12 @@ public class StdPAPPolicyTest { @Test public void testConstructorStringStringStringStringBooleanStringStringStringStringStringIntegerStringStringStringStringString() throws URISyntaxException { - //test for Updating Goc Policies from the Admin Console - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .configPolicyType("configTypePolicy") - .policyName("policyName") - .description("description") - .configName("configName") - .editPolicy(true) - .domain("domain") - .policyID("policyId") - .ruleID("ruleId") - .version("version") - .jsonBody("jasonBody") - .highestVersion(1) - .onapName("ecompName") - .riskLevel("riskLevel") - .riskType("riskType") - .guard("guard") - .ttlDate("ttlDate") - .build()); + // test for Updating Goc Policies from the Admin Console + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().configPolicyType("configTypePolicy") + .policyName("policyName").description("description").configName("configName").editPolicy(true) + .domain("domain").policyID("policyId").ruleID("ruleId").version("version").jsonBody("jasonBody") + .highestVersion(1).onapName("ecompName").riskLevel("riskLevel").riskType("riskType").guard("guard") + .ttlDate("ttlDate").build()); assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("description", stdPAPPolicy.getPolicyDescription()); @@ -1074,28 +537,15 @@ public class StdPAPPolicyTest { @Test public void testConstructorStringStringStringStringBooleanStringStringStringStringMapStringStringIntegerStringStringStringStringString() throws URISyntaxException { - //for Updating Brms Policies from the Admin Console + // for Updating Brms Policies from the Admin Console Map dyanamicFieldConfigAttributes = new HashMap<>(); dyanamicFieldConfigAttributes.put("aKey", "aValue"); - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .configPolicyType("configTypePolicy") - .policyName("policyName") - .description("description") - .configName("configName") - .editPolicy(true) - .domain("domain") - .policyID("policyId") - .ruleID("ruleId") - .version("version") - .dynamicFieldConfigAttributes(dyanamicFieldConfigAttributes) - .highestVersion(1) - .onapName("eCompName") - .configBodyData("configBodyData") - .riskLevel("riskLevel") - .riskType("riskType") - .guard("guard") - .ttlDate("ttlDate") - .build()); + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().configPolicyType("configTypePolicy") + .policyName("policyName").description("description").configName("configName").editPolicy(true) + .domain("domain").policyID("policyId").ruleID("ruleId").version("version") + .dynamicFieldConfigAttributes(dyanamicFieldConfigAttributes).highestVersion(1).onapName("eCompName") + .configBodyData("configBodyData").riskLevel("riskLevel").riskType("riskType").guard("guard") + .ttlDate("ttlDate").build()); assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("description", stdPAPPolicy.getPolicyDescription()); @@ -1118,30 +568,17 @@ public class StdPAPPolicyTest { @Test public void testConstructorStringStringStringStringBooleanStringStringStringStringMapStringStringIntegerStringMapStringStringStringStringStringString() throws URISyntaxException { - //for Updating Brms Param Policies from the Admin Console - Map dyanamicFieldConfigAttributes = new HashMap<>(); - dyanamicFieldConfigAttributes.put("aKey", "aValue"); + // for Updating Brms Param Policies from the Admin Console Map drlRuleAndUIParams = new HashMap<>(); drlRuleAndUIParams.put("aDrlRuleKey", "aDrlRuleValue"); - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .configPolicyType("configTypePolicy") - .policyName("policyName") - .description("description") - .configName("configName") - .editPolicy(true) - .domain("domain") - .policyID("policyId") - .ruleID("ruleId") - .version("version") - .dynamicFieldConfigAttributes(dyanamicFieldConfigAttributes) - .highestVersion(1) - .onapName("eCompName") - .drlRuleAndUIParams(drlRuleAndUIParams) - .riskLevel("riskLevel") - .riskType("riskType") - .guard("guard") - .ttlDate("ttlDate") - .build()); + Map dynamicFieldConfigAttributes = new HashMap<>(); + dynamicFieldConfigAttributes.put("foo", "bar"); + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().configPolicyType("configTypePolicy") + .policyName("policyName").description("description").configName("configName").editPolicy(true) + .domain("domain").policyID("policyId").ruleID("ruleId").version("version") + .dynamicFieldConfigAttributes(dynamicFieldConfigAttributes).highestVersion(1).onapName("eCompName") + .drlRuleAndUIParams(drlRuleAndUIParams).riskLevel("riskLevel").riskType("riskType").guard("guard") + .priority("high").ttlDate("ttlDate").build()); assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("description", stdPAPPolicy.getPolicyDescription()); @@ -1151,23 +588,22 @@ public class StdPAPPolicyTest { assertEquals("policyId", stdPAPPolicy.getPolicyID()); assertEquals("ruleId", stdPAPPolicy.getRuleID()); assertEquals("version", stdPAPPolicy.getVersion()); - assertEquals(dyanamicFieldConfigAttributes, stdPAPPolicy.getDynamicFieldConfigAttributes()); + assertEquals(dynamicFieldConfigAttributes, stdPAPPolicy.getDynamicFieldConfigAttributes()); assertEquals(Integer.valueOf(1), stdPAPPolicy.getHighestVersion()); assertEquals("eCompName", stdPAPPolicy.getOnapName()); assertEquals(drlRuleAndUIParams, stdPAPPolicy.getDrlRuleAndUIParams()); assertEquals("riskLevel", stdPAPPolicy.getRiskLevel()); assertEquals("riskType", stdPAPPolicy.getRiskType()); assertEquals("guard", stdPAPPolicy.getGuard()); + assertEquals("high", stdPAPPolicy.getPriority()); assertEquals("ttlDate", stdPAPPolicy.getTTLDate()); } @Test public void testConstructorStringString() { // for deleting policies from the API - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder() - .policyName("policyName") - .deleteCondition("deleteCondition") - .build()); + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy( + StdPAPPolicyParams.builder().policyName("policyName").deleteCondition("deleteCondition").build()); assertEquals("policyName", stdPAPPolicy.getPolicyName()); assertEquals("deleteCondition", stdPAPPolicy.getDeleteCondition()); } @@ -1175,12 +611,8 @@ public class StdPAPPolicyTest { @Test public void testConstructorStringStringString() { // for creating dictionary items from the API> - StdPAPPolicy stdPAPPolicy = new StdPAPPolicy( - StdPAPPolicyParams.builder() - .dictionaryType("dictionaryType") - .dictionary("dictionary") - .dictionaryFields("dictionaryFields") - .build()); + StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().dictionaryType("dictionaryType") + .dictionary("dictionary").dictionaryFields("dictionaryFields").build()); assertEquals("dictionaryType", stdPAPPolicy.getDictionaryType()); assertEquals("dictionary", stdPAPPolicy.getDictionary()); assertEquals("dictionaryFields", stdPAPPolicy.getDictionaryFields()); diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPGroupStatusTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPGroupStatusTest.java index 55413d83b..5dcebcd89 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPGroupStatusTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPGroupStatusTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -19,13 +19,22 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.policy.xacml.test.std.pap; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; + +import com.att.research.xacml.api.pap.PDP; +import com.att.research.xacml.api.pap.PDPGroupStatus.Status; +import com.att.research.xacml.api.pap.PDPPIPConfig; +import com.att.research.xacml.api.pap.PDPPolicy; + import java.util.HashSet; import java.util.Set; + import org.junit.Before; import org.junit.Test; import org.onap.policy.common.logging.flexlogger.FlexLogger; @@ -34,10 +43,6 @@ import org.onap.policy.xacml.std.pap.StdPDP; import org.onap.policy.xacml.std.pap.StdPDPGroupStatus; import org.onap.policy.xacml.std.pap.StdPDPPIPConfig; import org.onap.policy.xacml.std.pap.StdPDPPolicy; -import com.att.research.xacml.api.pap.PDP; -import com.att.research.xacml.api.pap.PDPGroupStatus.Status; -import com.att.research.xacml.api.pap.PDPPIPConfig; -import com.att.research.xacml.api.pap.PDPPolicy; public class StdPDPGroupStatusTest { @@ -45,6 +50,9 @@ public class StdPDPGroupStatusTest { private StdPDPGroupStatus stdPDPGroupStatus; + /** + * setUp. + */ @Before public void setUp() { @@ -96,7 +104,9 @@ public class StdPDPGroupStatusTest { public void testGetLoadWarnings() { try { stdPDPGroupStatus.setLoadWarnings(new HashSet<>()); - assertTrue(stdPDPGroupStatus.getLoadWarnings() != null); + assertNotNull(stdPDPGroupStatus.getLoadWarnings()); + stdPDPGroupStatus.addLoadWarning("warn"); + assertEquals(1, stdPDPGroupStatus.getLoadWarnings().size()); } catch (Exception e) { logger.error(e); } @@ -322,7 +332,6 @@ public class StdPDPGroupStatusTest { Set updatingPDPs = new HashSet<>(); updatingPDPs.add(new StdPDP()); - stdPDPGroupStatus.setStatus(status); stdPDPGroupStatus.setFailedPDPs(failedPDPs); stdPDPGroupStatus.setFailedPIPConfigs(failedPIPConfigs); diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPGroupTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPGroupTest.java index e5e058a5c..3391b2097 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPGroupTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPGroupTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -19,13 +19,16 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.policy.xacml.test.std.pap; import static org.junit.Assert.assertTrue; + import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashSet; import java.util.Set; + import org.junit.Before; import org.junit.Test; import org.onap.policy.common.logging.flexlogger.FlexLogger; @@ -35,7 +38,6 @@ import org.onap.policy.xacml.std.pap.StdPDPGroup; public class StdPDPGroupTest { - private static Logger logger = FlexLogger.getLogger(StdPDPGroupTest.class); private StdPDPGroup stdPDPGroup; diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPPIPConfigTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPPIPConfigTest.java index b5713d362..746aace3d 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPPIPConfigTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPPIPConfigTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -22,14 +22,17 @@ package org.onap.policy.xacml.test.std.pap; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; + import java.util.HashMap; import java.util.Map; import java.util.Properties; + import org.junit.Test; import org.onap.policy.xacml.std.pap.StdPDPPIPConfig; @@ -41,6 +44,8 @@ public class StdPDPPIPConfigTest { String value = "testVal"; Properties props = new Properties(); props.setProperty(id + ".classname", value); + props.setProperty(id + ".dontcare", "blah"); + props.setProperty("foo", "bar"); Map map = new HashMap(); map.put(id, value); @@ -106,4 +111,13 @@ public class StdPDPPIPConfigTest { // Test toString assertThat(config.toString().length(), is(not(0))); } + + @Test + public void testBadProperties() { + Properties props = new Properties(); + props.setProperty("foo", "bar"); + assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> { + new StdPDPPIPConfig("myid", props); + }); + } } diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPPolicyTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPPolicyTest.java index 7aaa381ce..98dc4d61c 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPPolicyTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPPolicyTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -27,14 +27,17 @@ import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; + +import com.att.research.xacml.api.pap.PAPException; + import java.io.IOException; import java.net.ConnectException; import java.net.URI; import java.net.URISyntaxException; import java.util.Properties; + import org.junit.Test; import org.onap.policy.xacml.std.pap.StdPDPPolicy; -import com.att.research.xacml.api.pap.PAPException; import org.onap.policy.xacml.std.pap.StdPDPPolicyParams; public class StdPDPPolicyTest { @@ -53,9 +56,8 @@ public class StdPDPPolicyTest { StdPDPPolicy policy4 = new StdPDPPolicy(); assertNotNull(policy4); - StdPDPPolicy policy5 = new StdPDPPolicy( - StdPDPPolicyParams.builder().id(value).isRoot(true).name(value).location(uri) - .isValid(false).policyId(value).description(value).version("1").build()); + StdPDPPolicy policy5 = new StdPDPPolicy(StdPDPPolicyParams.builder().id(value).isRoot(true).name(value) + .location(uri).isValid(false).policyId(value).description(value).version("1").build()); assertNotNull(policy5); StdPDPPolicy policy6 = new StdPDPPolicy(value, true, value, uri, false); assertNotNull(policy6); @@ -117,9 +119,8 @@ public class StdPDPPolicyTest { // Set up test data String value = "testVal"; URI uri = new URI("http://localhost:54287"); - StdPDPPolicy policy = new StdPDPPolicy( - StdPDPPolicyParams.builder().id(value).isRoot(true).name(value).location(uri) - .isValid(false).policyId(value).description(value).version("1").build()); + StdPDPPolicy policy = new StdPDPPolicy(StdPDPPolicyParams.builder().id(value).isRoot(true).name(value) + .location(uri).isValid(false).policyId(value).description(value).version("1").build()); // Negative test stream policy.getStream(); diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPStatusTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPStatusTest.java index dfdbf5f16..7d3ce5e19 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPStatusTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPStatusTest.java @@ -1,8 +1,8 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. - * ================================================================================ * Modifications Copyright (C) 2019 Samsung + * Modifications Copyright (C) 2019 AT&T Intellectual Property. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,18 +17,24 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.policy.xacml.test.std.pap; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import com.att.research.xacml.api.pap.PDPPIPConfig; +import com.att.research.xacml.api.pap.PDPPolicy; +import com.att.research.xacml.api.pap.PDPStatus.Status; + import java.util.HashSet; import java.util.Set; + import org.junit.Test; import org.onap.policy.xacml.std.pap.StdPDPPIPConfig; import org.onap.policy.xacml.std.pap.StdPDPPolicy; import org.onap.policy.xacml.std.pap.StdPDPStatus; -import com.att.research.xacml.api.pap.PDPPIPConfig; -import com.att.research.xacml.api.pap.PDPPolicy; -import com.att.research.xacml.api.pap.PDPStatus.Status; public class StdPDPStatusTest { @@ -179,13 +185,13 @@ public class StdPDPStatusTest { @Test public void testSet() { - Status status = Status.UP_TO_DATE; - Set failedPIPConfigs = new HashSet<>(); - failedPIPConfigs.add(new StdPDPPIPConfig()); + final Status status = Status.UP_TO_DATE; + Set failedPipConfigs = new HashSet<>(); + failedPipConfigs.add(new StdPDPPIPConfig()); Set failedPolicies = new HashSet<>(); failedPolicies.add(new StdPDPPolicy()); - Set loadedPIPConfigs = new HashSet<>(); - loadedPIPConfigs.add(new StdPDPPIPConfig()); + Set loadedPipConfigs = new HashSet<>(); + loadedPipConfigs.add(new StdPDPPIPConfig()); Set loadedPolicies = new HashSet<>(); loadedPolicies.add(new StdPDPPolicy()); Set loadedRootPolicies = new HashSet<>(); @@ -196,48 +202,38 @@ public class StdPDPStatusTest { loadWarnings.add("An error"); stdPDPStatus.setStatus(status); - stdPDPStatus.setFailedPipConfigs(failedPIPConfigs); + stdPDPStatus.setFailedPipConfigs(failedPipConfigs); stdPDPStatus.setFailedPolicies(failedPolicies); - stdPDPStatus.setLoadedPipConfigs(loadedPIPConfigs); + stdPDPStatus.setLoadedPipConfigs(loadedPipConfigs); stdPDPStatus.setLoadedPolicies(loadedPolicies); stdPDPStatus.setLoadedRootPolicies(loadedRootPolicies); stdPDPStatus.setLoadErrors(loadErrors); stdPDPStatus.setLoadWarnings(loadWarnings); - StdPDPStatus stdPDPStatus1 = new StdPDPStatus(); - stdPDPStatus1.set(stdPDPStatus); - - assertEquals(status, stdPDPStatus1.getStatus()); - assertEquals(loadErrors, stdPDPStatus1.getLoadErrors()); - assertEquals(loadWarnings, stdPDPStatus1.getLoadWarnings()); - assertEquals(loadedPolicies, stdPDPStatus1.getLoadedPolicies()); - assertEquals(loadedRootPolicies, stdPDPStatus1.getLoadedRootPolicies()); - assertEquals(failedPolicies, stdPDPStatus1.getFailedPolicies()); - assertEquals(loadedPIPConfigs, stdPDPStatus1.getLoadedPipConfigs()); - assertEquals(failedPIPConfigs, stdPDPStatus1.getFailedPipConfigs()); - - assertEquals( - "StdPDPStatus [status=UP_TO_DATE, loadErrors=[An error], loadWarnings=[An error]," - + " loadedPolicies=[StdPDPPolicy [id=null, name=null, policyId=null, description=null," - + " version=, isRoot=false, isValid=false, location=null]]," - + " loadedRootPolicies=[StdPDPPolicy [id=null, name=null, policyId=null, description=null," - + " version=, isRoot=false, isValid=false, location=null]]," - + " failedPolicies=[StdPDPPolicy [id=null, name=null, policyId=null, description=null," - + " version=, isRoot=false, isValid=false, location=null]], loadedPIPConfigs=[StdPDPPIPConfig" - + " [id=null, name=null, description=null, classname=null, config={}]], failedPIPConfigs=" - + "[StdPDPPIPConfig [id=null, name=null, description=null, classname=null, config={}]]]", - stdPDPStatus1.toString()); + StdPDPStatus stdPdpStatus1 = new StdPDPStatus(); + stdPdpStatus1.set(stdPDPStatus); + + assertEquals(status, stdPdpStatus1.getStatus()); + assertEquals(loadErrors, stdPdpStatus1.getLoadErrors()); + assertEquals(loadWarnings, stdPdpStatus1.getLoadWarnings()); + assertEquals(loadedPolicies, stdPdpStatus1.getLoadedPolicies()); + assertEquals(loadedRootPolicies, stdPdpStatus1.getLoadedRootPolicies()); + assertEquals(failedPolicies, stdPdpStatus1.getFailedPolicies()); + assertEquals(loadedPipConfigs, stdPdpStatus1.getLoadedPipConfigs()); + assertEquals(failedPipConfigs, stdPdpStatus1.getFailedPipConfigs()); + + assertTrue(stdPdpStatus1.toString().startsWith("StdPDPStatus")); } @Test public void testEqualsAndHashCode() { - Status status = Status.UP_TO_DATE; - Set failedPIPConfigs = new HashSet<>(); - failedPIPConfigs.add(new StdPDPPIPConfig()); + final Status status = Status.UP_TO_DATE; + Set failedPipConfigs = new HashSet<>(); + failedPipConfigs.add(new StdPDPPIPConfig()); Set failedPolicies = new HashSet<>(); failedPolicies.add(new StdPDPPolicy()); - Set loadedPIPConfigs = new HashSet<>(); - loadedPIPConfigs.add(new StdPDPPIPConfig()); + Set loadedPipConfigs = new HashSet<>(); + loadedPipConfigs.add(new StdPDPPIPConfig()); Set loadedPolicies = new HashSet<>(); loadedPolicies.add(new StdPDPPolicy()); Set loadedRootPolicies = new HashSet<>(); @@ -247,57 +243,57 @@ public class StdPDPStatusTest { Set loadWarnings = new HashSet<>(); loadWarnings.add("An error"); - StdPDPStatus stdPDPStatus1 = new StdPDPStatus(); + StdPDPStatus stdPdpStatus1 = new StdPDPStatus(); - assertTrue(stdPDPStatus.equals(stdPDPStatus1)); + assertTrue(stdPDPStatus.equals(stdPdpStatus1)); stdPDPStatus.setStatus(status); - assertFalse(stdPDPStatus.equals(stdPDPStatus1)); - stdPDPStatus1.setStatus(status); - assertTrue(stdPDPStatus.equals(stdPDPStatus1)); - assertEquals(stdPDPStatus.hashCode(), stdPDPStatus1.hashCode()); + assertFalse(stdPDPStatus.equals(stdPdpStatus1)); + stdPdpStatus1.setStatus(status); + assertTrue(stdPDPStatus.equals(stdPdpStatus1)); + assertEquals(stdPDPStatus.hashCode(), stdPdpStatus1.hashCode()); - stdPDPStatus.setFailedPipConfigs(failedPIPConfigs); - assertFalse(stdPDPStatus.equals(stdPDPStatus1)); - stdPDPStatus1.setFailedPipConfigs(failedPIPConfigs); - assertTrue(stdPDPStatus.equals(stdPDPStatus1)); - assertEquals(stdPDPStatus.hashCode(), stdPDPStatus1.hashCode()); + stdPDPStatus.setFailedPipConfigs(failedPipConfigs); + assertFalse(stdPDPStatus.equals(stdPdpStatus1)); + stdPdpStatus1.setFailedPipConfigs(failedPipConfigs); + assertTrue(stdPDPStatus.equals(stdPdpStatus1)); + assertEquals(stdPDPStatus.hashCode(), stdPdpStatus1.hashCode()); stdPDPStatus.setFailedPolicies(failedPolicies); - assertFalse(stdPDPStatus.equals(stdPDPStatus1)); - stdPDPStatus1.setFailedPolicies(failedPolicies); - assertTrue(stdPDPStatus.equals(stdPDPStatus1)); - assertEquals(stdPDPStatus.hashCode(), stdPDPStatus1.hashCode()); + assertFalse(stdPDPStatus.equals(stdPdpStatus1)); + stdPdpStatus1.setFailedPolicies(failedPolicies); + assertTrue(stdPDPStatus.equals(stdPdpStatus1)); + assertEquals(stdPDPStatus.hashCode(), stdPdpStatus1.hashCode()); - stdPDPStatus.setLoadedPipConfigs(loadedPIPConfigs); - assertFalse(stdPDPStatus.equals(stdPDPStatus1)); - stdPDPStatus1.setLoadedPipConfigs(loadedPIPConfigs); - assertTrue(stdPDPStatus.equals(stdPDPStatus1)); - assertEquals(stdPDPStatus.hashCode(), stdPDPStatus1.hashCode()); + stdPDPStatus.setLoadedPipConfigs(loadedPipConfigs); + assertFalse(stdPDPStatus.equals(stdPdpStatus1)); + stdPdpStatus1.setLoadedPipConfigs(loadedPipConfigs); + assertTrue(stdPDPStatus.equals(stdPdpStatus1)); + assertEquals(stdPDPStatus.hashCode(), stdPdpStatus1.hashCode()); stdPDPStatus.setLoadedPolicies(loadedPolicies); - assertFalse(stdPDPStatus.equals(stdPDPStatus1)); - stdPDPStatus1.setLoadedPolicies(loadedPolicies); - assertTrue(stdPDPStatus.equals(stdPDPStatus1)); - assertEquals(stdPDPStatus.hashCode(), stdPDPStatus1.hashCode()); + assertFalse(stdPDPStatus.equals(stdPdpStatus1)); + stdPdpStatus1.setLoadedPolicies(loadedPolicies); + assertTrue(stdPDPStatus.equals(stdPdpStatus1)); + assertEquals(stdPDPStatus.hashCode(), stdPdpStatus1.hashCode()); stdPDPStatus.setLoadedRootPolicies(loadedRootPolicies); - assertFalse(stdPDPStatus.equals(stdPDPStatus1)); - stdPDPStatus1.setLoadedRootPolicies(loadedRootPolicies); - assertTrue(stdPDPStatus.equals(stdPDPStatus1)); - assertEquals(stdPDPStatus.hashCode(), stdPDPStatus1.hashCode()); + assertFalse(stdPDPStatus.equals(stdPdpStatus1)); + stdPdpStatus1.setLoadedRootPolicies(loadedRootPolicies); + assertTrue(stdPDPStatus.equals(stdPdpStatus1)); + assertEquals(stdPDPStatus.hashCode(), stdPdpStatus1.hashCode()); stdPDPStatus.setLoadErrors(loadErrors); - assertFalse(stdPDPStatus.equals(stdPDPStatus1)); - stdPDPStatus1.setLoadErrors(loadErrors); - assertTrue(stdPDPStatus.equals(stdPDPStatus1)); - assertEquals(stdPDPStatus.hashCode(), stdPDPStatus1.hashCode()); + assertFalse(stdPDPStatus.equals(stdPdpStatus1)); + stdPdpStatus1.setLoadErrors(loadErrors); + assertTrue(stdPDPStatus.equals(stdPdpStatus1)); + assertEquals(stdPDPStatus.hashCode(), stdPdpStatus1.hashCode()); stdPDPStatus.setLoadWarnings(loadWarnings); - assertFalse(stdPDPStatus.equals(stdPDPStatus1)); - stdPDPStatus1.setLoadWarnings(loadWarnings); - assertTrue(stdPDPStatus.equals(stdPDPStatus1)); - assertEquals(stdPDPStatus.hashCode(), stdPDPStatus1.hashCode()); + assertFalse(stdPDPStatus.equals(stdPdpStatus1)); + stdPdpStatus1.setLoadWarnings(loadWarnings); + assertTrue(stdPDPStatus.equals(stdPdpStatus1)); + assertEquals(stdPDPStatus.hashCode(), stdPdpStatus1.hashCode()); } @Test diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPTest.java index 0beb28275..75ebe4801 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -28,17 +28,20 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; + +import com.att.research.xacml.api.pap.PDPPIPConfig; +import com.att.research.xacml.api.pap.PDPPolicy; + import java.util.HashSet; import java.util.Properties; import java.util.Set; + import org.junit.Before; import org.junit.Test; import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; import org.onap.policy.xacml.std.pap.StdPDP; import org.onap.policy.xacml.std.pap.StdPDPStatus; -import com.att.research.xacml.api.pap.PDPPIPConfig; -import com.att.research.xacml.api.pap.PDPPolicy; public class StdPDPTest { @@ -116,7 +119,7 @@ public class StdPDPTest { } @Test - public void testPDP() { + public void testPdp() { // Set up test data String id = "testID"; String value = "testVal"; @@ -124,8 +127,8 @@ public class StdPDPTest { props.setProperty(id + ".name", value); props.setProperty(id + ".description", value); props.setProperty(id + ".jmxport", "0"); - Set pipConfigs = new HashSet(); - Set policies = new HashSet(); + props.setProperty(id + ".foo", "0"); + props.setProperty("foo" + ".jmxport", "0"); // Test constructors StdPDP pdp = new StdPDP(id, 0); @@ -138,8 +141,12 @@ public class StdPDPTest { assertNotNull(pdp4); StdPDP pdp5 = new StdPDP(id, props); assertNotNull(pdp5); + StdPDP pdp6 = new StdPDP(id, value, value, null); + assertNotNull(pdp6); // Test set and get + Set pipConfigs = new HashSet(); + Set policies = new HashSet(); pdp.setPipConfigs(pipConfigs); assertEquals(pipConfigs, pdp.getPipConfigs()); pdp.setPolicies(policies); diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pip/engines/OperationHistoryEngineTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pip/engines/OperationHistoryEngineTest.java index 2b43ce753..fb90ab379 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pip/engines/OperationHistoryEngineTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pip/engines/OperationHistoryEngineTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -23,9 +23,7 @@ package org.onap.policy.xacml.test.std.pip.engines; import static org.junit.Assert.assertEquals; -import java.util.Collection; -import org.junit.Test; -import org.onap.policy.xacml.std.pip.engines.OperationHistoryEngine; + import com.att.research.xacml.api.Attribute; import com.att.research.xacml.api.pip.PIPException; import com.att.research.xacml.api.pip.PIPRequest; @@ -33,6 +31,11 @@ import com.att.research.xacml.api.pip.PIPResponse; import com.att.research.xacml.std.StdMutableAttribute; import com.att.research.xacml.std.pip.StdPIPRequest; +import java.util.Collection; + +import org.junit.Test; +import org.onap.policy.xacml.std.pip.engines.OperationHistoryEngine; + public class OperationHistoryEngineTest { @Test public void testBaseNegativeCase() throws PIPException { diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/AAFEngineTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/AAFEngineTest.java index 319198e69..703541db3 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/AAFEngineTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/AAFEngineTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -19,21 +19,25 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.policy.xacml.test.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.util.Properties; -import org.junit.Test; -import org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine; + +import com.att.research.xacml.api.XACML3; import com.att.research.xacml.api.pip.PIPFinder; import com.att.research.xacml.api.pip.PIPRequest; import com.att.research.xacml.api.pip.PIPResponse; import com.att.research.xacml.std.pip.StdPIPFinderFactory; import com.att.research.xacml.std.pip.StdPIPRequest; import com.att.research.xacml.util.XACMLProperties; -import com.att.research.xacml.api.XACML3; + +import java.util.Properties; + +import org.junit.Test; +import org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine; public class AAFEngineTest { @Test @@ -54,8 +58,8 @@ public class AAFEngineTest { assertEquals(aafEngine.attributesProvided().size(), 2); assertEquals(aafEngine.attributesRequired().size(), 5); - PIPRequest pipRequest = new StdPIPRequest(XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE, - AAFEngine.AAF_RESPONSE_ID, XACML3.ID_DATATYPE_STRING); + PIPRequest pipRequest = new StdPIPRequest(XACML3.ID_ATTRIBUTE_CATEGORY_RESOURCE, AAFEngine.AAF_RESPONSE_ID, + XACML3.ID_DATATYPE_STRING); StdPIPFinderFactory pipFactory = new StdPIPFinderFactory(); PIPFinder pipFinder = pipFactory.getFinder(); assertEquals(pipFinder.getPIPEngines().size(), 0); diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/MetricsUtilTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/MetricsUtilTest.java index 291bae808..17d9c249d 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/MetricsUtilTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/MetricsUtilTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -19,9 +19,11 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.policy.xacml.test.util; import static org.junit.Assert.*; + import org.junit.Test; import org.onap.policy.xacml.util.MetricsUtil; diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/XACMLPolicyScannerTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/XACMLPolicyScannerTest.java index 0270a8901..08d899949 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/XACMLPolicyScannerTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/XACMLPolicyScannerTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -19,20 +19,38 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.policy.xacml.test.util; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import com.att.research.xacml.api.Advice; +import com.att.research.xacml.api.Attribute; +import com.att.research.xacml.api.Obligation; +import com.att.research.xacml.util.XACMLPolicyScanner.Callback; +import com.att.research.xacml.util.XACMLPolicyScanner.CallbackResult; import java.io.File; import java.io.IOException; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.List; +import oasis.names.tc.xacml._3_0.core.schema.wd_17.AdviceExpressionType; +import oasis.names.tc.xacml._3_0.core.schema.wd_17.ConditionType; +import oasis.names.tc.xacml._3_0.core.schema.wd_17.IdReferenceType; +import oasis.names.tc.xacml._3_0.core.schema.wd_17.ObligationExpressionType; +import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicySetType; +import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType; +import oasis.names.tc.xacml._3_0.core.schema.wd_17.RuleType; +import oasis.names.tc.xacml._3_0.core.schema.wd_17.VariableDefinitionType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.junit.Test; import org.onap.policy.xacml.util.XACMLPolicyScanner; -import com.att.research.xacml.util.XACMLPolicyScanner.Callback; public class XACMLPolicyScannerTest { @@ -40,16 +58,17 @@ public class XACMLPolicyScannerTest { private static Path configPolicyPathValue; private static Path actionPolicyPathValue; + /** + * setUp. + */ @Before public void setUp() { File templateFile; ClassLoader classLoader = getClass().getClassLoader(); try { - templateFile = - new File(classLoader.getResource("Config_SampleTest1206.1.xml").getFile()); + templateFile = new File(classLoader.getResource("Config_SampleTest1206.1.xml").getFile()); configPolicyPathValue = templateFile.toPath(); - templateFile = - new File(classLoader.getResource("Action_TestActionPolicy.1.xml").getFile()); + templateFile = new File(classLoader.getResource("Action_TestActionPolicy.1.xml").getFile()); actionPolicyPathValue = templateFile.toPath(); } catch (Exception e1) { logger.error("Exception Occured" + e1); @@ -60,11 +79,10 @@ public class XACMLPolicyScannerTest { public void xacmlPolicyScannerTest() throws IOException { Callback callback = null; try { - XACMLPolicyScanner actionScanner = - new XACMLPolicyScanner(actionPolicyPathValue, callback); - assertTrue(actionScanner.getPolicyObject() != null); + XACMLPolicyScanner actionScanner = new XACMLPolicyScanner(actionPolicyPathValue, callback); + assertNotNull(actionScanner.getPolicyObject()); Object actionObject = actionScanner.scan(); - assertTrue(actionObject != null); + assertNotNull(actionObject); XACMLPolicyScanner scanner = new XACMLPolicyScanner(configPolicyPathValue, callback); assertTrue(scanner.getPolicyObject() != null); @@ -76,8 +94,7 @@ public class XACMLPolicyScannerTest { assertTrue(version.equals("1")); String versionFromPath = XACMLPolicyScanner.getVersion(configPolicyPathValue); assertTrue(versionFromPath.equals("1")); - List returnValue = - XACMLPolicyScanner.getCreatedByModifiedBy(configPolicyPathValue); + List returnValue = XACMLPolicyScanner.getCreatedByModifiedBy(configPolicyPathValue); assertTrue(returnValue.get(0).equals("test")); String createdBy = XACMLPolicyScanner.getCreatedBy(configPolicyPathValue); assertTrue(createdBy.equals("test")); @@ -88,4 +105,143 @@ public class XACMLPolicyScannerTest { logger.error("Exception Occured" + e); } } + + @Test + public void badPolicies() throws IOException { + Path unknown = Paths.get("foobar.xml"); + XACMLPolicyScanner scanner = new XACMLPolicyScanner(unknown, null); + assertNull(scanner.getPolicyObject()); + assertNull(scanner.scan()); + + assertThatExceptionOfType(IOException.class).isThrownBy(() -> { + XACMLPolicyScanner.getVersion(unknown); + }); + + Path logback = Paths.get("logback-test.xml"); + scanner = new XACMLPolicyScanner(logback, null); + } + + @Test + public void testRest() { + PolicySetType policySet = new PolicySetType(); + policySet.setPolicySetId("id1"); + policySet.setVersion("v1"); + XACMLPolicyScanner scanner = new XACMLPolicyScanner(policySet); + assertNotNull(scanner); + assertEquals(policySet, scanner.getPolicyObject()); + assertEquals(policySet.getPolicySetId(), XACMLPolicyScanner.getID(policySet)); + assertEquals(policySet.getVersion(), XACMLPolicyScanner.getVersion(policySet)); + + scanner.setCallback(new TestCallback(CallbackResult.CONTINUE)); + assertEquals(policySet, scanner.scan()); + assertEquals(policySet, scanner.scan(new TestCallback(CallbackResult.CONTINUE))); + assertEquals(policySet, scanner.scan(new TestCallback(CallbackResult.STOP))); + + PolicyType policy = new PolicyType(); + policy.setPolicyId("id2"); + policy.setVersion("v2"); + scanner = new XACMLPolicyScanner(policy); + assertNotNull(scanner); + assertEquals(policy, scanner.getPolicyObject()); + assertEquals(policy.getPolicyId(), XACMLPolicyScanner.getID(policy)); + assertEquals(policy.getVersion(), XACMLPolicyScanner.getVersion(policy)); + policy.setVersion(null); + assertNull(XACMLPolicyScanner.getVersion(policy)); + + assertNull(XACMLPolicyScanner.getID(new String())); + assertNull(XACMLPolicyScanner.getVersion(new String())); + + } + + @Test + public void testPolicySet() { + PolicySetType policySet = new PolicySetType(); + policySet.setPolicySetId("id1"); + policySet.setVersion("v1"); + + } + + class TestCallback implements Callback { + + CallbackResult begin = CallbackResult.CONTINUE; + + TestCallback(CallbackResult onBegin) { + begin = onBegin; + } + + @Override + public CallbackResult onBeginScan(Object root) { + return begin; + } + + @Override + public void onFinishScan(Object root) { + } + + @Override + public CallbackResult onPreVisitPolicySet(PolicySetType parent, PolicySetType policySet) { + return CallbackResult.CONTINUE; + } + + @Override + public CallbackResult onPostVisitPolicySet(PolicySetType parent, PolicySetType policySet) { + return CallbackResult.CONTINUE; + } + + @Override + public CallbackResult onPreVisitPolicy(PolicySetType parent, PolicyType policy) { + return CallbackResult.CONTINUE; + } + + @Override + public CallbackResult onPostVisitPolicy(PolicySetType parent, PolicyType policy) { + return CallbackResult.CONTINUE; + } + + @Override + public CallbackResult onPreVisitRule(PolicyType parent, RuleType rule) { + return CallbackResult.CONTINUE; + } + + @Override + public CallbackResult onPostVisitRule(PolicyType parent, RuleType rule) { + return CallbackResult.CONTINUE; + } + + @Override + public CallbackResult onAttribute(Object parent, Object container, Attribute attribute) { + return CallbackResult.CONTINUE; + } + + @Override + public CallbackResult onObligation(Object parent, ObligationExpressionType expression, Obligation obligation) { + return CallbackResult.CONTINUE; + } + + @Override + public CallbackResult onAdvice(Object parent, AdviceExpressionType expression, Advice advice) { + return CallbackResult.CONTINUE; + } + + @Override + public CallbackResult onVariable(PolicyType policy, VariableDefinitionType variable) { + return CallbackResult.CONTINUE; + } + + @Override + public CallbackResult onCondition(RuleType rule, ConditionType condition) { + return CallbackResult.CONTINUE; + } + + @Override + public CallbackResult onPolicySetIdReference(IdReferenceType reference, PolicySetType parent) { + return CallbackResult.CONTINUE; + } + + @Override + public CallbackResult onPolicyIdReference(IdReferenceType reference, PolicySetType parent) { + return CallbackResult.CONTINUE; + } + + } } diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/XACMLPolicyWriterTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/XACMLPolicyWriterTest.java index 4cf40a315..1ec1616ef 100644 --- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/XACMLPolicyWriterTest.java +++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/XACMLPolicyWriterTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP-XACML * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Modifications Copyright (C) 2019 Samsung * ================================================================================ @@ -19,22 +19,26 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package org.onap.policy.xacml.test.util; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; + import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.OutputStream; import java.nio.file.Path; + +import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicySetType; +import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.junit.Test; import org.onap.policy.xacml.util.XACMLPolicyWriter; -import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicySetType; -import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType; public class XACMLPolicyWriterTest { private static final Log logger = LogFactory.getLog(XACMLPolicyWriterTest.class); @@ -46,11 +50,9 @@ public class XACMLPolicyWriterTest { File templateFile; ClassLoader classLoader = getClass().getClassLoader(); try { - templateFile = - new File(classLoader.getResource("Config_SampleTest1206.1.xml").getFile()); + templateFile = new File(classLoader.getResource("Config_SampleTest1206.1.xml").getFile()); configPolicyPathValue = templateFile.toPath(); - templateFile = - new File(classLoader.getResource("Action_TestActionPolicy.1.xml").getFile()); + templateFile = new File(classLoader.getResource("Action_TestActionPolicy.1.xml").getFile()); actionPolicyPathValue = templateFile.toPath(); } catch (Exception e1) { logger.error("Exception Occured" + e1); @@ -61,11 +63,9 @@ public class XACMLPolicyWriterTest { @Test public void xacmlPolicyWriterTest() throws IOException { XACMLPolicyWriter writer = new XACMLPolicyWriter(); - String configResponseValue = - writer.changeFileNameInXmlWhenRenamePolicy(configPolicyPathValue); + String configResponseValue = writer.changeFileNameInXmlWhenRenamePolicy(configPolicyPathValue); assertTrue(configResponseValue.equals("txt")); - String actionResponseValue = - writer.changeFileNameInXmlWhenRenamePolicy(actionPolicyPathValue); + String actionResponseValue = writer.changeFileNameInXmlWhenRenamePolicy(actionPolicyPathValue); assertTrue(actionResponseValue.equals("json")); } -- cgit 1.2.3-korg