From 85cfb8ba7630defcc91708808da641f4ed34a3ca Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Wed, 16 Jan 2013 10:39:01 +0000 Subject: [PATCH] Solves problem with missing action name when mapping returned with empty action name git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1433889 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/struts2/dispatcher/FilterDispatcherTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 c82c81877..b1c54580b 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/FilterDispatcherTest.java @@ -40,6 +40,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Collections; import java.util.HashMap; /** @@ -92,8 +93,9 @@ public class FilterDispatcherTest extends StrutsTestCase { return _dispatcher; } }; - filter.setActionMapper(new InnerActionMapper()); filter.init(filterConfig); + // set ActionMapper after init() as all dependencies will be injected in init() + filter.setActionMapper(new InnerActionMapper()); _dispatcher.setDefaultEncoding("UTF-16_DUMMY"); filter.doFilter(req, res, chain); @@ -157,7 +159,7 @@ public class FilterDispatcherTest extends StrutsTestCase { public static class InnerActionMapper implements ActionMapper { public ActionMapping getMapping(HttpServletRequest request, ConfigurationManager config) { - return new ActionMapping(); + return new ActionMapping("action", "/", null, Collections.emptyMap()); } public ActionMapping getMappingFromActionName(String actionName) {