- refactoring

- removed unnecessary classes
d3m0 · Aug 17, 2020 · 894fee8 · 894fee8
1 parent 89e4b4b
commit 894fee8
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 64 deletions.
diff --git a/src/main/java/entities/Browser.java b/src/main/java/entities/Browser.java
@@ -2,6 +2,7 @@
 
 import enums.BrowserType;
 import org.openqa.selenium.MutableCapabilities;
+import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
 public interface Browser {
@@ -10,4 +11,6 @@ public interface Browser {
     MutableCapabilities getBrowserOptions();
 
     RemoteWebDriver getDriver();
+
+    DesiredCapabilities getCapabilities();
 }
diff --git a/src/main/java/entities/ChromeBrowser.java b/src/main/java/entities/ChromeBrowser.java
@@ -3,8 +3,8 @@
 import enums.BrowserType;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
-import utils.OptionsManager;
 
 public class ChromeBrowser implements Browser {
     @Override
@@ -14,11 +14,22 @@ public BrowserType getType() {
 
     @Override
     public ChromeOptions getBrowserOptions() {
-        return OptionsManager.getChromeOptions();
+        return new ChromeOptions();
     }
 
     @Override
     public RemoteWebDriver getDriver() {
         return new ChromeDriver(getBrowserOptions());
     }
+
+    @Override
+    public DesiredCapabilities getCapabilities() {
+        DesiredCapabilities capabilities = new DesiredCapabilities();
+        capabilities.setBrowserName("chrome");
+        capabilities.setVersion("84.0");
+        capabilities.setCapability(ChromeOptions.CAPABILITY, getBrowserOptions());
+        capabilities.setCapability("enableVNC", true);
+        capabilities.setCapability("enableVideo", false);
+        return capabilities;
+    }
 }
diff --git a/src/main/java/entities/FirefoxBrowser.java b/src/main/java/entities/FirefoxBrowser.java
@@ -3,8 +3,8 @@
 import enums.BrowserType;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxOptions;
+import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
-import utils.OptionsManager;
 
 public class FirefoxBrowser implements Browser {
     @Override
@@ -14,11 +14,22 @@ public BrowserType getType() {
 
     @Override
     public FirefoxOptions getBrowserOptions() {
-        return OptionsManager.getFirefoxOptions();
+        return new FirefoxOptions();
     }
 
     @Override
     public RemoteWebDriver getDriver() {
         return new FirefoxDriver(getBrowserOptions());
     }
-}
+
+    @Override
+    public DesiredCapabilities getCapabilities() {
+        DesiredCapabilities capabilities = new DesiredCapabilities();
+        capabilities.setBrowserName("firefox");
+        capabilities.setVersion("79.0");
+        capabilities.setCapability(FirefoxOptions.FIREFOX_OPTIONS, getBrowserOptions());
+        capabilities.setCapability("enableVNC", true);
+        capabilities.setCapability("enableVideo", false);
+        return capabilities;
+    }
+}
diff --git a/src/main/java/utils/BaseTest.java b/src/main/java/utils/BaseTest.java
@@ -27,16 +27,19 @@ public class BaseTest {
 
     public void setup(String browserName) {
         LOGGER.trace("Setting up {} driver", browserName);
-        BrowserType browserType = BrowserType.valueOf(browserName.toUpperCase());
-        switch (browserType) {
-            case CHROME:
-                setupDriver(new ChromeBrowser());
-                break;
-            case FIREFOX:
-                setupDriver(new FirefoxBrowser());
-                break;
-            default:
-                throw new NotFoundException("Desired browser not found. Please add");
+        try {
+            BrowserType browserType = BrowserType.valueOf(browserName.toUpperCase());
+            switch (browserType) {
+                case CHROME:
+                    setupDriver(new ChromeBrowser());
+                    break;
+                case FIREFOX:
+                    setupDriver(new FirefoxBrowser());
+                    break;
+            }
+        } catch (IllegalArgumentException exception) {
+            LOGGER.error("BROWSER NOT FOUND");
+            throw new NotFoundException(String.format("Browser '%s' not found. Please add", browserName));
         }
     }
 
@@ -73,16 +76,18 @@ public IndexPage openStartPage() {
     }
 
     private WebDriver setupWebDriverWithWebDriverManager(Browser browser) {
+        LOGGER.trace("Setting up driver with WebDriverManager");
         BrowserType browserType = browser.getType();
         DriverManagerType driverManagerType = DriverManagerType.valueOf(browserType.name());
         WebDriverManager.getInstance(driverManagerType).setup();
         return browser.getDriver();
     }
 
     private WebDriver setupWebDriverWithSelenoid(Browser browser) {
+        LOGGER.trace("Setting up driver with Selenoid");
         WebDriver webDriver = null;
         String selenoidHubAddress = System.getProperty("selenoid.hub.address");
-        DesiredCapabilities capabilities = CapabilitiesManager.getCapabilities(browser.getBrowserOptions());
+        DesiredCapabilities capabilities = browser.getCapabilities();
         try {
             webDriver = new RemoteWebDriver(URI.create(selenoidHubAddress + "/wd/hub").toURL(), capabilities);
         } catch (MalformedURLException e) {

diff --git a/src/main/java/utils/CapabilitiesManager.java b/src/main/java/utils/CapabilitiesManager.java
diff --git a/src/main/java/utils/LoadingPageFactory.java b/src/main/java/utils/LoadingPageFactory.java
@@ -27,7 +27,7 @@ public static <T> T get(Class<T> pageObjectClass) {
 
         if (!expectedPageTitle.equals(Verify.INVALID_TITLE)) {
             String actualPageTitle = driver.getTitle();
-            Assert.assertEquals(expectedPageTitle, actualPageTitle, "Page title is correct.");
+            Assert.assertEquals(actualPageTitle, expectedPageTitle, "Page title is correct.");
         }
 
         String xpath = verify.xpath();

diff --git a/src/main/java/utils/OptionsManager.java b/src/main/java/utils/OptionsManager.java
diff --git a/src/test/java/testcases/FailingCases.java b/src/test/java/testcases/FailingCases.java
@@ -30,4 +30,9 @@ public void testShouldFailWhenTryingToClickAbsentElement() {
         SelenideElement tShirtsButton = Selenide.$(By.xpath(".//ul[not(contains(@style, 'display: none'))]/li/a[@title='T-shirts']/span"));
         tShirtsButton.click();
     }
+
+    @Test
+    public void testShouldFailBecauseOfIncorrectBrowser() {
+        openStartPage();
+    }
 }
diff --git a/src/test/resources/failing.xml b/src/test/resources/failing.xml
@@ -4,7 +4,21 @@
     <test name="Cases with browser chrome" parallel="methods" thread-count="10">
         <parameter name="browser" value="chrome"/>
         <classes>
-            <class name="testcases.FailingCases"/>
+            <class name="testcases.FailingCases">
+                <methods>
+                    <exclude name="testShouldFailBecauseOfIncorrectBrowser"/>
+                </methods>
+            </class>
+        </classes>
+    </test>
+    <test name="Test case with incorrect browser">
+        <classes>
+            <class name="testcases.FailingCases">
+                <parameter name="browser" value="Incorrect Browser"/>
+                <methods>
+                    <include name="testShouldFailBecauseOfIncorrectBrowser"/>
+                </methods>
+            </class>
         </classes>
     </test>
     <listeners>

diff --git a/update_browsers.sh b/update_browsers.sh
@@ -1 +1,2 @@
-cat config/browsers.json | jq -r '..|.image?|strings' | xargs -I{} docker pull {}
+#!/bin/bash
+cat config/browsers.json | jq -r '..|.image?|strings' | xargs -I{} docker pull {}