Menu
▾
▴
[HtmlUnit] SVN: [7837] trunk/htmlunit/src
|
From: <asa...@us...> - 2012-12-08 09:44:44
|
Revision: 7837
http://sourceforge.net/p/htmlunit/code/7837
Author: asashour
Date: 2012-12-08 09:44:40 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
- BrowserVersion: deprecate INTERNET_EXPLORER_6 and INTERNET_EXPLORER_7
- Remove IE6/7 from default test run
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 2012-12-08 09:39:29 UTC (rev 7836)
+++ trunk/htmlunit/src/changes/changes.xml 2012-12-08 09:44:40 UTC (rev 7837)
@@ -8,6 +8,9 @@
<body>
<release version="2.12" date="???" description="Bugfixes">
+ <action type="update" dev="asashour">
+ BrowserVersion: deprecate INTERNET_EXPLORER_6 and INTERNET_EXPLORER_7.
+ </action>
<action type="fix" dev="asashour" issue="1467">
JavaScript: fix Date.toLocaleDateString().
</action>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2012-12-08 09:39:29 UTC (rev 7836)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2012-12-08 09:44:40 UTC (rev 7837)
@@ -122,12 +122,20 @@
"Mozilla/5.0 (Windows NT 6.1; rv:10.0.11) Gecko/20100101 Firefox/10.0.11",
(float) 10.0, "FF10", null);
- /** Internet Explorer 6. */
+ /**
+ * Internet Explorer 6.
+ * @deprecated as of 2.12
+ */
+ @Deprecated
public static final BrowserVersion INTERNET_EXPLORER_6 = new BrowserVersion(
INTERNET_EXPLORER, "4.0 (compatible; MSIE 6.0b; Windows 98)",
"Mozilla/4.0 (compatible; MSIE 6.0; Windows 98)", 6, "IE6", null);
- /** Internet Explorer 7. */
+ /**
+ * Internet Explorer 7.
+ * @deprecated as of 2.12
+ */
+ @Deprecated
public static final BrowserVersion INTERNET_EXPLORER_7 = new BrowserVersion(
INTERNET_EXPLORER, "4.0 (compatible; MSIE 7.0; Windows NT 5.1)",
"Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)", 7, "IE7", null);
@@ -146,7 +154,7 @@
16, "Chrome16", null);
/** The default browser version. */
- private static BrowserVersion DefaultBrowserVersion_ = INTERNET_EXPLORER_7;
+ private static BrowserVersion DefaultBrowserVersion_ = INTERNET_EXPLORER_8;
/** Register plugins for the browser versions. */
static {
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java 2012-12-08 09:39:29 UTC (rev 7836)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserRunner.java 2012-12-08 09:44:40 UTC (rev 7837)
@@ -73,10 +73,10 @@
if (/* browsers.contains("hu") ||*/ browsers.contains("hu-ff10")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.FIREFOX_10, false));
}
- if (browsers.contains("hu") || browsers.contains("hu-ie6")) {
+ if (/*browsers.contains("hu") ||*/ browsers.contains("hu-ie6")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_6, false));
}
- if (browsers.contains("hu") || browsers.contains("hu-ie7")) {
+ if (/*browsers.contains("hu") ||*/ browsers.contains("hu-ie7")) {
runners_.add(new BrowserVersionClassRunner(klass, BrowserVersion.INTERNET_EXPLORER_7, false));
}
if (browsers.contains("hu") || browsers.contains("hu-ie8")) {
|
