You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/02/19 10:23:15 UTC
git commit: WW-4292 Solves problem with failing tests
Repository: struts
Updated Branches:
refs/heads/develop c9d01e220 -> ff2a4063c
WW-4292 Solves problem with failing tests
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ff2a4063
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ff2a4063
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ff2a4063
Branch: refs/heads/develop
Commit: ff2a4063c2cae132f0a1432d6b9f11d4e9ea6efd
Parents: c9d01e2
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Feb 19 10:22:36 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Feb 19 10:22:36 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/struts2/dispatcher/FilterDispatcherTest.java | 4 ++--
core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ff2a4063/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java b/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
index 4449e40..136c5c3 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java
@@ -117,7 +117,7 @@ public class FilterDispatcherTest extends StrutsInternalTestCase {
}
@Override
- public HttpServletRequest wrapRequest(HttpServletRequest request, ServletContext servletContext) throws IOException {
+ public HttpServletRequest wrapRequest(HttpServletRequest request) throws IOException {
wrappedRequest = true;
return request;
}
@@ -142,7 +142,7 @@ public class FilterDispatcherTest extends StrutsInternalTestCase {
}
@Override
- public HttpServletRequest wrapRequest(HttpServletRequest request, ServletContext servletContext) throws IOException {
+ public HttpServletRequest wrapRequest(HttpServletRequest request) throws IOException {
wrappedRequest = true;
// if we set the chracter encoding AFTER we do wrap request, we will get
// a failing test
http://git-wip-us.apache.org/repos/asf/struts/blob/ff2a4063/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java b/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
index 12f9a64..5d1647d 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
@@ -307,7 +307,7 @@ public class FilterTest extends StrutsInternalTestCase {
}
@Override
- public HttpServletRequest wrapRequest(HttpServletRequest request, ServletContext servletContext) throws IOException {
+ public HttpServletRequest wrapRequest(HttpServletRequest request) throws IOException {
wrapRequest = true;
return request;
}