Update browser

Author: sayems

libs/chromedriver.exe

@@ -29,6 +29,16 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.9.11</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.dagger</groupId>
+            <artifactId>dagger</artifactId>
+            <version>2.24</version>
+        </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>

pom.xml

@@ -2,9 +2,6 @@
 
 import org.openqa.selenium.WebDriver;
 
-import java.net.URL;
-import java.util.function.Supplier;
-
 /**
  * Created by sayem on 08/02/17.
  */

src/main/java/org/sayem/browser/Adapter.java

@@ -12,6 +12,7 @@
 /**
  * Created by sayem on 08/02/17.
  */
+
 public interface Browser<T extends WebDriver> {
 
     T driver();

src/main/java/org/sayem/browser/Browser.java

@@ -14,20 +14,20 @@
 /**
  * Created by sayem on 08/02/17.
  */
-public class BrowserAdapter<T extends WebDriver> implements Browser<T> {
+public class BrowserAdapter implements Browser<WebDriver> {
 
-    private T driver;
-    private ElementAdapter<T> element;
+    private WebDriver driver;
+    private ElementAdapter element;
     private DateTimePickerAdapter dateTime;
 
-    public BrowserAdapter(T driver) {
+    BrowserAdapter(WebDriver driver) {
         this.driver = driver;
-        this.element = new ElementAdapter<>(this);
+        this.element = new ElementAdapter(driver);
         this.dateTime = new DateTimePickerAdapter();
     }
 
     @Override
-    public T driver() {
+    public WebDriver driver() {
         return driver;
     }
 

src/main/java/org/sayem/browser/BrowserAdapter.java

@@ -3,13 +3,10 @@
 import io.github.bonigarcia.wdm.WebDriverManager;
 import org.openqa.selenium.chrome.ChromeDriver;
 
-import java.net.URL;
-import java.util.function.Supplier;
-
 public class ChromeBrowser implements Adapter<ChromeDriver> {
     @Override
-    public Browser<ChromeDriver> browser() {
+    public Browser browser() {
         WebDriverManager.chromedriver().setup();
-        return new BrowserAdapter<>(new ChromeDriver());
+        return new BrowserAdapter(new ChromeDriver());
     }
 }

src/main/java/org/sayem/browser/ChromeBrowser.java

@@ -6,8 +6,8 @@
 public class FirefoxBrowser implements Adapter<FirefoxDriver> {
 
     @Override
-    public Browser<FirefoxDriver> browser() {
+    public Browser browser() {
         WebDriverManager.firefoxdriver().setup();
-        return new BrowserAdapter<>(new FirefoxDriver());
+        return new BrowserAdapter(new FirefoxDriver());
     }
 }

src/main/java/org/sayem/browser/FirefoxBrowser.java

@@ -1,31 +1,30 @@
 package org.sayem.config;
 
-import org.openqa.selenium.WebDriver;
 import org.sayem.browser.Browser;
 import org.sayem.listener.BrowserListener;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Listeners;
 
 import java.util.Arrays;
 
+import static java.lang.System.*;
 import static org.sayem.browser.BrowserType.values;
 
 @Listeners({BrowserListener.class})
 public class TestBase {
 
-    private final String browserEnv = System.getProperty("browser");
-    private Browser<? extends WebDriver> browser;
+    private Browser<?> browser;
 
     @AfterMethod
     public void tearDown() {
         browser.driver().close();
     }
 
-    @SuppressWarnings("unchecked")
     protected <T> T getDriver() {
         browser = Arrays.asList(values())
                 .parallelStream()
-                .filter(s -> s.name().equalsIgnoreCase(browserEnv))
+                .filter(s -> s.name()
+                        .equalsIgnoreCase(getProperty("browser")))
                 .findFirst().get().driver.get().browser();
         return (T) browser;
     }

src/main/java/org/sayem/config/TestBase.java

@@ -10,12 +10,12 @@
 /**
  * Created by sayem on 08/02/17.
  */
-public class ElementAdapter<T extends WebDriver> implements Element {
+public class ElementAdapter implements Element {
 
-    private T driver;
+    private WebDriver driver;
 
-    public ElementAdapter(BrowserAdapter<T> driver) {
-        this.driver = driver.driver();
+    public ElementAdapter(WebDriver driver) {
+        this.driver = driver;
     }
 
     @Override

src/main/java/org/sayem/element/ElementAdapter.java

@@ -1,12 +1,13 @@
 package org.sayem.pages;
 
+import org.openqa.selenium.WebDriver;
 import org.sayem.browser.Browser;
 
 public class HomePage {
 
-    private Browser browser;
+    private Browser<WebDriver> browser;
 
-    public HomePage(Browser browser) {
+    public HomePage(Browser<WebDriver> browser) {
         this.browser = browser;
     }