Improve TestLeft

Author: sayems

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

@@ -4,5 +4,6 @@
  * Created by sayem on 08/02/17.
  */
 public interface Browser<T> {
+
     T driver();
 }

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

@@ -0,0 +1,16 @@
+package org.sayem.browser;
+
+import java.util.function.Supplier;
+
+import static java.util.Objects.requireNonNull;
+
+public enum BrowserType {
+
+    CHROME(ChromeBrowser::new);
+
+    public final ThreadLocal<Adapter> driver = new ThreadLocal<>();
+
+    BrowserType(Supplier<Adapter> driver) {
+        this.driver.set(requireNonNull(driver).get());
+    }
+}

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

@@ -9,25 +9,27 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
 
+import static com.smartbear.testleft.BrowserType.Chrome;
+
 public class ChromeBrowser implements Adapter {
 
     @Override
     public Browser<WebPage> webPage(String url) throws TestAgentRunException, RestConnectionRefused, HttpException, ApiException {
         WebBrowser browser = new LocalDriver()
                 .getApplications()
-                .runBrowser(BrowserType.Chrome,
+                .runBrowser(Chrome,
                         url);
         WebPage page = browser.find(WebBrowser.class, new WebBrowserPattern() {{
-            ObjectIdentifier = BrowserType.Chrome.getValueString().toLowerCase();
+            ObjectIdentifier = Chrome.getValueString().toLowerCase();
         }}).find(WebPage.class, new WebPagePattern() {{
             URL = url;
         }});
-        return new BrowserAdapter<>(page);
+        return new TestLeftAdapter(page);
     }
 
     @Override
     public Browser<WebDriver> webDriver() {
         WebDriverManager.chromedriver().setup();
-        return new BrowserAdapter<>(new ChromeDriver());
+        return new WebDriverAdapter(new ChromeDriver());
     }
 }

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

@@ -0,0 +1,17 @@
+package org.sayem.browser;
+
+import com.smartbear.testleft.testobjects.web.WebPage;
+
+public class TestLeftAdapter implements Browser<WebPage> {
+
+    private WebPage driver;
+
+    TestLeftAdapter(WebPage driver) {
+        this.driver = driver;
+    }
+
+    @Override
+    public WebPage driver() {
+        return driver;
+    }
+}

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

@@ -0,0 +1,20 @@
+package org.sayem.browser;
+
+import org.openqa.selenium.WebDriver;
+
+/**
+ * Created by sayem on 08/02/17.
+ */
+public class WebDriverAdapter implements Browser<WebDriver> {
+
+    private WebDriver driver;
+
+    WebDriverAdapter(WebDriver driver) {
+        this.driver = driver;
+    }
+
+    @Override
+    public WebDriver driver() {
+        return driver;
+    }
+}

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

@@ -4,7 +4,7 @@
 import com.smartbear.testleft.testobjects.web.WebPage;
 import org.openqa.selenium.WebDriver;
 import org.sayem.browser.Browser;
-import org.sayem.browser.ChromeBrowser;
+import org.sayem.browser.BrowserType;
 import org.sayem.listener.BrowserListener;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Listeners;
@@ -27,12 +27,13 @@ public void tearDown() throws InvocationException, HttpException {
     }
 
     protected Browser<WebDriver> webDriver() {
-        webdriver = new ChromeBrowser().webDriver();
+        webdriver = BrowserType.CHROME.driver.get().webDriver();
         return webdriver;
     }
 
-    protected Browser<WebPage> driver() throws TestAgentRunException, RestConnectionRefused, HttpException, ApiException {
-         browser = new ChromeBrowser().webPage("http://www.google.com");
+    protected Browser<WebPage> driver() throws TestAgentRunException,
+            RestConnectionRefused, HttpException, ApiException {
+        browser = BrowserType.CHROME.driver.get().webPage("http://www.google.com");
          return browser;
     }
 }

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

@@ -3,7 +3,6 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.sayem.browser.BrowserAdapter;
 
 import java.util.List;
 
@@ -14,8 +13,8 @@ public class ElementAdapter<T extends WebDriver> implements Element {
 
     private T driver;
 
-    public ElementAdapter(BrowserAdapter<T> driver) {
-        this.driver = driver.driver();
+    public ElementAdapter(T driver) {
+        this.driver = driver;
     }
 
     @Override