Revision: 977
http://sourceforge.net/p/jwebunit/code/977
Author: henryju
Date: 2015-07-13 15:52:13 +0000 (Mon, 13 Jul 2015)
Log Message:
-----------
Update to HtmlUnit 2.17
Modified Paths:
--------------
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/CookiesServlet.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
trunk/jwebunit-htmlunit-plugin/pom.xml
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
trunk/pom.xml
trunk/src/changes/changes.xml
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/CookiesServlet.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/CookiesServlet.java
2014-03-17 23:23:25 UTC (rev 976)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/CookiesServlet.java
2015-07-13 15:52:13 UTC (rev 977)
@@ -27,7 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.eclipse.jetty.http.HttpHeaders;
+import org.eclipse.jetty.http.HttpHeader;
public class CookiesServlet extends HttpServlet {
@@ -95,12 +95,12 @@
jsessionIDCookie.setDomain("localhost");
response.addCookie(jsessionIDCookie);
- //With Jetty 6 we are now forced to access low level
API to be able to set 2 same named cookies in the same response
+ //With Jetty 6+ we are now forced to access low level
API to be able to set 2 same named cookies in the same response
org.eclipse.jetty.server.Response responseJetty =
(org.eclipse.jetty.server.Response) response;
- String cookie1 =
responseJetty.getHttpFields().getStringField(HttpHeaders.SET_COOKIE);
+ String cookie1 =
responseJetty.getHttpFields().getStringField(HttpHeader.SET_COOKIE);
// 2
String cookie2 = cookie1.replace("worker1", "worker2");
- response.addHeader(HttpHeaders.SET_COOKIE, cookie2);
+ response.addHeader(HttpHeader.SET_COOKIE.asString(),
cookie2);
}
}
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
2014-03-17 23:23:25 UTC (rev 976)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
2015-07-13 15:52:13 UTC (rev 977)
@@ -25,11 +25,10 @@
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.junit.AfterClass;
import org.junit.BeforeClass;
import static org.junit.Assert.fail;
@@ -60,9 +59,7 @@
if (!started) {
try {
jettyServer = new Server();
- SelectChannelConnector connector = new
SelectChannelConnector();
- connector.setPort(JWebUnitAPITestCase.JETTY_PORT);
- connector.setAcceptors(5);
+ ServerConnector connector = new
ServerConnector(jettyServer);
connector.setPort(JWebUnitAPITestCase.JETTY_PORT);
jettyServer.setConnectors(new Connector[] { connector
});
Modified: trunk/jwebunit-htmlunit-plugin/pom.xml
===================================================================
--- trunk/jwebunit-htmlunit-plugin/pom.xml 2014-03-17 23:23:25 UTC (rev
976)
+++ trunk/jwebunit-htmlunit-plugin/pom.xml 2015-07-13 15:52:13 UTC (rev
977)
@@ -23,7 +23,7 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.14</version>
+ <version>2.17</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
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
2014-03-17 23:23:25 UTC (rev 976)
+++
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
2015-07-13 15:52:13 UTC (rev 977)
@@ -169,7 +169,7 @@
/**
* The default browser version.
*/
- private BrowserVersion defaultBrowserVersion = BrowserVersion.FIREFOX_24;
+ private BrowserVersion defaultBrowserVersion = BrowserVersion.FIREFOX_38;
/**
* Should we ignore failing status codes?
@@ -222,7 +222,7 @@
ExpectedJavascriptConfirmException,
ExpectedJavascriptPromptException {
if (wc != null) {
- wc.closeAllWindows();
+ wc.close();
wc = null;
}
form = null; // reset current form
@@ -841,7 +841,7 @@
*/
BrowserVersion bv;
if (testContext.getUserAgent() != null) {
- bv = BrowserVersion.FIREFOX_24;
+ bv = BrowserVersion.FIREFOX_38;
bv.setUserAgent(testContext.getUserAgent());
} else {
bv = defaultBrowserVersion; // use default (which includes a full
UserAgent string)
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-03-17 23:23:25 UTC (rev 976)
+++ trunk/pom.xml 2015-07-13 15:52:13 UTC (rev 977)
@@ -20,7 +20,7 @@
</issueManagement>
<inceptionYear>2002</inceptionYear>
<prerequisites>
- <maven>2.2.1</maven>
+ <maven>3.0</maven>
</prerequisites>
<modules>
<module>jwebunit-code-generator</module>
@@ -199,8 +199,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
@@ -379,7 +379,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>8.1.7.v20120910</version>
+ <version>9.2.11.v20150529</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: trunk/src/changes/changes.xml
===================================================================
--- trunk/src/changes/changes.xml 2014-03-17 23:23:25 UTC (rev 976)
+++ trunk/src/changes/changes.xml 2015-07-13 15:52:13 UTC (rev 977)
@@ -30,6 +30,14 @@
</author>
</properties>
<body>
+ <release version="3.3" date="UNKNOWN" description="HtmlUnit 2.17, Java
7">
+ <action type="update" dev="henryju">
+ Updated to HtmlUnit 2.17.
+ </action>
+ <action type="update" dev="henryju">
+ Requires Java 7+.
+ </action>
+ </release>
<release version="3.2" date="March 17, 2014" description="HtmlUnit
2.14">
<action type="update" dev="henryju">
Updated to JUnit 4.11.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
JWebUnit-development mailing list
JWebUnit-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
