summaryrefslogtreecommitdiffstats
path: root/ui-ci/src/main
diff options
context:
space:
mode:
authorYuli Shlosberg <ys9693@att.com>2018-03-21 11:14:08 +0200
committerTal Gitelman <tg851x@intl.att.com>2018-03-21 12:21:21 +0000
commitf59a22539d5b372e2425c39963547985379d6990 (patch)
treefafd5663ab0e1a2b29049712b07717fcf6f8f509 /ui-ci/src/main
parentbe00af7a2e0dc8dc2d5f8fbf03d778a8f632c4fb (diff)
new ui sanity docker
Change-Id: I257c198c563771b5badcf36a479cb499f841682f Issue-ID: SDC-995 Signed-off-by: Yuli Shlosberg <ys9693@att.com>
Diffstat (limited to 'ui-ci/src/main')
-rw-r--r--ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java4
-rw-r--r--ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java2
-rw-r--r--ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml23
3 files changed, 27 insertions, 2 deletions
diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java
index 2e05c2c059..2dcab070ef 100644
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/setup/SetupCDTest.java
@@ -102,6 +102,7 @@ public abstract class SetupCDTest extends DriverFactory {
/**************** PRIVATES ****************/
private static String url;
+ private static boolean uiSimulator;
private static boolean localEnv = true;
private static OnboardCSVReport csvReport;
private static Map<?, ?> credentials;
@@ -301,11 +302,12 @@ public abstract class SetupCDTest extends DriverFactory {
protected static String setUrl() {
url = getConfig().getUrl();
+ uiSimulator = getConfig().isUiSimulator();
if (url == null) {
String message = "no URL found";
System.out.println(message);
Assert.fail(message);
- } else if (!url.contains("localhost") && !url.contains("192.168.33.10") && !url.contains("127.0.0.1")) {
+ } else if (!url.contains("localhost") && !url.contains("192.168.33.10") && !url.contains("127.0.0.1") && !url.contains("192.168.50.5") && !uiSimulator==true) {
localEnv = false;
}
return url;
diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java
index d455243227..a9f6cc5c66 100644
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/FileHandling.java
@@ -309,7 +309,7 @@ public class FileHandling {
public static void deleteDirectory(String directoryPath) {
File dir = new File(directoryPath);
try {
- FileUtils.deleteDirectory(dir);
+ FileUtils.cleanDirectory(dir);
} catch (IOException e) {
System.out.println("Failed to delete " + dir);
SetupCDTest.getExtendTest().log(Status.INFO, "Failed to delete " + dir);
diff --git a/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml b/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml
new file mode 100644
index 0000000000..b8d35afaf8
--- /dev/null
+++ b/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="uitests" configfailurepolicy="continue" parallel="methods" thread-count="1" data-provider-thread-count="1">
+
+ <test name="uiSanity">
+ <classes>
+
+ <class name="org.openecomp.sdc.ci.tests.execute.sanity.Vf">
+ <methods>
+ <include name="updateVF"/>
+ </methods>
+ </class>
+
+ <class name="org.openecomp.sdc.ci.tests.execute.sanity.Service">
+ <methods>
+ <include name="updateService"/>
+ </methods>
+ </class>
+
+
+ </classes>
+ </test> <!-- uitests -->
+</suite> <!-- uisuite --> \ No newline at end of file