diff --git a/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElement3Test.java b/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElement3Test.java index dd7b2549a52..9069a8d0234 100644 --- a/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElement3Test.java +++ b/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLIFrameElement3Test.java @@ -63,13 +63,17 @@ protected boolean needThreeConnections() { public void style() throws Exception { final String html = "\n" - + "First\n" + "\n" - + ""; - loadPageWithAlerts2(html); + + "\n" + + ""; + + loadPageVerifyTitle2(html); } /** @@ -80,14 +84,17 @@ public void style() throws Exception { public void referenceFromJavaScript() throws Exception { final String html = "\n" - + "First\n" + "\n" + ""; - loadPageWithAlerts2(html); + + loadPageVerifyTitle2(html); } /** @@ -99,16 +106,19 @@ public void referenceFromJavaScript() throws Exception { public void directAccessPerName() throws Exception { final String html = "\n" - + "First\n" + "\n" + "\n" + "\n" + ""; - loadPageWithAlerts2(html); + + loadPageVerifyTitle2(html); } /** @@ -150,18 +160,18 @@ public void contentDocument() throws Exception { = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "\n" + "\n" - + " first\n" + " \n" + "\n" + "\n" + " \n" + ""; - loadPageWithAlerts2(html); + loadPageVerifyTitle2(html); } /** @@ -172,16 +182,18 @@ public void contentDocument() throws Exception { public void frameElement() throws Exception { final String html = "\n" - + "first\n" + + "\n" + "\n" + "\n" + "\n" + ""; - loadPageWithAlerts2(html); + + loadPageVerifyTitle2(html); } /** @@ -200,30 +212,32 @@ public void writeToIFrame() throws Exception { final String html = "\n" + ""; - loadPageWithAlerts2(html); + + loadPageVerifyTitle2(html); } /** @@ -269,10 +283,12 @@ public void iFrameReinitialized() throws Exception { public void setSrc_JavascriptUrl() throws Exception { final String html = "\n" - + "First\n" + "\n" @@ -284,7 +300,7 @@ public void setSrc_JavascriptUrl() throws Exception { Assert.fail("Blocks real IE"); } - loadPageWithAlerts2(html); + loadPageVerifyTitle2(html); } /** @@ -304,11 +320,12 @@ public void width() throws Exception { + "\n" + "\n" + "\n" + ""; - loadPageWithAlerts2(html); + + loadPageVerifyTitle2(html); } /** @@ -357,11 +375,12 @@ public void height() throws Exception { + "\n" + "\n" + "\n" + ""; - loadPageWithAlerts2(html); + + loadPageVerifyTitle2(html); } /** @@ -413,15 +433,16 @@ public void readyState_IFrame() throws Exception { + " \n" + " \n" + " \n" + " \n" + ""; - loadPageWithAlerts2(html); + loadPageVerifyTitle2(html); } /** @@ -457,16 +478,18 @@ public void width_px() throws Exception { = "\n" + "\n" + "\n" + "\n" + " \n" + ""; - loadPageWithAlerts2(html); + + loadPageVerifyTitle2(html); } /** @@ -482,17 +505,19 @@ public void idByName() throws Exception { = HtmlPageTest.STANDARDS_MODE_PREFIX_ + "\n" + "\n" + "\n" + " \n" + ""; - loadPageWithAlerts2(html); + + loadPageVerifyTitle2(html); } /** @@ -617,20 +642,20 @@ public void domain() throws Exception { = "\n" + "\n" + "\n" - + " OnloadTest\n" + " \n" + "\n" @@ -647,7 +672,7 @@ public void domain() throws Exception { getMockWebConnection().setResponse(new URL(URL_FIRST, "content.html"), left); - loadPageWithAlerts2(html); + loadPageVerifyTitle2(html); assertEquals(2, getMockWebConnection().getRequestCount()); } @@ -661,8 +686,8 @@ public void domainDynamic() throws Exception { = "\n" + "\n" + "\n" - + " OnloadTest\n" + " \n" + "\n" @@ -682,7 +707,7 @@ public void domainDynamic() throws Exception { + "\n" + ""; - loadPageWithAlerts2(html); + loadPageVerifyTitle2(html); assertEquals(1, getMockWebConnection().getRequestCount()); } @@ -699,10 +724,11 @@ public void contentWindowAndActiveElement() throws Exception { + "\n" + "\n" + " \n" + "\n" @@ -735,7 +761,7 @@ public void contentWindowAndActiveElement() throws Exception { driver.switchTo().defaultContent(); jsExecutor.executeScript("check();"); - verifyAlerts(driver, alerts[i++], alerts[i++], alerts[i++]); + verifyTitle2(driver, alerts[i++], alerts[i++], alerts[i++]); } /** @@ -831,7 +857,6 @@ private void retrictByHeader(final NameValuePair header, final URL contentUrl) t = "\n" + "\n" + "\n" - + " Deny\n" + "