Changing the tests for getCurrentUrl to conform to the standard

Author: barancev

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

@@ -31,6 +31,8 @@
 import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
 import static org.openqa.selenium.testing.Ignore.Driver.ALL;
 import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
+import static org.openqa.selenium.testing.Ignore.Driver.FIREFOX;
+import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
 import static org.openqa.selenium.testing.Ignore.Driver.IE;
 import static org.openqa.selenium.testing.Ignore.Driver.MARIONETTE;
 import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
@@ -412,23 +414,24 @@ public void testShouldBeAbleToFindElementsInIframesByXPath() {
     assertNotNull(element);
   }
 
-  @Ignore({MARIONETTE})
+  @Ignore({CHROME, FIREFOX, HTMLUNIT, IE, PHANTOMJS, SAFARI})
   @Test
-  public void testGetCurrentUrl() {
+  public void testGetCurrentUrlReturnsTopLevelBrowsingContextUrl() {
     driver.get(pages.framesetPage);
+    assertThat(driver.getCurrentUrl(), equalTo(pages.framesetPage));
 
     driver.switchTo().frame("second");
+    assertThat(driver.getCurrentUrl(), equalTo(pages.framesetPage));
+  }
 
-    String url = appServer.whereIs("page/2");
-    assertThat(driver.getCurrentUrl(), equalTo(url + "?title=Fish"));
-
-    url = appServer.whereIs("iframes.html");
+  @Ignore({CHROME, FIREFOX, HTMLUNIT, IE, PHANTOMJS, SAFARI})
+  @Test
+  public void testGetCurrentUrlReturnsTopLevelBrowsingContextUrlForIframes() {
     driver.get(pages.iframePage);
-    assertThat(driver.getCurrentUrl(), equalTo(url));
+    assertThat(driver.getCurrentUrl(), equalTo(pages.iframePage));
 
-    url = appServer.whereIs("formPage.html");
-    driver.switchTo().frame("iframe1");
-    assertThat(driver.getCurrentUrl(), equalTo(url));
+    driver.switchTo().frame("second");
+    assertThat(driver.getCurrentUrl(), equalTo(pages.iframePage));
   }
 
   @Ignore(value = {PHANTOMJS})
@@ -544,7 +547,6 @@ public void testJavaScriptShouldExecuteInTheContextOfTheCurrentFrame() {
     assertTrue((Boolean) executor.executeScript("return window != window.top"));
   }
 
-  @Ignore(MARIONETTE)
   @Test
   public void testShouldNotSwitchMagicallyToTheTopWindow() {
     String baseUrl = appServer.whereIs("frame_switching_tests/");
@@ -560,7 +562,7 @@ public void testShouldNotSwitchMagicallyToTheTopWindow() {
         input.sendKeys("rand" + new Random().nextInt());
         submit.click();
       } finally {
-        String url = driver.getCurrentUrl();
+        String url = (String) ((JavascriptExecutor) driver).executeScript("return window.location.href");
         // IE6 and Chrome add "?"-symbol to the end of the URL
         if (url.endsWith("?")) {
           url = url.substring(0, url.length()-1);