Menu
▾
▴
[HtmlUnit] SVN: [8942] trunk/htmlunit/src
|
From: <rb...@us...> - 2014-01-02 16:22:45
|
Revision: 8942
http://sourceforge.net/p/htmlunit/code/8942
Author: rbri
Date: 2014-01-02 16:22:41 +0000 (Thu, 02 Jan 2014)
Log Message:
-----------
deprecate FIREFOX_17, FIREFOX_24 is our preferred Firefox for the next months
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2014-01-02 15:14:08 UTC (rev 8941)
+++ trunk/htmlunit/src/changes/changes.xml 2014-01-02 16:22:41 UTC (rev 8942)
@@ -7,7 +7,10 @@
</properties>
<body>
- <release version="2.14" date="???" description="Bugfixes, initial work on FF24 and IE11">
+ <release version="2.14" date="???" description="FF24, Bugfixes, initial work on IE11">
+ <action type="update" dev="rbri">
+ BrowserVersion: deprecate FIREFOX_17, FIREFOX_24 is our preferred Firefox for the next months.
+ </action>
<action type="fix" dev="rbri">
JavaScript: Document.inputEncoding and Document.characterSet are doing some kind of
normalization on the encoding string starting with FF24.
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2014-01-02 15:14:08 UTC (rev 8941)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2014-01-02 16:22:41 UTC (rev 8942)
@@ -67,6 +67,7 @@
* @author Chris Erskine
* @author Ahmed Ashour
* @author Frank Danek
+ * @author Ronald Brill
*/
public class BrowserVersion implements Serializable, Cloneable {
@@ -120,7 +121,9 @@
/**
* Firefox 17 ESR.
* @since 2.12
+ * @deprecated as of 2.14
*/
+ @Deprecated
public static final BrowserVersion FIREFOX_17 = new BrowserVersion(
NETSCAPE, "5.0 (Windows)",
"Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0",
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java 2014-01-02 15:14:08 UTC (rev 8941)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java 2014-01-02 16:22:41 UTC (rev 8942)
@@ -70,10 +70,10 @@
if (BrowserVersionClassRunner.containsTestMethods(klass)) {
final List<String> browsers = WebDriverTestCase.getBrowsersProperties();
- if (browsers.contains("hu") || browsers.contains("hu-ff17")) {
+ if (/*browsers.contains("hu") ||*/ browsers.contains("hu-ff17")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_17, false));
}
- if (/*browsers.contains("hu") ||*/ browsers.contains("hu-ff24")) {
+ if (browsers.contains("hu") || browsers.contains("hu-ff24")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_24, false));
}
if (browsers.contains("hu") || browsers.contains("hu-ie8")) {
|
