From d197a8e6587acd9b7076b2f03d6fee7ea82ed422 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Mon, 6 Jan 2020 15:19:22 -0500 Subject: [PATCH] Added chrome driver for tests. --- src/test/java/integration/MainPageIT.java | 18 ++++++++++--- src/test/java/integration/SeleniumConfig.java | 27 +++++++++++++------ 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/test/java/integration/MainPageIT.java b/src/test/java/integration/MainPageIT.java index 76c8e5f62..9d93ca806 100644 --- a/src/test/java/integration/MainPageIT.java +++ b/src/test/java/integration/MainPageIT.java @@ -19,17 +19,27 @@ public class MainPageIT { } public String getTitle() { - return this.config.getDriver().getTitle(); + return this.config.getFirefoxDriver().getTitle(); } @After public void closeConnection() { - config.getDriver().quit(); + config.getFirefoxDriver().quit(); } @Test - public void petclinicTitleIT() { - WebDriver driver = config.getDriver(); + public void petclinicTitleFireFoxIT() { + WebDriver driver = config.getFirefoxDriver(); + driver.get(url); + assertEquals("Title not as expected: ", "PetClinic :: a Spring Framework demonstration", getTitle()); + String welcomeText = driver.findElement(By.id("welcome")).getText(); + assertEquals("Wrong welcome text.", "Welcome to the Red Hat Pet Clinic", welcomeText); + System.err.println("Text extracted: " + welcomeText); + } + + @Test + public void petclinicTitleChromeIT() { + WebDriver driver = config.getChromeDriver(); driver.get(url); assertEquals("Title not as expected: ", "PetClinic :: a Spring Framework demonstration", getTitle()); String welcomeText = driver.findElement(By.id("welcome")).getText(); diff --git a/src/test/java/integration/SeleniumConfig.java b/src/test/java/integration/SeleniumConfig.java index 4c8c80b80..ef856536a 100644 --- a/src/test/java/integration/SeleniumConfig.java +++ b/src/test/java/integration/SeleniumConfig.java @@ -6,21 +6,32 @@ import java.util.concurrent.TimeUnit; import org.openqa.selenium.Capabilities; import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeOptions; import org.openqa.selenium.firefox.FirefoxOptions; import org.openqa.selenium.remote.RemoteWebDriver; public class SeleniumConfig { - private WebDriver driver; + public static final String SELENIUM_HUB_URL = "http://selenium-hub-cicd.apps.cluster-ottawa-630b.ottawa-630b.example.opentlc.com/wd/hub"; + + private WebDriver firefoxDriver; + private WebDriver chromeDriver; public SeleniumConfig() throws MalformedURLException { - Capabilities capabilities = new FirefoxOptions(); - driver = new RemoteWebDriver( - new URL("http://selenium-hub-cicd.apps.cluster-ottawa-630b.ottawa-630b.example.opentlc.com/wd/hub"), - capabilities); - driver.manage().timeouts().implicitlyWait(5, TimeUnit.SECONDS); + Capabilities firefoxCapabilities = new FirefoxOptions(); + firefoxDriver = new RemoteWebDriver(new URL(SELENIUM_HUB_URL), firefoxCapabilities); + firefoxDriver.manage().timeouts().implicitlyWait(5, TimeUnit.SECONDS); + + Capabilities chromeCapabilities = new ChromeOptions(); + chromeDriver = new RemoteWebDriver(new URL(SELENIUM_HUB_URL), chromeCapabilities); + chromeDriver.manage().timeouts().implicitlyWait(5, TimeUnit.SECONDS); } - public WebDriver getDriver() { - return driver; + public WebDriver getFirefoxDriver() { + return firefoxDriver; } + + public WebDriver getChromeDriver() { + return chromeDriver; + } + }