[prev in list] [next in list] [prev in thread] [next in thread] 

List:       htmlunit-develop
Subject:    [HtmlUnit] SVN: [8717] trunk/htmlunit/src
From:       rbri () users ! sourceforge ! net
Date:       2013-10-31 17:05:16
Message-ID: E1VbvgO-0007AG-7V () sfs-ml-2 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 8717
          http://sourceforge.net/p/htmlunit/code/8717
Author:   rbri
Date:     2013-10-31 17:05:15 +0000 (Thu, 31 Oct 2013)
Log Message:
-----------
fix browser language and buildID for FF17 and FF24

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java
  trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java


Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
 ===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2013-10-30 \
                20:18:48 UTC (rev 8716)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java	2013-10-31 \
17:05:15 UTC (rev 8717) @@ -74,6 +74,7 @@
     private String applicationMinorVersion_ = "0";
     private String applicationName_;
     private String applicationVersion_;
+    private String buildId_;
     private String browserLanguage_ = LANGUAGE_ENGLISH_US;
     private String cpuClass_ = CPU_CLASS_X86;
     private boolean onLine_ = true;
@@ -167,12 +168,16 @@
 
         FIREFOX_17.initDefaultFeatures();
 
+        FIREFOX_17.setBrowserLanguage("en-US");
+        FIREFOX_17.buildId_ = "20130805152501";
         FIREFOX_17.setHtmlAcceptHeader("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
                
         FIREFOX_17.setImgAcceptHeader("image/png,image/*;q=0.8,*/*;q=0.5");
         FIREFOX_17.setCssAcceptHeader("text/css,*/*;q=0.1");
 
         FIREFOX_24.initDefaultFeatures();
 
+        FIREFOX_24.setBrowserLanguage("en-US");
+        FIREFOX_24.buildId_ = "20130910201120";
         FIREFOX_24.setHtmlAcceptHeader("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
                
         FIREFOX_24.setImgAcceptHeader("image/png,image/*;q=0.8,*/*;q=0.5");
         FIREFOX_24.setCssAcceptHeader("text/css,*/*;q=0.1");
@@ -644,6 +649,14 @@
         return nickname_;
     }
 
+    /**
+     * Returns the buildId.
+     * @return the buildId
+     */
+    public String getBuildId() {
+        return buildId_;
+    }
+
     @Override
     public String toString() {
         return nickname_;
@@ -668,6 +681,7 @@
         clone.setSystemLanguage(getSystemLanguage());
         clone.setUserLanguage(getUserLanguage());
 
+        clone.buildId_ = getBuildId();
         clone.htmlAcceptHeader_ = getHtmlAcceptHeader();
         clone.imgAcceptHeader_ = getImgAcceptHeader();
         clone.cssAcceptHeader_ = getCssAcceptHeader();

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java
 ===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java	2013-10-30 \
                20:18:48 UTC (rev 8716)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/Navigator.java	2013-10-31 \
17:05:15 UTC (rev 8717) @@ -272,14 +272,7 @@
      */
     @JsxGetter(@WebBrowser(FF))
     public String getBuildID() {
-        final BrowserVersion browser = getBrowserVersion();
-        if ("FF17".equals(browser.getNickname())) {
-            return "20121129151842";
-        }
-        if ("FF3.6".equals(browser.getNickname())) {
-            return "20120306064154";
-        }
-        return "20120713134347";
+        return getBrowserVersion().getBuildId();
     }
 
     /**

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	2013-10-30 \
                20:18:48 UTC (rev 8716)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/NavigatorTest.java	2013-10-31 \
17:05:15 UTC (rev 8717) @@ -222,7 +222,7 @@
      */
     @Test
     @Alerts(CHROME = "undefined",
-            FF = "en-us",
+            FF = "en-US",
             IE = "undefined")
     public void language() throws Exception {
         final String html
@@ -303,7 +303,7 @@
      */
     @Test
     @Alerts(DEFAULT = "undefined",
-            FF17 = "20121129151842",
+            FF17 = "20130805152501",
             FF24 = "20130910201120")
     public void buildID() throws Exception {
         final String html


------------------------------------------------------------------------------
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk
_______________________________________________
HtmlUnit-develop mailing list
HtmlUnit-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/htmlunit-develop


[prev in list] [next in list] [prev in thread] [next in thread]