Java: Decreasing number of browser restarts in tests

Author: barancev

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

@@ -31,7 +31,7 @@
 import org.openqa.selenium.support.ui.ExpectedCondition;
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JUnit4TestBase;
-import org.openqa.selenium.testing.NoDriverAfterTest;
+import org.openqa.selenium.testing.SwitchToTopAfterTest;
 import org.openqa.selenium.testing.TestUtilities;
 import org.openqa.selenium.testing.drivers.SauceDriver;
 
@@ -65,7 +65,7 @@ public void testSetsTheSizeOfTheCurrentWindow() {
     changeSizeBy(-20, -20);
   }
 
-  @NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
+  @SwitchToTopAfterTest
   @Test
   public void testSetsTheSizeOfTheCurrentWindowFromFrame() {
     // Browser window cannot be resized or moved on ANDROID (and most mobile platforms
@@ -80,7 +80,7 @@ public void testSetsTheSizeOfTheCurrentWindowFromFrame() {
     changeSizeBy(-20, -20);
   }
 
-  @NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
+  @SwitchToTopAfterTest
   @Test
   public void testSetsTheSizeOfTheCurrentWindowFromIframe() {
     // Browser window cannot be resized or moved on ANDROID (and most mobile platforms
@@ -148,7 +148,7 @@ public void testCanMaximizeTheWindow() throws InterruptedException {
     maximize();
   }
 
-  @NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
+  @SwitchToTopAfterTest
   @Ignore(value = {PHANTOMJS}, reason = "Not yet implemented.")
   @Test
   public void testCanMaximizeTheWindowFromFrame() throws InterruptedException {
@@ -165,7 +165,7 @@ public void testCanMaximizeTheWindowFromFrame() throws InterruptedException {
   }
 
   @Ignore(value = {PHANTOMJS}, reason = "Not yet implemented.")
-  @NoDriverAfterTest // So that next test never starts with "inside a frame" base state.
+  @SwitchToTopAfterTest
   @Test
   public void testCanMaximizeTheWindowFromIframe() throws InterruptedException {
     // Browser window cannot be resized or moved on ANDROID (and most mobile platforms