2 files changed, 6 insertions, 117 deletions
diff --git a/common-be/pom.xml b/common-be/pom.xml
index 1fc89df6b6..d498df4c86 100644
--- a/common-be/pom.xml
+++ b/common-be/pom.xml
@@ -205,6 +205,12 @@
             <artifactId>openecomp-common-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.openecomp.sdc.be</groupId>
+            <artifactId>common-be-tests-utils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -218,7 +224,6 @@
                         <phase>package</phase>
                         <goals>
                             <goal>jar</goal>
-                            <goal>test-jar</goal>
                         </goals>
                     </execution>
                 </executions>
diff --git a/common-be/src/test/java/org/openecomp/sdc/be/test/util/TestResourcesHandler.java b/common-be/src/test/java/org/openecomp/sdc/be/test/util/TestResourcesHandler.java
deleted file mode 100644
index 2e3b906a5d..0000000000
--- a/common-be/src/test/java/org/openecomp/sdc/be/test/util/TestResourcesHandler.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation
- *  ================================================================================
- *  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.openecomp.sdc.be.test.util;
-
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Path;
-
-import static org.junit.Assert.fail;
-
-/**
- * Util class for handling test resources.
- */
-public class TestResourcesHandler {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TestResourcesHandler.class);
-
-    private TestResourcesHandler() {
-
-    }
-
-    /**
-     * Gets the input stream of a resource file
-     *
-     * @param resourcePath      The resource file path
-     * @return
-     *  The resource input stream
-     */
-    public static InputStream getResourceAsStream(final String resourcePath) {
-        return Thread.currentThread().getContextClassLoader().getResourceAsStream(resourcePath);
-    }
-
-    public static InputStream getResourceAsStream(final Path resourcePath) {
-        return getResourceAsStream(resourcePath.toString());
-    }
-
-    /**
-     * Reads a file and coverts it to a byte array.
-     *
-     * @param resourcePath      The resource file path
-     * @return
-     *  The resource file byte array
-     * @throws IOException
-     *  When the file was not found or the input stream could not be opened
-     */
-    public static byte[] getResourceAsByteArray(final String resourcePath) throws IOException {
-        try(final InputStream inputStream = getResourceAsStream(resourcePath)) {
-            if (inputStream == null) {
-                throw new IOException(String.format("Could not find the resource on path \"%s\"", resourcePath));
-            }
-            return IOUtils.toByteArray(inputStream);
-        } catch (final IOException ex) {
-            throw new IOException(String.format("Could not open the input stream for resource on path \"%s\"", resourcePath), ex);
-        }
-    }
-
-    public static byte[] getResourceAsByteArray(final Path resourcePath) throws IOException {
-        return getResourceAsByteArray(resourcePath.toString());
-    }
-
-    /**
-     * Reads a file in the given path.
-     * The method forces an assertion fail if the resource could not be loaded.
-     * @param resourcePath      The resource file path
-     * @return
-     *  The resource file byte array
-     */
-    public static byte[] getResourceBytesOrFail(final String resourcePath) {
-        try {
-            return getResourceAsByteArray(resourcePath);
-        } catch (final IOException e) {
-            final String errorMsg = String.format("Could not load resource '%s'", resourcePath);
-            LOGGER.error(errorMsg, e);
-            fail(errorMsg);
-        }
-
-        return null;
-    }
-
-    public static byte[] getResourceBytesOrFail(final Path resourcePath) {
-        return getResourceBytesOrFail(resourcePath.toString());
-    }
-
-    /**
-     * Gets the input stream of a resource file
-     *
-     * @param resourcePath      The resource file path
-     * @return
-     *  The resource input stream
-     */
-    public static URL getFileUrl(final String resourcePath) {
-        return Thread.currentThread().getContextClassLoader().getResource(resourcePath);
-    }
-}