Updates tests to new version of methods without ServletContext
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9ff04d17 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9ff04d17 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9ff04d17 Branch: refs/heads/feature/WW-4292-dont-use-servletcontext Commit: 9ff04d17a5edfeb9805d1485b29eda8d0dfa3ce8 Parents: ddd2719 Author: Lukasz Lenart <[email protected]> Authored: Mon Feb 17 09:34:47 2014 +0100 Committer: Lukasz Lenart <[email protected]> Committed: Mon Feb 17 09:34:47 2014 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java | 2 +- plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/9ff04d17/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java ---------------------------------------------------------------------- diff --git a/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java b/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java index 02fd69b..7bf18b7 100644 --- a/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java +++ b/plugins/junit/src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java @@ -137,7 +137,7 @@ public abstract class StrutsJUnit4TestCase<T> extends XWorkJUnit4TestCase { ActionMapping mapping = getActionMapping(request); assertNotNull(mapping); - Dispatcher.getInstance().serviceAction(request, response, servletContext, mapping); + Dispatcher.getInstance().serviceAction(request, response, mapping); if (response.getStatus() != HttpServletResponse.SC_OK) throw new ServletException("Error code [" + response.getStatus() + "], Error: [" http://git-wip-us.apache.org/repos/asf/struts/blob/9ff04d17/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java ---------------------------------------------------------------------- diff --git a/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java b/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java index 3a14545..de6f477 100644 --- a/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java +++ b/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java @@ -115,7 +115,7 @@ public abstract class StrutsTestCase extends XWorkTestCase { ActionMapping mapping = getActionMapping(request); assertNotNull(mapping); - Dispatcher.getInstance().serviceAction(request, response, servletContext, mapping); + Dispatcher.getInstance().serviceAction(request, response, mapping); if (response.getStatus() != HttpServletResponse.SC_OK) { throw new ServletException("Error code [" + response.getStatus() + "], Error: [" + response.getErrorMessage() + "]");
