Author: julien(a)jboss.com Date: 2008-01-30 17:35:00 -0500 (Wed, 30 Jan 2008) New Revision: 9659 Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NFContainerAttributesTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NIContainerAttributesTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RFContainerAttributesTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RIContainerAttributesTestCase.java Log: - renamed test case to be more homogenous with other similar test cases Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NFContainerAttributesTestCase.java (from rev 9657, modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NamedForwardContainerAttributesTestCase.java) =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NFContainerAttributesTestCase.java (rev 0) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NFContainerAttributesTestCase.java 2008-01-30 22:35:00 UTC (rev 9659) @@ -0,0 +1,70 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.portlet.jsr286.tck.dispatcher; + +import org.jboss.portal.unit.PortletTestCase; +import org.jboss.portal.unit.annotations.TestCase; + +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletRequest; +import javax.portlet.PortletResponse; +import javax.portlet.PortletException; +import javax.portlet.PortletContext; +import java.io.IOException; +import java.util.Map; +import java.util.HashMap; +import java.util.Collections; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +@TestCase +public class NFContainerAttributesTestCase extends DispatchedContainerAttributesTestCase +{ + + /** . */ + public static final Map<String, String> EXPECTED_ATTRIBUTES_SET = buildForwardNotSetMap(); + + private static Map<String, String> buildForwardNotSetMap() + { + Map<String, String> map = new HashMap<String, String>(); + map.put("javax.servlet.forward.request_uri", null); + map.put("javax.servlet.forward.context_path", null); + map.put("javax.servlet.forward.servlet_path", null); + map.put("javax.servlet.forward.path_info", null); + map.put("javax.servlet.forward.query_string", null); + return Collections.unmodifiableMap(map); + } + + public NFContainerAttributesTestCase(PortletTestCase seq) + { + super(seq, EXPECTED_ATTRIBUTES_SET); + } + + protected void dispatch(PortletRequest request, PortletResponse response, PortletContext portletContext) throws IOException, PortletException + { + PortletRequestDispatcher dispatcher = portletContext.getNamedDispatcher("UniversalServletA"); + dispatcher.forward(request, response); + } +} \ No newline at end of file Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NIContainerAttributesTestCase.java (from rev 9657, modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NamedIncludeContainerAttributesTestCase.java) =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NIContainerAttributesTestCase.java (rev 0) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NIContainerAttributesTestCase.java 2008-01-30 22:35:00 UTC (rev 9659) @@ -0,0 +1,71 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.portlet.jsr286.tck.dispatcher; + +import org.jboss.portal.unit.PortletTestCase; +import org.jboss.portal.unit.Assertion; +import org.jboss.portal.unit.annotations.TestCase; + +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletRequest; +import javax.portlet.PortletResponse; +import javax.portlet.PortletException; +import javax.portlet.PortletContext; +import java.io.IOException; +import java.util.Map; +import java.util.HashMap; +import java.util.Collections; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +(a)TestCase({Assertion.JSR168_127}) +public class NIContainerAttributesTestCase extends DispatchedContainerAttributesTestCase +{ + + /** . */ + public static final Map<String, String> EXPECTED_ATTRIBUTES_SET = buildIncludedNotSetMap(); + + private static Map<String, String> buildIncludedNotSetMap() + { + Map<String, String> map = new HashMap<String, String>(); + map.put("javax.servlet.include.request_uri", null); + map.put("javax.servlet.include.context_path", null); + map.put("javax.servlet.include.servlet_path", null); + map.put("javax.servlet.include.path_info", null); + map.put("javax.servlet.include.query_string", null); + return Collections.unmodifiableMap(map); + } + + public NIContainerAttributesTestCase(PortletTestCase seq) + { + super(seq, EXPECTED_ATTRIBUTES_SET); + } + + protected void dispatch(PortletRequest request, PortletResponse response, PortletContext portletContext) throws IOException, PortletException + { + PortletRequestDispatcher dispatcher = portletContext.getNamedDispatcher("UniversalServletA"); + dispatcher.include(request, response); + } +} \ No newline at end of file Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RFContainerAttributesTestCase.java (from rev 9657, modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RequestForwardContainerAttributesTestCase.java) =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RFContainerAttributesTestCase.java (rev 0) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RFContainerAttributesTestCase.java 2008-01-30 22:35:00 UTC (rev 9659) @@ -0,0 +1,70 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.portlet.jsr286.tck.dispatcher; + +import org.jboss.portal.unit.PortletTestCase; +import org.jboss.portal.unit.annotations.TestCase; + +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletRequest; +import javax.portlet.PortletResponse; +import javax.portlet.PortletException; +import javax.portlet.PortletContext; +import java.io.IOException; +import java.util.Map; +import java.util.HashMap; +import java.util.Collections; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +@TestCase +public class RFContainerAttributesTestCase extends DispatchedContainerAttributesTestCase +{ + + /** . */ + public static final Map<String, String> EXPECTED_ATTRIBUTES_SET = buildForwardSetMap(); + + private static Map<String, String> buildForwardSetMap() + { + Map<String, String> map = new HashMap<String, String>(); + map.put("javax.servlet.forward.request_uri", "/test-jsr286-tck-dispatcher/universalServletA/pathinfo"); + map.put("javax.servlet.forward.context_path", "/test-jsr286-tck-dispatcher"); + map.put("javax.servlet.forward.servlet_path", "/universalServletA"); + map.put("javax.servlet.forward.path_info", "/pathinfo"); + map.put("javax.servlet.forward.query_string", "foo=bar"); + return Collections.unmodifiableMap(map); + } + + public RFContainerAttributesTestCase(PortletTestCase seq) + { + super(seq, EXPECTED_ATTRIBUTES_SET); + } + + protected void dispatch(PortletRequest request, PortletResponse response, PortletContext portletContext) throws IOException, PortletException + { + PortletRequestDispatcher dispatcher = portletContext.getRequestDispatcher("/universalServletA/pathinfo?foo=bar"); + dispatcher.forward(request, response); + } +} \ No newline at end of file Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RIContainerAttributesTestCase.java (from rev 9657, modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RequestIncludeContainerAttributesTestCase.java) =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RIContainerAttributesTestCase.java (rev 0) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RIContainerAttributesTestCase.java 2008-01-30 22:35:00 UTC (rev 9659) @@ -0,0 +1,71 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.test.portlet.jsr286.tck.dispatcher; + +import org.jboss.portal.unit.PortletTestCase; +import org.jboss.portal.unit.Assertion; +import org.jboss.portal.unit.annotations.TestCase; + +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletRequest; +import javax.portlet.PortletResponse; +import javax.portlet.PortletException; +import javax.portlet.PortletContext; +import java.io.IOException; +import java.util.Map; +import java.util.HashMap; +import java.util.Collections; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +(a)TestCase({Assertion.JSR168_127}) +public class RIContainerAttributesTestCase extends DispatchedContainerAttributesTestCase +{ + + /** . */ + public static final Map<String, String> EXPECTED_ATTRIBUTES_SET = buildIncludedSetMap(); + + private static Map<String, String> buildIncludedSetMap() + { + Map<String, String> map = new HashMap<String, String>(); + map.put("javax.servlet.include.request_uri", "/test-jsr286-tck-dispatcher/universalServletA/pathinfo"); + map.put("javax.servlet.include.context_path", "/test-jsr286-tck-dispatcher"); + map.put("javax.servlet.include.servlet_path", "/universalServletA"); + map.put("javax.servlet.include.path_info", "/pathinfo"); + map.put("javax.servlet.include.query_string", "foo=bar"); + return Collections.unmodifiableMap(map); + } + + public RIContainerAttributesTestCase(PortletTestCase seq) + { + super(seq, EXPECTED_ATTRIBUTES_SET); + } + + protected void dispatch(PortletRequest request, PortletResponse response, PortletContext portletContext) throws IOException, PortletException + { + PortletRequestDispatcher dispatcher = portletContext.getRequestDispatcher("/universalServletA/pathinfo?foo=bar"); + dispatcher.include(request, response); + } +}