Removed TestUtils from common and into a 'xacml-test' project

Issue-ID: POLICY-2090
Change-Id: Id688e305f878f56e374e6bd9047d9d6c75fbe0c6
Signed-off-by: Ali Hockla <ah999m@att.com>

2 files changed, 1 insertions, 89 deletions

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 @@
             <groupId>org.onap.policy.common</groupId>
             <artifactId>utils-test</artifactId>
             <version>${policy.common.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.att.research.xacml</groupId>
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<ToscaPolicy> loadPolicies(String resourceFile, XacmlApplicationServiceProvider service)
-            throws CoderException, XacmlApplicationException {
-        //
-        // Our return object
-        //
-        List<ToscaPolicy> 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<String, ToscaPolicy> 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;
-    }
-
-}