Menu
▾
▴
[HtmlUnit] SVN: [14633] trunk/htmlunit/src
|
From: <rb...@us...> - 2017-06-25 08:35:14
|
Revision: 14633
http://sourceforge.net/p/htmlunit/code/14633
Author: rbri
Date: 2017-06-25 08:35:12 +0000 (Sun, 25 Jun 2017)
Log Message:
-----------
small updates for new releases, switch to 64 bit because we test with these versions
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/javascript/host/NavigatorTest.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2017-06-24 14:39:24 UTC (rev 14632)
+++ trunk/htmlunit/src/changes/changes.xml 2017-06-25 08:35:12 UTC (rev 14633)
@@ -8,6 +8,12 @@
<body>
<release version="2.28" date="???" description="Bugfixes">
+ <action type="update" dev="rbri">
+ We are simulating the 64 bit version of Firefox 52 ESR and CHROME now.
+ </action>
+ <action type="update" dev="rbri">
+ More appropriate browser appVersion.
+ </action>
<action type="fix" dev="asashour" issue="1892">
JavaScript: fix Number.toLocaleString().
</action>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2017-06-24 14:39:24 UTC (rev 14632)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2017-06-25 08:35:12 UTC (rev 14633)
@@ -123,6 +123,11 @@
private static final String PLATFORM_WIN32 = "Win32";
/**
+ * The WIN64 platform.
+ */
+ private static final String PLATFORM_WIN64 = "Win64";
+
+ /**
* Firefox 45 ESR.
* @since 2.21
*/
@@ -142,15 +147,15 @@
/** Internet Explorer 11. */
public static final BrowserVersion INTERNET_EXPLORER = new BrowserVersion(
- NETSCAPE, "5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko",
+ NETSCAPE, "5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko",
"Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko", 11, "IE", null);
/** Latest Chrome. */
public static final BrowserVersion CHROME = new BrowserVersion(
- NETSCAPE, "5.0 (Windows NT 6.1) AppleWebKit/537.36"
- + " (KHTML, like Gecko) Chrome/59.0.3071.104 Safari/537.36",
+ NETSCAPE, "5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36"
+ + " (KHTML, like Gecko) Chrome/59.0.3071.109 Safari/537.36",
"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36"
- + " (KHTML, like Gecko) Chrome/59.0.3071.104 Safari/537.36",
+ + " (KHTML, like Gecko) Chrome/59.0.3071.109 Safari/537.36",
59, "Chrome", null);
/** Microsoft Edge. Work In Progress!!! */
@@ -174,6 +179,7 @@
// FF45
FIREFOX_45.initDefaultFeatures();
FIREFOX_45.setVendor("");
+ FIREFOX_45.setPlatform(PLATFORM_WIN32);
FIREFOX_45.buildId_ = "20170411115307";
FIREFOX_45.setHeaderNamesOrdered(new String[] {
"Host", "User-Agent", "Accept", "Accept-Language", "Accept-Encoding", "Referer", "Cookie", "Connection"});
@@ -185,7 +191,7 @@
// FF52
FIREFOX_52.initDefaultFeatures();
FIREFOX_52.setVendor("");
- FIREFOX_52.buildId_ = "20170517122419";
+ FIREFOX_52.buildId_ = "20170607123825";
FIREFOX_52.setHeaderNamesOrdered(new String[] {
"Host", "User-Agent", "Accept", "Accept-Language", "Accept-Encoding", "Referer", "Cookie", "Connection", "Upgrade-Insecure-Requests"});
FIREFOX_52.setHtmlAcceptHeader("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
@@ -194,6 +200,7 @@
// IE
INTERNET_EXPLORER.initDefaultFeatures();
INTERNET_EXPLORER.setVendor("");
+ INTERNET_EXPLORER.setPlatform(PLATFORM_WIN32);
INTERNET_EXPLORER.setHeaderNamesOrdered(new String[] {
"Accept", "Referer", "Accept-Language", "User-Agent", "Accept-Encoding", "Host", "DNT", "Connection",
"Cookie"});
@@ -210,7 +217,7 @@
CHROME.initDefaultFeatures();
CHROME.setApplicationCodeName("Mozilla");
CHROME.setVendor("Google Inc.");
- CHROME.setPlatform("MacIntel");
+ CHROME.setPlatform(PLATFORM_WIN32);
CHROME.setCpuClass(null);
CHROME.setHeaderNamesOrdered(new String[] {
"Host", "Connection", "Upgrade-Insecure-Requests", "User-Agent", "Accept", "Referer", "Accept-Encoding", "Accept-Language", "Cookie"});
@@ -320,19 +327,19 @@
CHROME.getPlugins().add(flash);
flash = new PluginConfiguration("Shockwave Flash",
- "Shockwave Flash 25.0 r0", "25.0.0.171", "NPSWF32_25_0_0_171.dll");
+ "Shockwave Flash 26.0 r0", "26.0.0.131", "NPSWF32_26_0_0_131.dll");
flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
"Shockwave Flash", "swf"));
FIREFOX_45.getPlugins().add(flash);
flash = new PluginConfiguration("Shockwave Flash",
- "Shockwave Flash 25.0 r0", "25.0.0.171", "NPSWF32_25_0_0_171.dll");
+ "Shockwave Flash 26.0 r0", "26.0.0.131", "NPSWF64_26_0_0_131.dll");
flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
"Shockwave Flash", "swf"));
FIREFOX_52.getPlugins().add(flash);
flash = new PluginConfiguration("Shockwave Flash",
- "Shockwave Flash 25.0 r0", "25.0.0.171", "Flash32_25_0_0_171.ocx");
+ "Shockwave Flash 26.0 r0", "26.0.0.131", "Flash32_26_0_0_131.ocx");
flash.getMimeTypes().add(new PluginConfiguration.MimeType("application/x-shockwave-flash",
"Shockwave Flash", "swf"));
INTERNET_EXPLORER.getPlugins().add(flash);
@@ -353,7 +360,7 @@
private String browserLanguage_ = LANGUAGE_ENGLISH_US;
private String cpuClass_ = CPU_CLASS_X86;
private boolean onLine_ = true;
- private String platform_ = PLATFORM_WIN32;
+ private String platform_ = PLATFORM_WIN64;
private String systemLanguage_ = LANGUAGE_ENGLISH_US;
private TimeZone systemTimezone_ = TimeZone.getTimeZone(TIMEZONE_NEW_YORK);
private String userAgent_;
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java 2017-06-24 14:39:24 UTC (rev 14632)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java 2017-06-25 08:35:12 UTC (rev 14633)
@@ -74,8 +74,7 @@
@Test
public void appVersion() throws Exception {
attribute("appVersion", getBrowserVersion().getApplicationVersion(),
- "WOW64; ", "; WOW64", "; Win64", "; x64", "SLCC2; ",
- ".NET CLR 2.0.50727; ", ".NET CLR 3.5.30729; ", ".NET CLR 3.0.30729; ",
+ "SLCC2; ", ".NET CLR 2.0.50727; ", ".NET CLR 3.5.30729; ", ".NET CLR 3.0.30729; ",
"Media Center PC 6.0; ", ".NET4.0C; ", ".NET4.0E; ");
}
@@ -210,9 +209,10 @@
* @throws Exception on test failure
*/
@Test
- @Alerts(FF = {"Shockwave Flash", "Shockwave Flash 25.0 r0", "25.0.0.171", "NPSWF32_25_0_0_171.dll"},
+ @Alerts(FF45 = {"Shockwave Flash", "Shockwave Flash 26.0 r0", "26.0.0.131", "NPSWF32_26_0_0_131.dll"},
+ FF52 = {"Shockwave Flash", "Shockwave Flash 26.0 r0", "26.0.0.131", "NPSWF64_26_0_0_131.dll"},
CHROME = {"Shockwave Flash", "Shockwave Flash 24.0 r0", "undefined", "internal-not-yet-present"},
- IE = {"Shockwave Flash", "Shockwave Flash 25.0 r0", "25.0.0.171", "Flash32_25_0_0_171.ocx"},
+ IE = {"Shockwave Flash", "Shockwave Flash 26.0 r0", "26.0.0.131", "Flash32_26_0_0_131.ocx"},
EDGE = {"Shockwave Flash", "Shockwave Flash 18.0 r0", "18.0.0.232", "Flash.ocx"})
public void pluginsShockwaveFlash() throws Exception {
final String html = "<html>\n"
@@ -375,7 +375,7 @@
@Test
@Alerts(DEFAULT = "undefined",
FF45 = "20170411115307",
- FF52 = "20170517122419")
+ FF52 = "20170607123825")
public void buildID() throws Exception {
final String html
= "<html><head><title>First</title>\n"
|
