aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2020-08-24 15:37:33 +0200
committerSébastien Determe <sebastien.determe@intl.att.com>2020-08-24 13:44:42 +0000
commitf5d816a73354bdc9954607d35e19e3505c6e4a7a (patch)
tree3d685adaebbefa6807875a230b701a481b41476e
parentdcda40f7bc372178bb76e0810a90e2f03783754a (diff)
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 <sebastien.determe@intl.att.com> Change-Id: Ice1139ce141f4b8cf593cd9bdd68dc0ecf0453bf
-rw-r--r--integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/api/ComponentBaseTest.java2
-rw-r--r--integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/FileHandling.java2
-rw-r--r--integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/rest/AssetRestUtils.java2
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");
}