From f4dff328c0386c8901b5841943b11f0c13b3169f Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 8 Jul 2019 15:46:44 +0300 Subject: Merge from ecomp 718fd196 - Integration Tests Issue-ID: VID-378 Change-Id: Icc0bdb9ef37b1d429d47c2070f76d1ee63ad7489 Signed-off-by: Ittay Stern --- .../src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java | 1 + .../main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java | 1 - .../java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java | 1 - .../java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java | 6 +----- .../java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java | 2 -- .../main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java | 1 - .../src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java | 1 - .../main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java | 4 ++++ 8 files changed, 6 insertions(+), 11 deletions(-) (limited to 'vid-automation/src/main/java/org/onap/sdc/ci') diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java index f85225f36..987e09e61 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java @@ -26,6 +26,7 @@ import java.io.InputStreamReader; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.apache.commons.codec.binary.Base64; import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java index 4f831b187..bc62e6673 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java @@ -53,7 +53,6 @@ import org.apache.http.entity.mime.content.StringBody; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; -import org.onap.sdc.ci.tests.datatypes.http.RestResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java index e8c386bb2..b7f6dfa9e 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java @@ -22,7 +22,6 @@ package org.onap.sdc.ci.tests.execute.setup; import java.io.File; -import java.io.FileNotFoundException; import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java index 501faa8de..95443bf0b 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java @@ -93,11 +93,7 @@ public class WebDriverThread { cap.setCapability("browserName","firefox"); cap.setCapability(FirefoxDriver.PROFILE, initFirefoxProfile()); cap.setCapability(MARIONETTE_CAPABILITY, true); - - firefoxProfile.setPreference("network.proxy.type", 2); - firefoxProfile.setPreference("network.proxy.autoconfig_url", "http://emea.onap.org:8001/"); - firefoxProfile.setPreference("network.proxy.no_proxies_on", "localhost"); - + webdriver = new FirefoxDriver(cap); } } else { diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java index 727876f27..cb6adc295 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java @@ -22,8 +22,6 @@ package org.onap.sdc.ci.tests.execute.setup; import java.util.HashMap; -import com.aventstack.extentreports.ExtentTest; - public class WindowTestManager { private static HashMap windowMap = new HashMap(); diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java index eb93a619e..2ff28dabd 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java @@ -21,7 +21,6 @@ package org.onap.sdc.ci.tests.utilities; import org.apache.commons.lang3.tuple.ImmutablePair; -import org.onap.sdc.ci.tests.datatypes.DataTestIdEnum.LeftPanelCanvasItems; import org.openqa.selenium.WebElement; public final class CanvasElement { diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java index d5d5540a9..029555a91 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java @@ -45,7 +45,6 @@ import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; import org.apache.commons.io.FileUtils; -import org.onap.sdc.ci.tests.datatypes.UserCredentials; import org.onap.sdc.ci.tests.execute.setup.ExtentTestActions; import org.onap.sdc.ci.tests.execute.setup.SetupCDTest; import org.yaml.snakeyaml.Yaml; diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java index 8885e1c3f..b10636bf1 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java @@ -20,6 +20,7 @@ package org.onap.sdc.ci.tests.utilities; +//import com.automation.common.report_portal_integration.annotations.Step; import com.aventstack.extentreports.Status; import org.apache.commons.io.FileUtils; import org.junit.Assert; @@ -600,12 +601,14 @@ public final class GeneralUIUtils { wait.until(ExpectedConditions.textToBePresentInElementValue(element, text)); } + //@Step public static void waitForAngular(){ WebDriverWait wait = newWait(90); wait.until(AdditionalConditions.pageLoadWait()); wait.until(AdditionalConditions.angularHasFinishedProcessing()); } + //@Step public static void waitForAngular2(){ WebDriverWait wait = newWait(90); wait.until(AdditionalConditions.pageLoadWait()); @@ -645,6 +648,7 @@ public final class GeneralUIUtils { waitForElementVisibilityByTestId(dataTestId)); } + //@Step public static void ultimateWait(){ logger.info("ultimateWait: starting"); long startTime = System.nanoTime(); -- cgit 1.2.3-korg