Java: Stop restarting browser so often without real need

Author: barancev

java/client/test/org/openqa/selenium/WindowSwitchingTest.java

@@ -41,7 +41,6 @@
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
 import org.openqa.selenium.testing.JavascriptEnabled;
-import org.openqa.selenium.testing.NeedsFreshDriver;
 import org.openqa.selenium.testing.NoDriverAfterTest;
 import org.openqa.selenium.testing.NotYetImplemented;
 import org.openqa.selenium.testing.SwitchToTopAfterTest;
@@ -53,6 +52,7 @@
 public class WindowSwitchingTest extends JUnit4TestBase {
 
   @SwitchToTopAfterTest
+  @NoDriverAfterTest(failedOnly = true)
   @Test
   public void testShouldSwitchFocusToANewWindowWhenItIsOpenedAndNotStopFutureOperations() {
     assumeFalse(Browser.detect() == Browser.opera &&
@@ -96,6 +96,7 @@ public void testShouldThrowNoSuchWindowException() {
     driver.switchTo().window(current);
   }
 
+  @NoDriverAfterTest(failedOnly = true)
   @Ignore({MARIONETTE})
   @Test
   public void testShouldThrowNoSuchWindowExceptionOnAnAttemptToGetItsHandle() {
@@ -120,6 +121,7 @@ public void testShouldThrowNoSuchWindowExceptionOnAnAttemptToGetItsHandle() {
     }
   }
 
+  @NoDriverAfterTest(failedOnly = true)
   @Ignore({MARIONETTE})
   @Test
   public void testShouldThrowNoSuchWindowExceptionOnAnyOperationIfAWindowIsClosed() {
@@ -153,6 +155,7 @@ public void testShouldThrowNoSuchWindowExceptionOnAnyOperationIfAWindowIsClosed(
     }
   }
 
+  @NoDriverAfterTest(failedOnly = true)
   @Ignore({MARIONETTE})
   @Test
   public void testShouldThrowNoSuchWindowExceptionOnAnyElementOperationIfAWindowIsClosed() {
@@ -178,7 +181,6 @@ public void testShouldThrowNoSuchWindowExceptionOnAnyElementOperationIfAWindowIs
     }
   }
 
-  @NeedsFreshDriver
   @NoDriverAfterTest
   @Ignore({IE, REMOTE})
   @Test
@@ -313,11 +315,12 @@ public void testFailingToSwitchToAWindowLeavesTheCurrentWindowAsIs() {
     assertEquals(current, newHandle);
   }
 
-  @NeedsFreshDriver
-  @NoDriverAfterTest
+  @NoDriverAfterTest(failedOnly = true)
   @Test
   public void testCanCloseWindowWhenMultipleWindowsAreOpen() {
     driver.get(pages.xhtmlTestPage);
+    String mainHandle = driver.getWindowHandle();
+
     Set<String> currentWindowHandles = driver.getWindowHandles();
 
     driver.findElement(By.name("windowOne")).click();
@@ -328,19 +331,27 @@ public void testCanCloseWindowWhenMultipleWindowsAreOpen() {
 
     // There should be two windows. We should also see each of the window titles at least once.
     assertEquals(2, allWindowHandles.size());
-    String handle1 = (String) allWindowHandles.toArray()[1];
-    driver.switchTo().window(handle1);
-    driver.close();
-    allWindowHandles = driver.getWindowHandles();
-    assertEquals(1, allWindowHandles.size());
+
+    for (String handle : allWindowHandles) {
+      if (! handle.equals(mainHandle)) {
+        driver.switchTo().window(handle);
+        driver.close();
+        break;
+      }
+    }
+
+    assertEquals(1, driver.getWindowHandles().size());
+
+    driver.switchTo().window(mainHandle);
   }
 
-  @NeedsFreshDriver
-  @NoDriverAfterTest
+  @NoDriverAfterTest(failedOnly = true)
   @Test
   public void testCanCloseWindowAndSwitchBackToMainWindow() {
     driver.get(pages.xhtmlTestPage);
+
     Set<String> currentWindowHandles = driver.getWindowHandles();
+    String mainHandle = driver.getWindowHandle();
 
     driver.findElement(By.name("windowOne")).click();
 
@@ -350,26 +361,31 @@ public void testCanCloseWindowAndSwitchBackToMainWindow() {
 
     // There should be two windows. We should also see each of the window titles at least once.
     assertEquals(2, allWindowHandles.size());
-    String mainHandle = (String) allWindowHandles.toArray()[0];
-    String handle1 = (String) allWindowHandles.toArray()[1];
-    driver.switchTo().window(handle1);
-    driver.close();
+
+    for (String handle : allWindowHandles) {
+      if (! handle.equals(mainHandle)) {
+        driver.switchTo().window(handle);
+        driver.close();
+        break;
+      }
+    }
+
     driver.switchTo().window(mainHandle);
 
     String newHandle = driver.getWindowHandle();
     assertEquals(mainHandle, newHandle);
+
+    assertEquals(1, driver.getWindowHandles().size());
   }
 
-  @NeedsFreshDriver
   @NoDriverAfterTest
   @Test
   public void testClosingOnlyWindowShouldNotCauseTheBrowserToHang() {
     driver.get(pages.xhtmlTestPage);
     driver.close();
   }
 
-  @NeedsFreshDriver
-  @NoDriverAfterTest
+  @NoDriverAfterTest(failedOnly = true)
   @Test
   @Ignore(MARIONETTE)
   public void testShouldFocusOnTheTopMostFrameAfterSwitchingToAWindow() {

java/client/test/org/openqa/selenium/interactions/BasicMouseInterfaceTest.java

@@ -37,7 +37,6 @@
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.testing.NeedsFreshDriver;
-import org.openqa.selenium.testing.NoDriverAfterTest;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.Point;
 import org.openqa.selenium.testing.SwitchToTopAfterTest;

java/client/test/org/openqa/selenium/interactions/DragAndDropTest.java

@@ -22,7 +22,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
 import static org.openqa.selenium.WaitingConditions.elementLocationToBe;
 import static org.openqa.selenium.testing.Driver.CHROME;
 import static org.openqa.selenium.testing.Driver.FIREFOX;

java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java

@@ -108,7 +108,7 @@ protected void starting(Description description) {
       super.starting(description);
       NeedsFreshDriver annotation = description.getAnnotation(NeedsFreshDriver.class);
       if (annotation != null && matches(browser, annotation.value())) {
-        System.out.println("Restarting driver before " + description);
+        System.out.println("Restarting driver before test " + description);
         removeDriver();
       }
       try {
@@ -119,11 +119,21 @@ protected void starting(Description description) {
     }
 
     @Override
-    protected void finished(Description description) {
+    protected void succeeded(Description description) {
+      super.finished(description);
+      NoDriverAfterTest annotation = description.getAnnotation(NoDriverAfterTest.class);
+      if (annotation != null && !annotation.failedOnly() && matches(browser, annotation.value())) {
+        System.out.println("Restarting driver after succeeded test " + description);
+        removeDriver();
+      }
+    }
+
+    @Override
+    protected void failed(Throwable e, Description description) {
       super.finished(description);
       NoDriverAfterTest annotation = description.getAnnotation(NoDriverAfterTest.class);
       if (annotation != null && matches(browser, annotation.value())) {
-        System.out.println("Restarting driver after " + description);
+        System.out.println("Restarting driver after failed test " + description);
         removeDriver();
       }
     }

java/client/test/org/openqa/selenium/testing/NoDriverAfterTest.java

@@ -35,4 +35,5 @@
 
   String reason() default ("For unknown reason");
 
+  boolean failedOnly() default false;
 }