add tests & use selenium:4 & restore tab functionality

.gitignore

@@ -1,3 +1,4 @@
 /.idea/
 /target/
 *.iml
+**/chromedriver_**

pom.xml

@@ -8,13 +8,13 @@
 		<version>jdk17-0.0</version>
 	</parent>
 	<artifactId>tabdriver</artifactId>
-    <version>1.2.4</version>
+    <version>1.3.0</version>
 	<packaging>jar</packaging>
 
 	<name>tabdriver</name>
 
 	<properties>
-		<xx.selenium.version>3.141.59</xx.selenium.version>
+        <xx.selenium.version>4.21.0</xx.selenium.version>
 		<xx.webdriver.version>0.9.7376</xx.webdriver.version>
 	</properties>
 
@@ -75,6 +75,12 @@
 			<groupId>com.olexyn</groupId>
 			<artifactId>min-prop</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 

src/main/java/com/olexyn/tabdriver/DefaultTabDriverConfig.java

@@ -12,7 +12,7 @@ public abstract class DefaultTabDriverConfig  implements TabDriverConfigProvider
     public ChromeOptions getOptions() {
 
         ChromeOptions options = new ChromeOptions();
-        options.setCapability(CapabilityType.ACCEPT_SSL_CERTS, true);
+        options.setCapability(CapabilityType.ACCEPT_INSECURE_CERTS, true);
         options.addArguments("--start-maximized");
         if (isHeadless()) {
             options.addArguments("--window-size=1920,1080");

src/main/java/com/olexyn/tabdriver/ITabDriver.java

@@ -0,0 +1,8 @@
+package com.olexyn.tabdriver;
+
+public interface ITabDriver {
+
+    void goToTab(Purpose purpose);
+
+    void newTab(Purpose purpose);
+}

src/main/java/com/olexyn/tabdriver/Purpose.java

@@ -0,0 +1,15 @@
+package com.olexyn.tabdriver;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public record Purpose(String name) {
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof Purpose && ((Purpose) obj).name.equals(name);
+    }
+
+}

src/main/java/com/olexyn/tabdriver/Tab.java

@@ -1,20 +1,17 @@
 package com.olexyn.tabdriver;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 
 @Setter
 @Getter
+@AllArgsConstructor
 public class Tab {
 
-    String handle;
-    String name;
-    String url;
-    String purpose;
+    private String handle;
+    private Purpose purpose;
 
-    public Tab(String handle) {
-        this.handle = handle;
-    }
 
 
 }

src/main/java/com/olexyn/tabdriver/TabDriver.java

@@ -1,6 +1,7 @@
 package com.olexyn.tabdriver;
 
 import com.olexyn.min.log.LogU;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.Keys;
@@ -8,6 +9,7 @@ import org.openqa.selenium.NoSuchFrameException;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.WindowType;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeDriverService;
 
@@ -20,10 +22,9 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static com.olexyn.tabdriver.Constants.ABOUT_BLANK;
 
 @SuppressWarnings("unused")
-public class TabDriver implements JavascriptExecutor {
+public class TabDriver implements JavascriptExecutor, ITabDriver {
 
     private final Map<String, Tab> tabs = new HashMap<>();
     private final ChromeDriver chromeDriver;
@@ -80,89 +81,32 @@ public class TabDriver implements JavascriptExecutor {
         return chromeDriver.findElements(by);
     }
 
-    public synchronized void registerCurrentTab(String purpose) {
-        Tab tab = new Tab(getWindowHandle());
-        tab.setName(getTitle());
-        tab.setUrl(getCurrentUrl());
-        tab.setPurpose(purpose);
-        tabs.put(tab.getHandle(), tab);
-    }
 
-    public synchronized Tab getCurrentTab() {
+
+    private synchronized Tab getCurrentTab() {
         return tabs.get(getWindowHandle());
     }
 
-    public synchronized List<Tab> getTabByPurpose(String purpose) {
-        return tabs.values().stream()
+    @Override
+    public synchronized void goToTab(Purpose purpose) {
+        tabs.values().stream()
             .filter(x -> Objects.equals(x.getPurpose(), purpose))
-            .toList();
+            .findFirst()
+            .ifPresent(this::switchToTab);
     }
 
-    public synchronized String registerBlankTab(String purpose) {
-        Set<String> openTabHandles = getWindowHandles();
-        for (String openTabHandle : openTabHandles) {
-            if (!tabs.containsKey(openTabHandle)) {
-                Tab blankTab = new Tab(openTabHandle);
-                blankTab.setName(ABOUT_BLANK);
-                blankTab.setUrl(ABOUT_BLANK);
-                blankTab.setPurpose(purpose);
-                tabs.put(openTabHandle, blankTab);
-                return openTabHandle;
-            }
-        }
-        LogU.warnPlain("Not unregistered tab found.");
-        return null;
+    private synchronized void switchToTab(Tab tab) {
+        switchTo().window(tab.getHandle());
     }
 
-    public synchronized String registerExistingTab(String purpose) {
+    @Override
+    public synchronized void newTab(Purpose purpose) {
+        switchTo().newWindow(WindowType.TAB);
         String handle = getWindowHandle();
-        Tab tab = new Tab(handle);
-        tab.setName(getTitle());
-        tab.setUrl(getCurrentUrl());
-        tab.setPurpose(purpose);
+        Tab tab = new Tab(handle, purpose);
         tabs.put(handle, tab);
-        return handle;
-    }
-
-    public synchronized void switchToTab(String handle) {
-        for (Entry<String, Tab> entry : tabs.entrySet()) {
-            String tabHandle = entry.getKey();
-            if (tabHandle.equals(handle)) {
-                switchTo().window(tabHandle);
-            }
-        }
     }
 
-    public synchronized void switchToTab(Tab tab) {
-        switchTo().window(tab.getHandle());
-    }
-
-    /**
-     * Opens a new tab, and "moves" the WebDriver to the new tab.
-     * If the current tab is empty, it is registered - this happens usually only with the initial tab of the session.
-     */
-    public synchronized void newTab(String purpose) {
-        String currentUrl = getCurrentUrl(); // TODO this throws error, just get a new window
-        if (currentUrl.isEmpty()
-            || currentUrl.equals("data:,")
-            || currentUrl.equals(ABOUT_BLANK)) {
-            registerExistingTab(purpose);
-        } else {
-            executeScript("window.open(arguments[0])");
-            Optional.ofNullable(registerBlankTab(purpose))
-                .ifPresent(this::switchToTab);
-        }
-    }
-
-    public synchronized void switchToTabByPurpose(String purpose) {
-        List<Tab> existingTabs = getTabByPurpose(purpose);
-        if (!existingTabs.isEmpty()) {
-            switchToTab(existingTabs.get(0));
-        } else {
-            Tab currentTab = getCurrentTab();
-
-        }
-    }
 
     public synchronized void refresh() {
         navigate().refresh();
@@ -186,7 +130,7 @@ public class TabDriver implements JavascriptExecutor {
         }
     }
 
-    public synchronized WebElement filterElementListBy(List<WebElement> list, CRITERIA criteria, String text) {
+    public synchronized @Nullable WebElement filterElementListBy(List<WebElement> list, CRITERIA criteria, String text) {
         for (WebElement element : list) {
             String toEvaluate = switch (criteria) {
                 case CLASS -> element.getClass().getName();
@@ -234,12 +178,12 @@ public class TabDriver implements JavascriptExecutor {
     }
 
     @Override
-    public Object executeScript(String script, Object... args) {
+    public @Nullable Object executeScript(String script, Object... args) {
         return null;
     }
 
     @Override
-    public Object executeAsyncScript(String script, Object... args) {
+    public @Nullable Object executeAsyncScript(String script, Object... args) {
         return null;
     }
 
@@ -281,13 +225,13 @@ public class TabDriver implements JavascriptExecutor {
     /**
      * Return the first occurrence of specified class that has specified label.
      */
-    public synchronized WebElement getWhere(String className, CRITERIA criteria, String text) {
+    public synchronized @Nullable WebElement getWhere(String className, CRITERIA criteria, String text) {
         switchToFrameContainingCharSeq(text);
         List<WebElement> elements = findElements(By.className(className));
         return filterElementListBy(elements, criteria, text);
     }
 
-    public synchronized WebElement getWhere(String className) {
+    public synchronized @Nullable WebElement getWhere(String className) {
         switchToFrameContainingCharSeq(className);
         List<WebElement> elements = findElements(By.className(className));
         return filterElementListBy(elements, CRITERIA.NONE, Constants.EMPTY);
@@ -300,7 +244,7 @@ public class TabDriver implements JavascriptExecutor {
 
 
     public synchronized void setRadio(WebElement element, boolean checked) {
-        ((JavascriptExecutor) this).executeScript("arguments[0].checked = " + checked + ";", element);
+        ((JavascriptExecutor) this).executeScript("arguments[0].checked = " + checked + ';', element);
     }
 
     public synchronized void setComboByDataValue(By comboBy, String dataValue) {
@@ -360,7 +304,7 @@ public class TabDriver implements JavascriptExecutor {
      */
     public synchronized WebElement getByFieldValue(SearchContext searchContext, String type, String field, String value) {
 
-        return searchContext.findElement(By.cssSelector(type + "[" + field + "='" + value + "']"));
+        return searchContext.findElement(By.cssSelector(type + '[' + field + "='" + value + "']"));
     }
 
     public synchronized WebElement getByText(String text) {

src/test/java/com/olexyn/tabdriver/TabDriverTest.java

@@ -0,0 +1,39 @@
+package com.olexyn.tabdriver;
+
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+
+public class TabDriverTest {
+
+
+    TabDriver tabDriver;
+
+
+    @BeforeEach
+    public void setUp() {
+        tabDriver = new TabDriver(new TestTabDriverConfig());
+    }
+
+
+    @Test
+    public void test() {
+        var google = new Purpose("GOOGLE");
+        var youtube = new Purpose("YOUTUBE");
+        tabDriver.newTab(google);
+        tabDriver.get("https://www.google.com");
+        tabDriver.newTab(youtube);
+        tabDriver.get("https://www.youtube.com");
+        tabDriver.goToTab(google);
+        int br = 0;
+    }
+
+
+    @AfterEach
+    public void tearDown() {
+        tabDriver.quit();
+    }
+
+}

src/test/java/com/olexyn/tabdriver/TestTabDriverConfig.java

@@ -0,0 +1,21 @@
+package com.olexyn.tabdriver;
+
+import java.nio.file.Path;
+
+public class TestTabDriverConfig extends DefaultTabDriverConfig {
+
+    @Override
+    public Path getDriverPath() {
+        return Path.of(System.getProperties().getProperty("user.dir"), "/src/test/resources/chromedriver_124");
+    }
+
+    @Override
+    public String getDownloadDir() {
+        return "";
+    }
+
+    @Override
+    public boolean isHeadless() {
+        return false;
+    }
+}