Author: bdaw Date: 2008-01-31 03:51:22 -0500 (Thu, 31 Jan 2008) New Revision: 9674 Removed: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java Log: cleanup Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java 2008-01-31 08:50:02 UTC (rev 9673) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java 2008-01-31 08:51:22 UTC (rev 9674) @@ -1,185 +0,0 @@ -/****************************************************************************** - * 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.jsr168.tck.dispatcher; - -import org.jboss.portal.unit.PortletTestCase; -import org.jboss.portal.unit.PortletTestContext; -import org.jboss.portal.unit.base.AbstractUniversalTestPortlet; -import org.jboss.portal.unit.actions.PortletRenderTestAction; -import org.jboss.portal.unit.actions.ServletServiceTestAction; -import org.jboss.portal.test.portlet.framework.UTP1; -import org.jboss.portal.test.portlet.framework.UTS1; -import org.jboss.portal.unit.annotations.TestCase; -import org.jboss.portal.unit.Assertion; -import org.jboss.unit.driver.DriverResponse; -import org.jboss.unit.driver.response.EndTestResponse; -import static org.jboss.unit.api.Assert.assertNotNull; -import static org.jboss.unit.api.Assert.assertNull; -import static org.jboss.unit.api.Assert.assertEquals; -import static org.jboss.unit.api.Assert.assertTrue; - -import javax.portlet.Portlet; -import javax.portlet.RenderRequest; -import javax.portlet.RenderResponse; -import javax.portlet.PortletException; -import javax.portlet.PortletRequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.List; -import java.util.LinkedList; -import java.util.Enumeration; -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -(a)TestCase({Assertion.JSR168_129, Assertion.JSR168_130, Assertion.JSR168_131, Assertion.JSR168_132, Assertion.JSR168_133, Assertion.JSR168_134, Assertion.JSR168_137}) -public class RequestObjectTestCase -{ - public RequestObjectTestCase(PortletTestCase seq) - { - seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() - { - protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException - { - //we dispatch to servlet and assertions will be done there - String queryString = "?key1=k1value1&key2=k2value1"; - PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA" + queryString); - response.setContentType("text/html"); - dispatcher.include(request, response); - return null; - } - }); - - - seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction() - { - protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException - { - //we get this object to assert some of it's method compare wieth http request methods - RenderRequest portletRequest = (RenderRequest)request.getAttribute("javax.portlet.request"); - - assertNotNull(portletRequest); - - //SPEC:129 - assertNull(request.getProtocol()); - assertNull(request.getRemoteAddr()); - assertNull(request.getRemoteHost()); - assertNull(request.getRealPath("blah")); - assertNull(request.getRequestURL()); - - //SPEC:130 - assertEquals(null, request.getPathInfo()); - //TODO:I'm not sure what this should return - but it's not implemented now so it fails - //assertEquals("",request.getPathTranslated()); - assertEquals("key1=k1value1&key2=k2value1", request.getQueryString()); - //assertEquals("/requestObjectServlet",request.getRequestURI()); - assertEquals("/universalServletA", request.getServletPath()); - - //SPEC:131 - assertEquals(portletRequest.getScheme(), request.getScheme()); - assertEquals(portletRequest.getServerName(), request.getServerName()); - assertEquals(portletRequest.getServerPort(), request.getServerPort()); - - request.setAttribute("key1", "k1atrr1"); - request.setAttribute("key2", "k2attr2"); - List attrNames = new LinkedList(); - Enumeration attrEnum = request.getAttributeNames(); - while (attrEnum.hasMoreElements()) - { - attrNames.add(attrEnum.nextElement()); - } - assertNotNull(request.getAttribute("key1")); - assertNotNull(request.getAttribute("key2")); - - assertTrue(attrNames.contains("key1")); - assertTrue(attrNames.contains("key2")); - - request.removeAttribute("key1"); - assertNull(request.getAttribute("key1")); - assertNotNull(request.getAttribute("key2")); - - assertEquals(portletRequest.getLocale(), request.getLocale()); - - List portletLocales = new LinkedList(); - List servletLocales = new LinkedList(); - Enumeration pl = portletRequest.getLocales(); - while (pl.hasMoreElements()) - { - portletLocales.add(pl.nextElement()); - } - Enumeration sl = request.getLocales(); - while (sl.hasMoreElements()) - { - servletLocales.add(sl.nextElement()); - } - - assertTrue(portletLocales.equals(servletLocales)); - - assertEquals(portletRequest.isSecure(), request.isSecure()); - assertEquals(portletRequest.getAuthType(), request.getAuthType()); - assertEquals(portletRequest.getContextPath(), request.getContextPath()); - assertEquals(portletRequest.getRemoteUser(), request.getRemoteUser()); - assertEquals(portletRequest.getUserPrincipal(), request.getUserPrincipal()); - assertEquals(portletRequest.getRequestedSessionId(), request.getRequestedSessionId()); - assertEquals(portletRequest.isRequestedSessionIdValid(), request.isRequestedSessionIdValid()); - - //SPEC:132 - //in this assertions we use parameters passed in query string of dispatcher - List paramNames = new LinkedList(); - Enumeration paramEnum = request.getParameterNames(); - while (paramEnum.hasMoreElements()) - { - paramNames.add(paramEnum.nextElement()); - } - assertTrue(paramNames.contains("key1")); - assertTrue(paramNames.contains("key2")); - - assertEquals("k1value1", request.getParameter("key1")); - assertEquals(new String[]{"k1value1"}, request.getParameterValues("key1")); - - Map paramNamesMap = request.getParameterMap(); - assertTrue(paramNamesMap.containsKey("key1")); - assertTrue(paramNamesMap.containsKey("key2")); - - //SPEC:133 - request.setCharacterEncoding("utf8"); - assertNull(request.getCharacterEncoding()); - assertNull(request.getContentType()); - assertNull(request.getInputStream()); - assertNull(request.getReader()); - - //SPEC:134 - assertEquals(0, request.getContentLength()); - - //SPEC:137 - assertEquals("GET", request.getMethod()); - return new EndTestResponse(); - } - }); - } -} Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java 2008-01-31 08:50:02 UTC (rev 9673) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java 2008-01-31 08:51:22 UTC (rev 9674) @@ -1,96 +0,0 @@ -/****************************************************************************** - * 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.jsr168.tck.dispatcher; - -import org.jboss.portal.unit.PortletTestCase; -import org.jboss.portal.unit.PortletTestContext; -import org.jboss.portal.unit.base.AbstractUniversalTestPortlet; -import org.jboss.portal.unit.actions.PortletRenderTestAction; -import org.jboss.portal.unit.actions.ServletServiceTestAction; -import org.jboss.portal.test.portlet.framework.UTP1; -import org.jboss.portal.test.portlet.framework.UTS1; -import org.jboss.portal.unit.annotations.TestCase; -import org.jboss.portal.unit.Assertion; -import org.jboss.portal.unit.PortletTestCase; -import org.jboss.unit.driver.DriverResponse; -import org.jboss.unit.driver.response.EndTestResponse; -import static org.jboss.unit.api.Assert.assertNotNull; -import static org.jboss.unit.api.Assert.assertNull; -import static org.jboss.unit.api.Assert.assertEquals; - -import javax.portlet.Portlet; -import javax.portlet.RenderRequest; -import javax.portlet.RenderResponse; -import javax.portlet.PortletException; -import javax.portlet.PortletRequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -(a)TestCase({Assertion.JSR168_138, Assertion.JSR168_141}) -public class ResponseObjectTestCase -{ - public ResponseObjectTestCase(PortletTestCase seq) - { - seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() - { - protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException - { - //we dispatch to servlet and assertions will be done there - PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA"); - //hack for testing dispatched servlet - response.setContentType("text/html"); - dispatcher.include(request, response); - return null; - } - }); - - seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction() - { - protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException - { - //we get this object to assert some of it's method compare wieth http request methods - RenderResponse portletResponse = (RenderResponse)request.getAttribute("javax.portlet.response"); - - assertNotNull(portletResponse); - - //SPEC:138 - assertNull(response.encodeRedirectURL("blah")); - assertNull(response.encodeRedirectUrl("blah")); - - //not defined spec assert - assertEquals(false, response.containsHeader("blah")); - - //SPEC:141 - assertEquals(portletResponse.getLocale(), response.getLocale()); - return new EndTestResponse(); - } - }); - } -}