[JWebUnit-development] SF.net SVN: jwebunit:[966] trunk

[<he...@us...>]

Revision: 966
          http://sourceforge.net/p/jwebunit/code/966
Author:   henryju
Date:     2014-03-17 08:38:29 +0000 (Mon, 17 Mar 2014)
Log Message:
-----------
Update to HtmlUnit 2.14

Modified Paths:
--------------
    trunk/jwebunit-htmlunit-plugin/pom.xml
    trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
    trunk/src/changes/changes.xml

Modified: trunk/jwebunit-htmlunit-plugin/pom.xml
===================================================================
--- trunk/jwebunit-htmlunit-plugin/pom.xml	2012-11-27 16:00:24 UTC (rev 965)
+++ trunk/jwebunit-htmlunit-plugin/pom.xml	2014-03-17 08:38:29 UTC (rev 966)
@@ -17,18 +17,18 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-        	<artifactId>mockito-core</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.11</version>
+            <version>2.14</version>
             <exclusions>
-            	<exclusion>
-            		<artifactId>commons-logging</artifactId>
-            		<groupId>commons-logging</groupId>
-            	</exclusion>
+              <exclusion>
+                <artifactId>commons-logging</artifactId>
+                <groupId>commons-logging</groupId>
+              </exclusion>
             </exclusions>
         </dependency>
         <dependency>

Modified: trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
===================================================================
--- trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java	2012-11-27 16:00:24 UTC (rev 965)
+++ trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java	2014-03-17 08:38:29 UTC (rev 966)
@@ -169,7 +169,7 @@
   /**
    * The default browser version.
    */
-  private BrowserVersion defaultBrowserVersion = BrowserVersion.FIREFOX_3_6;
+  private BrowserVersion defaultBrowserVersion = BrowserVersion.FIREFOX_24;
 
   /**
      * Should we ignore failing status codes?
@@ -836,12 +836,12 @@
      * The user agent string is now provided by default to new test cases.
      * It can still be overridden if testContext.getUserAgent() is not
      * null (i.e. has been set manually.)
-     * 
+     *
      * @author Jevon
      */
     BrowserVersion bv;
     if (testContext.getUserAgent() != null) {
-      bv = BrowserVersion.FIREFOX_3_6;
+      bv = BrowserVersion.FIREFOX_24;
       bv.setUserAgent(testContext.getUserAgent());
     } else {
       bv = defaultBrowserVersion; // use default (which includes a full UserAgent string)
@@ -2381,7 +2381,7 @@
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see net.sourceforge.jwebunit.api.ITestingEngine#getElementByXPath(java.lang.String)
    */
   @Override
@@ -2395,7 +2395,7 @@
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see net.sourceforge.jwebunit.api.ITestingEngine#getElementByID(java.lang.String)
    */
   @Override
@@ -2409,7 +2409,7 @@
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see net.sourceforge.jwebunit.api.ITestingEngine#getElementsByXPath(java.lang.String)
    */
   @Override
@@ -2425,7 +2425,7 @@
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see net.sourceforge.jwebunit.api.ITestingEngine#getServerResponseCode()
    */
   @Override
@@ -2453,7 +2453,7 @@
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see net.sourceforge.jwebunit.api.ITestingEngine#getHeader(java.lang.String)
    */
   @Override
@@ -2463,7 +2463,7 @@
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see net.sourceforge.jwebunit.api.ITestingEngine#getAllHeaders()
    */
   @Override

Modified: trunk/src/changes/changes.xml
===================================================================
--- trunk/src/changes/changes.xml	2012-11-27 16:00:24 UTC (rev 965)
+++ trunk/src/changes/changes.xml	2014-03-17 08:38:29 UTC (rev 966)
@@ -31,6 +31,9 @@
     </properties>
     <body>
         <release version="3.2" date="UNKNOW" description="">
+            <action type="update" dev="henryju">
+                Updated to HtmlUnit 2.14.
+            </action>
             <action type="fix" dev="henryju" issue="3590252" due-to="Kenny MacLeod">
                 Assert form is present before really calling setWorkingForm(String nameOrId, int index).
             </action>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.