From f5d816a73354bdc9954607d35e19e3505c6e4a7a Mon Sep 17 00:00:00 2001 From: sebdet Date: Mon, 24 Aug 2020 15:37:33 +0200 Subject: [PATCH] Add sdc startup in IT Rework the storage folder for extentReport and outputCsar so they not created outside the maven target folder Issue-ID: SDC-3232 Signed-off-by: sebdet Change-Id: Ice1139ce141f4b8cf593cd9bdd68dc0ecf0453bf --- .../test/java/org/onap/sdc/backend/ci/tests/api/ComponentBaseTest.java | 2 +- .../java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java | 2 +- .../java/org/onap/sdc/backend/ci/tests/utils/rest/AssetRestUtils.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ComponentBaseTest.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ComponentBaseTest.java index e9986db4ae..71c8db0f8e 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ComponentBaseTest.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ComponentBaseTest.java @@ -68,7 +68,7 @@ public abstract class ComponentBaseTest { protected static Logger logger = LogManager.getLogger(ComponentBaseTest.class); - protected static final String REPORT_FOLDER = "." + File.separator + "ExtentReport" + File.separator; + protected static final String REPORT_FOLDER = "target" + File.separator + "ExtentReport" + File.separator; private static final String REPORT_FILE_NAME = "SDC_CI_Extent_Report.html"; public static Config config; protected static ITestContext myContext; diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java index f26ff94b15..5cb55fd91c 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java @@ -467,7 +467,7 @@ public class FileHandling { public static void overWriteExistindDir(String outputCsar) throws IOException { String basePath = getBasePath(); - String csarDir = FileHandling.getCreateDirByName("outputCsar"); + String csarDir = FileHandling.getCreateDirByName("target/outputCsar"); FileUtils.cleanDirectory(new File(csarDir)); } } diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/AssetRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/AssetRestUtils.java index 3e2eb09639..506733c398 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/AssetRestUtils.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/AssetRestUtils.java @@ -98,7 +98,7 @@ public class AssetRestUtils extends BaseRestUtils { if(fileName.isEmpty()) { myFile = new File("tmpCSAR"); } else { - String csarDir = FileHandling.getCreateDirByName("outputCsar"); + String csarDir = FileHandling.getCreateDirByName("target/outputCsar"); myFile = new File(csarDir+ File.separator + "tmpCSAR_" + fileName + ".csar"); } -- 2.16.6