From 6f145256b9d9ac6c0e0b6073afb5d1fa178a84a4 Mon Sep 17 00:00:00 2001 From: Ali Hockla Date: Tue, 1 Oct 2019 18:42:04 -0500 Subject: Removed TestUtils from common and into a 'xacml-test' project Issue-ID: POLICY-2090 Change-Id: Id688e305f878f56e374e6bd9047d9d6c75fbe0c6 Signed-off-by: Ali Hockla --- applications/common/pom.xml | 1 + .../pdp/xacml/application/common/TestUtils.java | 89 --------------------- applications/guard/pom.xml | 6 ++ .../pdp/application/guard/CoordinationTest.java | 2 +- .../application/guard/GuardPdpApplicationTest.java | 2 +- applications/monitoring/pom.xml | 6 ++ .../monitoring/MonitoringPdpApplicationTest.java | 2 +- applications/optimization/pom.xml | 6 ++ .../OptimizationPdpApplicationTest.java | 2 +- main/pom.xml | 6 ++ pom.xml | 1 + xacml-test/pom.xml | 47 +++++++++++ .../onap/policy/pdp/xacml/xacmltest/TestUtils.java | 91 ++++++++++++++++++++++ 13 files changed, 168 insertions(+), 93 deletions(-) delete mode 100644 applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/TestUtils.java create mode 100644 xacml-test/pom.xml create mode 100644 xacml-test/src/main/java/org/onap/policy/pdp/xacml/xacmltest/TestUtils.java diff --git a/applications/common/pom.xml b/applications/common/pom.xml index dea04007..bbceefb9 100644 --- a/applications/common/pom.xml +++ b/applications/common/pom.xml @@ -61,6 +61,7 @@ org.onap.policy.common utils-test ${policy.common.version} + test com.att.research.xacml diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/TestUtils.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/TestUtils.java deleted file mode 100644 index 3aa23eee..00000000 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/TestUtils.java +++ /dev/null @@ -1,89 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.pdp.xacml.application.common; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.onap.policy.common.utils.coder.CoderException; -import org.onap.policy.common.utils.coder.StandardYamlCoder; -import org.onap.policy.common.utils.resources.ResourceUtils; -import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; -import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; -import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class TestUtils { - private static final Logger LOGGER = LoggerFactory.getLogger(TestUtils.class); - private static final StandardYamlCoder yamlCoder = new StandardYamlCoder(); - - private TestUtils() { - super(); - } - - /** - * Load the policies from a resource file into the given the application. - * - * @param resourceFile resource file - * @param service XacmlApplicationServiceProvider - * @throws CoderException exception if it cannot be decoded - * @throws XacmlApplicationException If the application cannot load the policy - */ - public static List loadPolicies(String resourceFile, XacmlApplicationServiceProvider service) - throws CoderException, XacmlApplicationException { - // - // Our return object - // - List loadedPolicies = new ArrayList<>(); - // - // Decode it - // - String policyYaml = ResourceUtils.getResourceAsString(resourceFile); - // - // Serialize it into a class - // - ToscaServiceTemplate serviceTemplate = yamlCoder.decode(policyYaml, ToscaServiceTemplate.class); - // - // Make sure all the fields are setup properly - // - JpaToscaServiceTemplate jtst = new JpaToscaServiceTemplate(); - jtst.fromAuthorative(serviceTemplate); - ToscaServiceTemplate completedJtst = jtst.toAuthorative(); - // - // Get the policies - // - for (Map policies : completedJtst.getToscaTopologyTemplate().getPolicies()) { - for (ToscaPolicy policy : policies.values()) { - if (service.loadPolicy(policy)) { - loadedPolicies.add(policy); - } else { - LOGGER.error("Application failed to load policy"); - } - } - } - return loadedPolicies; - } - -} diff --git a/applications/guard/pom.xml b/applications/guard/pom.xml index 68ed7077..233cd0ef 100644 --- a/applications/guard/pom.xml +++ b/applications/guard/pom.xml @@ -47,6 +47,12 @@ h2 test + + org.onap.policy.xacml-pdp + xacml-test + ${project.version} + test + diff --git a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/CoordinationTest.java b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/CoordinationTest.java index b224009a..ecd0fb76 100644 --- a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/CoordinationTest.java +++ b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/CoordinationTest.java @@ -54,12 +54,12 @@ import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.common.utils.resources.TextFileUtils; import org.onap.policy.models.decisions.concepts.DecisionRequest; import org.onap.policy.models.decisions.concepts.DecisionResponse; -import org.onap.policy.pdp.xacml.application.common.TestUtils; import org.onap.policy.pdp.xacml.application.common.XacmlApplicationException; import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider; import org.onap.policy.pdp.xacml.application.common.XacmlPolicyUtils; import org.onap.policy.pdp.xacml.application.common.operationshistory.CountRecentOperationsPip; import org.onap.policy.pdp.xacml.application.common.operationshistory.Dbao; +import org.onap.policy.pdp.xacml.xacmltest.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java index a5c5ff41..4b9db0a3 100644 --- a/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java +++ b/applications/guard/src/test/java/org/onap/policy/xacml/pdp/application/guard/GuardPdpApplicationTest.java @@ -57,12 +57,12 @@ import org.onap.policy.common.utils.resources.TextFileUtils; import org.onap.policy.models.decisions.concepts.DecisionRequest; import org.onap.policy.models.decisions.concepts.DecisionResponse; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier; -import org.onap.policy.pdp.xacml.application.common.TestUtils; import org.onap.policy.pdp.xacml.application.common.XacmlApplicationException; import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider; import org.onap.policy.pdp.xacml.application.common.XacmlPolicyUtils; import org.onap.policy.pdp.xacml.application.common.operationshistory.CountRecentOperationsPip; import org.onap.policy.pdp.xacml.application.common.operationshistory.Dbao; +import org.onap.policy.pdp.xacml.xacmltest.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/applications/monitoring/pom.xml b/applications/monitoring/pom.xml index 12b07939..92ac7cbe 100644 --- a/applications/monitoring/pom.xml +++ b/applications/monitoring/pom.xml @@ -38,6 +38,12 @@ common ${project.version} + + org.onap.policy.xacml-pdp + xacml-test + ${project.version} + test + diff --git a/applications/monitoring/src/test/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplicationTest.java b/applications/monitoring/src/test/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplicationTest.java index e8e143c4..a92ba6f8 100644 --- a/applications/monitoring/src/test/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplicationTest.java +++ b/applications/monitoring/src/test/java/org/onap/policy/xacml/pdp/application/monitoring/MonitoringPdpApplicationTest.java @@ -46,10 +46,10 @@ import org.onap.policy.models.decisions.concepts.DecisionRequest; import org.onap.policy.models.decisions.concepts.DecisionResponse; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier; -import org.onap.policy.pdp.xacml.application.common.TestUtils; import org.onap.policy.pdp.xacml.application.common.XacmlApplicationException; import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider; import org.onap.policy.pdp.xacml.application.common.XacmlPolicyUtils; +import org.onap.policy.pdp.xacml.xacmltest.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/applications/optimization/pom.xml b/applications/optimization/pom.xml index 87002b29..80083643 100644 --- a/applications/optimization/pom.xml +++ b/applications/optimization/pom.xml @@ -43,6 +43,12 @@ common ${project.version} + + org.onap.policy.xacml-pdp + xacml-test + ${project.version} + test + diff --git a/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java b/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java index a356926d..01fd3268 100644 --- a/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java +++ b/applications/optimization/src/test/java/org/onap/policy/xacml/pdp/application/optimization/OptimizationPdpApplicationTest.java @@ -49,10 +49,10 @@ import org.onap.policy.common.utils.resources.TextFileUtils; import org.onap.policy.models.decisions.concepts.DecisionRequest; import org.onap.policy.models.decisions.concepts.DecisionResponse; import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier; -import org.onap.policy.pdp.xacml.application.common.TestUtils; import org.onap.policy.pdp.xacml.application.common.XacmlApplicationException; import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider; import org.onap.policy.pdp.xacml.application.common.XacmlPolicyUtils; +import org.onap.policy.pdp.xacml.xacmltest.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/main/pom.xml b/main/pom.xml index f101ae34..581463a3 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -61,6 +61,12 @@ common ${project.version} + + org.onap.policy.common + utils-test + ${policy.common.version} + test + org.onap.policy.xacml-pdp.applications monitoring diff --git a/pom.xml b/pom.xml index 608feff3..c3f9a796 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,7 @@ applications packages testsuites + xacml-test diff --git a/xacml-test/pom.xml b/xacml-test/pom.xml new file mode 100644 index 00000000..9127f569 --- /dev/null +++ b/xacml-test/pom.xml @@ -0,0 +1,47 @@ + + + + 4.0.0 + + org.onap.policy.xacml-pdp + policy-xacml-pdp + 2.2.0-SNAPSHOT + .. + + + xacml-test + + + + org.onap.policy.xacml-pdp.applications + common + ${project.version} + + + org.onap.policy.common + utils + ${policy.common.version} + + + diff --git a/xacml-test/src/main/java/org/onap/policy/pdp/xacml/xacmltest/TestUtils.java b/xacml-test/src/main/java/org/onap/policy/pdp/xacml/xacmltest/TestUtils.java new file mode 100644 index 00000000..fa7459dc --- /dev/null +++ b/xacml-test/src/main/java/org/onap/policy/pdp/xacml/xacmltest/TestUtils.java @@ -0,0 +1,91 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP + * ================================================================================ + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.pdp.xacml.xacmltest; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.onap.policy.common.utils.coder.CoderException; +import org.onap.policy.common.utils.coder.StandardYamlCoder; +import org.onap.policy.common.utils.resources.ResourceUtils; +import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; +import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; +import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate; +import org.onap.policy.pdp.xacml.application.common.XacmlApplicationException; +import org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class TestUtils { + private static final Logger LOGGER = LoggerFactory.getLogger(TestUtils.class); + private static final StandardYamlCoder yamlCoder = new StandardYamlCoder(); + + private TestUtils() { + super(); + } + + /** + * Load the policies from a resource file into the given the application. + * + * @param resourceFile resource file + * @param service XacmlApplicationServiceProvider + * @throws CoderException exception if it cannot be decoded + * @throws XacmlApplicationException If the application cannot load the policy + */ + public static List loadPolicies(String resourceFile, XacmlApplicationServiceProvider service) + throws CoderException, XacmlApplicationException { + // + // Our return object + // + List loadedPolicies = new ArrayList<>(); + // + // Decode it + // + String policyYaml = ResourceUtils.getResourceAsString(resourceFile); + // + // Serialize it into a class + // + ToscaServiceTemplate serviceTemplate = yamlCoder.decode(policyYaml, ToscaServiceTemplate.class); + // + // Make sure all the fields are setup properly + // + JpaToscaServiceTemplate jtst = new JpaToscaServiceTemplate(); + jtst.fromAuthorative(serviceTemplate); + ToscaServiceTemplate completedJtst = jtst.toAuthorative(); + // + // Get the policies + // + for (Map policies : completedJtst.getToscaTopologyTemplate().getPolicies()) { + for (ToscaPolicy policy : policies.values()) { + if (service.loadPolicy(policy)) { + loadedPolicies.add(policy); + } else { + LOGGER.error("Application failed to load policy"); + } + } + } + return loadedPolicies; + } + +} \ No newline at end of file -- cgit 1.2.3-korg