Menu
▾
▴
[HtmlUnit] SVN: [9067] trunk/htmlunit/src
|
From: <asa...@us...> - 2014-01-26 07:54:41
|
Revision: 9067
http://sourceforge.net/p/htmlunit/code/9067
Author: asashour
Date: 2014-01-26 07:54:37 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
update deprecation usage
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/DisabledElementTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/DebugFrameImplTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MimeTypeTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowConcurrencyTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java 2014-01-26 07:42:19 UTC (rev 9066)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/geo/Geolocation.java 2014-01-26 07:54:37 UTC (rev 9067)
@@ -153,7 +153,7 @@
LOG.info("Invoking URL: " + url);
}
- final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_17);
+ final WebClient webClient = new WebClient(BrowserVersion.FIREFOX_24);
try {
final Page page = webClient.getPage(url);
final String content = page.getWebResponse().getContentAsString();
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java 2014-01-26 07:42:19 UTC (rev 9066)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java 2014-01-26 07:54:37 UTC (rev 9067)
@@ -15,7 +15,7 @@
package com.gargoylesoftware.htmlunit;
import static com.gargoylesoftware.htmlunit.BrowserRunner.Browser.NONE;
-import static com.gargoylesoftware.htmlunit.BrowserVersion.INTERNET_EXPLORER_8;
+import static com.gargoylesoftware.htmlunit.BrowserVersion.INTERNET_EXPLORER_11;
import static java.util.Arrays.asList;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
@@ -1628,7 +1628,7 @@
@Test
public void testUrlEncoding() throws Exception {
final URL url = new URL("http://host/x+y\u00E9/a\u00E9 b?c \u00E9 d");
- final HtmlPage page = loadPage(BrowserVersion.FIREFOX_17, "<html></html>", new ArrayList<String>(), url);
+ final HtmlPage page = loadPage(BrowserVersion.FIREFOX_24, "<html></html>", new ArrayList<String>(), url);
final WebRequest wrs = page.getWebResponse().getWebRequest();
assertEquals("http://host/x+y%C3%A9/a%C3%A9%20b?c%20%E9%20d", wrs.getUrl());
}
@@ -1641,7 +1641,7 @@
@Test
public void testUrlEncoding2() throws Exception {
final URL url = new URL("http://host/x+y\u00E9/a\u00E9 b?c \u00E9 d");
- final HtmlPage page = loadPage(INTERNET_EXPLORER_8, "<html></html>", new ArrayList<String>(), url);
+ final HtmlPage page = loadPage(INTERNET_EXPLORER_11, "<html></html>", new ArrayList<String>(), url);
final WebRequest wrs = page.getWebResponse().getWebRequest();
assertEquals("http://host/x+y%C3%A9/a%C3%A9%20b?c%20\u00E9%20d", wrs.getUrl());
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/DisabledElementTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/DisabledElementTest.java 2014-01-26 07:42:19 UTC (rev 9066)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/DisabledElementTest.java 2014-01-26 07:54:37 UTC (rev 9067)
@@ -122,7 +122,7 @@
final String htmlContent = MessageFormat.format(htmlContent_, new Object[]{disabledAttribute});
final List<String> collectedAlerts = new ArrayList<String>();
- final HtmlPage page = loadPage(BrowserVersion.FIREFOX_17, htmlContent, collectedAlerts);
+ final HtmlPage page = loadPage(BrowserVersion.FIREFOX_24, htmlContent, collectedAlerts);
final DisabledElement element = (DisabledElement) page.getHtmlElementById("element1");
assertEquals(expectedIsDisabled, element.isDisabled());
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/DebugFrameImplTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/DebugFrameImplTest.java 2014-01-26 07:42:19 UTC (rev 9066)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/DebugFrameImplTest.java 2014-01-26 07:54:37 UTC (rev 9067)
@@ -51,7 +51,7 @@
* @throws Exception if an exception occurs
*/
public DebugFrameImplTest() throws Exception {
- client_ = new WebClient(BrowserVersion.FIREFOX_17);
+ client_ = new WebClient(BrowserVersion.FIREFOX_24);
client_.getJavaScriptEngine().getContextFactory().setDebugger(new DebuggerImpl());
originalLogLevel_ = loggerDebugFrameImpl_.getLevel();
loggerDebugFrameImpl_.setLevel(Level.TRACE);
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MimeTypeTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MimeTypeTest.java 2014-01-26 07:42:19 UTC (rev 9066)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/MimeTypeTest.java 2014-01-26 07:54:37 UTC (rev 9067)
@@ -56,7 +56,7 @@
createTestPageForRealBrowserIfNeeded(html, expectedAlerts);
final List<String> collectedAlerts = new ArrayList<String>();
- loadPage(BrowserVersion.FIREFOX_17, html, collectedAlerts);
+ loadPage(BrowserVersion.FIREFOX_24, html, collectedAlerts);
assertEquals(expectedAlerts, collectedAlerts);
}
@@ -80,14 +80,14 @@
final List<String> collectedAlerts = new ArrayList<String>();
final Set<PluginConfiguration> plugins =
- new HashSet<PluginConfiguration>(BrowserVersion.FIREFOX_17.getPlugins());
- BrowserVersion.FIREFOX_17.getPlugins().clear();
+ new HashSet<PluginConfiguration>(BrowserVersion.FIREFOX_24.getPlugins());
+ BrowserVersion.FIREFOX_24.getPlugins().clear();
try {
- loadPage(BrowserVersion.FIREFOX_17, html, collectedAlerts);
+ loadPage(BrowserVersion.FIREFOX_24, html, collectedAlerts);
assertEquals(expectedAlerts, collectedAlerts);
}
finally {
- BrowserVersion.FIREFOX_17.getPlugins().addAll(plugins);
+ BrowserVersion.FIREFOX_24.getPlugins().addAll(plugins);
}
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowConcurrencyTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowConcurrencyTest.java 2014-01-26 07:42:19 UTC (rev 9066)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowConcurrencyTest.java 2014-01-26 07:54:37 UTC (rev 9067)
@@ -188,7 +188,7 @@
+ "<script>var id = setInterval('document.getElementById(\"d\").innerHTML += \"x\"', 0);</script>\n"
+ "</body></html>";
- WebClient client = new WebClient(BrowserVersion.FIREFOX_17);
+ WebClient client = new WebClient(BrowserVersion.FIREFOX_24);
try {
final HtmlPage page1 = loadPage(client, html, new ArrayList<String>());
Thread.sleep(1000);
@@ -200,7 +200,7 @@
client.closeAllWindows();
}
- client = new WebClient(BrowserVersion.INTERNET_EXPLORER_8);
+ client = new WebClient(BrowserVersion.INTERNET_EXPLORER_11);
try {
final HtmlPage page2 = loadPage(client, html, new ArrayList<String>());
client.waitForBackgroundJavaScript(1000);
@@ -525,7 +525,7 @@
+ "setInterval(forceStyleComputationInParent, 10);\n"
+ "</script></head></body></html>";
- client_ = new WebClient(BrowserVersion.FIREFOX_17);
+ client_ = new WebClient(BrowserVersion.FIREFOX_24);
final MockWebConnection webConnection = new MockWebConnection();
webConnection.setResponse(URL_FIRST, html);
webConnection.setDefaultResponse(html2);
|
