From 9ff04d17a5edfeb9805d1485b29eda8d0dfa3ce8 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Mon, 17 Feb 2014 09:34:47 +0100 Subject: [PATCH] Updates tests to new version of methods without ServletContext --- .../src/main/java/org/apache/struts2/StrutsJUnit4TestCase.java | 2 +- .../junit/src/main/java/org/apache/struts2/StrutsTestCase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 02fd69b81..7bf18b7a3 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 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: [" 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 3a145459c..de6f477ff 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() + "]");