more on window handling - support WebClient#reset()

Author: rbri

src/main/java/org/openqa/selenium/htmlunit/HtmlUnitDriver.java

@@ -276,7 +276,12 @@ private HtmlUnitDriver(final BrowserVersion version, final boolean enableJavascr
         webClient_.addWebWindowListener(new WebWindowListener() {
             @Override
             public void webWindowOpened(final WebWindowEvent webWindowEvent) {
-                // Ignore
+                if (webWindowEvent.getWebWindow() instanceof TopLevelWindow) {
+                    // use the first top level window we are getting aware of
+                    if (currentWindow_ == null && webClient_.getTopLevelWindows().size() == 1) {
+                        currentWindow_ = new HtmlUnitWindow(webClient_.getTopLevelWindows().get(0));
+                    }
+                }
             }
 
             @Override
@@ -293,18 +298,26 @@ public void webWindowContentChanged(final WebWindowEvent event) {
             @Override
             public void webWindowClosed(final WebWindowEvent event) {
                 elementsMap_.remove(event.getOldPage());
+
+                // the last window is gone
+                if (getWebClient().getTopLevelWindows().size() == 0) {
+                    currentWindow_ = null;
+                    return;
+                }
+
                 // Check if the event window refers to us or one of our parent windows
                 // setup the currentWindow appropriately if necessary
-                WebWindow curr = currentWindow_.getWebWindow();
+                WebWindow ourCurrentWindow = currentWindow_.getWebWindow();
+                final WebWindow ourCurrentTopWindow = currentWindow_.getWebWindow().getTopWindow();
                 do {
                     // Instance equality is okay in this case
-                    if (curr == event.getWebWindow()) {
-                        setCurrentWindow(currentWindow_.getWebWindow().getTopWindow());
+                    if (ourCurrentWindow == event.getWebWindow()) {
+                        setCurrentWindow(ourCurrentTopWindow);
                         return;
                     }
-                    curr = curr.getParentWindow();
+                    ourCurrentWindow = ourCurrentWindow.getParentWindow();
                 }
-                while (curr != currentWindow_.getWebWindow().getTopWindow());
+                while (ourCurrentWindow != ourCurrentTopWindow);
             }
         });
 
@@ -638,8 +651,7 @@ protected void get(final URL fullUrl) {
         getAlert().setAutoAccept(false);
         try {
             // we can't use webClient.getPage(url) here because selenium has a different
-            // idea
-            // of the current window and we like to load into to selenium current one
+            // idea of the current window and we like to load into to selenium current one
             final BrowserVersion browser = getBrowserVersion();
             final WebRequest request = new WebRequest(fullUrl, browser.getHtmlAcceptHeader(),
                     browser.getAcceptEncodingHeader());
@@ -664,6 +676,9 @@ protected void get(final URL fullUrl) {
         catch (final NoSuchSessionException e) {
             throw e;
         }
+        catch (final NoSuchWindowException e) {
+            throw e;
+        }
         catch (final SSLHandshakeException e) {
             return;
         }
@@ -1205,7 +1220,10 @@ public WebClient getWebClient() {
     }
 
     public HtmlUnitWindow getCurrentWindow() {
-        if (currentWindow_ == null || currentWindow_.getWebWindow().isClosed()) {
+        if (webClient_ == null || currentWindow_ == null) {
+            throw new NoSuchSessionException("Session is closed");
+        }
+        if (currentWindow_.getWebWindow().isClosed()) {
             throw new NoSuchWindowException("Window is closed");
         }
         return currentWindow_;

src/test/java/org/openqa/selenium/htmlunit/HtmlUnitDriverTest.java

@@ -517,4 +517,14 @@ protected WebClient modifyWebClient(final WebClient client) {
             }
         };
     }
+
+    @Test
+    public void resetWebClient() {
+        final HtmlUnitDriver webDriver = new HtmlUnitDriver();
+
+        webDriver.get("https://www.htmlunit.org");
+        webDriver.getWebClient().reset();
+
+        webDriver.get("https://www.htmlunit.org");
+    }
 }

src/test/java/org/openqa/selenium/htmlunit/WebDriverTestCase.java

@@ -1575,6 +1575,9 @@ public void releaseResources() {
                 catch (final NoSuchWindowException e) {
                     // ignore
                 }
+                catch (final NoSuchSessionException e) {
+                    // ignore
+                }
                 catch (final UnhandledAlertException e) {
                     ex = e;
                     unhandledAlerts.add(e.getMessage());

src/test/java/org/openqa/selenium/htmlunit/html/WindowsTest.java

@@ -20,10 +20,13 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
+import org.openqa.selenium.NoSuchSessionException;
+import org.openqa.selenium.NoSuchWindowException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.WindowType;
@@ -260,4 +263,85 @@ public void switchToNewTab() throws Exception {
         assertEquals("", driver.getTitle());
         assertEquals("about:blank", driver.getCurrentUrl());
     }
+
+    /**
+     * @throws Exception if something goes wrong
+     */
+    @Test
+    public void closeCurrentWindow() throws Exception {
+        final String htmlFirst =
+                "<html>\n"
+                + "<head><title>First</title></head>\n"
+                + "<body>\n"
+                + "</body></html>\n";
+
+        final WebDriver driver = loadPage2(htmlFirst);
+
+        assertEquals("First", driver.getTitle());
+
+        Set<String> windowHandles = driver.getWindowHandles();
+        assertEquals(1, windowHandles.size());
+
+        driver.switchTo().newWindow(WindowType.TAB);
+
+        windowHandles = new HashSet<>(driver.getWindowHandles());
+        assertEquals(2, windowHandles.size());
+
+        assertEquals("", driver.getTitle());
+        assertEquals("about:blank", driver.getCurrentUrl());
+
+        final String htmlSecond =
+                "<html>\n"
+                + "<head><title>Second</title></head>\n"
+                + "<body>\n"
+                + "</body></html>\n";
+        loadPage2(htmlSecond);
+
+        windowHandles = new HashSet<>(driver.getWindowHandles());
+        assertEquals(2, windowHandles.size());
+
+        assertEquals("Second", driver.getTitle());
+
+        driver.close();
+
+        windowHandles = new HashSet<>(driver.getWindowHandles());
+        assertEquals(1, windowHandles.size());
+
+        try {
+            driver.getTitle();
+            Assert.fail("NoSuchWindowException expected");
+        }
+        catch (final NoSuchWindowException e) {
+            // expected
+        }
+    }
+
+    /**
+     * @throws Exception if something goes wrong
+     */
+    @Test
+    public void closeLastWindow() throws Exception {
+        final String htmlFirst =
+                "<html>\n"
+                + "<head><title>First</title></head>\n"
+                + "<body>\n"
+                + "</body></html>\n";
+
+        final WebDriver driver = loadPage2(htmlFirst);
+
+        assertEquals("First", driver.getTitle());
+
+        final Set<String> windowHandles = driver.getWindowHandles();
+        assertEquals(1, windowHandles.size());
+
+        driver.close();
+
+        try {
+            driver.getWindowHandle();
+            Assert.fail("NoSuchSessionException expected");
+        }
+        catch (final NoSuchSessionException e) {
+            // expected
+        }
+    }
 }