Author: bdaw Date: 2008-01-31 03:36:23 -0500 (Thu, 31 Jan 2008) New Revision: 9672 Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromResourceObjectsTestCase.java Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromActionEventObjectsTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromRenderObjectsTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromActionEventObjectsTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromRenderObjectsTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromResourceObjectsTestCase.java Log: - forward from resource - updated Assertion info Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromActionEventObjectsTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromActionEventObjectsTestCase.java 2008-01-31 08:19:06 UTC (rev 9671) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromActionEventObjectsTestCase.java 2008-01-31 08:36:23 UTC (rev 9672) @@ -24,6 +24,7 @@ import org.jboss.portal.unit.PortletTestCase; import org.jboss.portal.unit.PortletTestContext; +import org.jboss.portal.unit.Assertion; import org.jboss.portal.unit.annotations.TestCase; import org.jboss.portal.unit.base.AbstractUniversalTestPortlet; import org.jboss.portal.unit.actions.PortletRenderTestAction; @@ -71,7 +72,27 @@ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@TestCase +@TestCase({ + Assertion.JSR286_243, + Assertion.JSR286_244, + Assertion.JSR286_245, + Assertion.JSR286_246, + Assertion.JSR286_247, + Assertion.JSR286_248, + Assertion.JSR286_249, + Assertion.JSR286_250, + Assertion.JSR286_251, + Assertion.JSR286_252, + //Assertion.JSR286_253, + Assertion.JSR286_254, + Assertion.JSR286_255, + Assertion.JSR286_256, + Assertion.JSR286_257, + Assertion.JSR286_258, + //Assertion.JSR286_259, + Assertion.JSR286_260, + Assertion.JSR286_261 + }) public class ForwardFromActionEventObjectsTestCase { private int actionCount = 0; Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromRenderObjectsTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromRenderObjectsTestCase.java 2008-01-31 08:19:06 UTC (rev 9671) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromRenderObjectsTestCase.java 2008-01-31 08:36:23 UTC (rev 9672) @@ -24,6 +24,7 @@ import org.jboss.portal.unit.PortletTestCase; import org.jboss.portal.unit.PortletTestContext; +import org.jboss.portal.unit.Assertion; import org.jboss.portal.unit.annotations.TestCase; import org.jboss.portal.unit.base.AbstractUniversalTestPortlet; import org.jboss.portal.unit.actions.PortletRenderTestAction; @@ -61,7 +62,34 @@ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@TestCase +@TestCase({ + Assertion.JSR286_262, + Assertion.JSR286_263, + Assertion.JSR286_264, + Assertion.JSR286_265, + Assertion.JSR286_266, + Assertion.JSR286_267, + Assertion.JSR286_268, + Assertion.JSR286_269, + //Assertion.JSR286_270, + Assertion.JSR286_271, + Assertion.JSR286_272, + Assertion.JSR286_273, + Assertion.JSR286_274, + Assertion.JSR286_275, + Assertion.JSR286_276, + //Assertion.JSR286_277, + Assertion.JSR286_278, + Assertion.JSR286_279, + Assertion.JSR286_270, + Assertion.JSR286_271, + Assertion.JSR286_272, + Assertion.JSR286_273, + Assertion.JSR286_274, + Assertion.JSR286_275, + Assertion.JSR286_276, + Assertion.JSR286_277 + }) public class ForwardFromRenderObjectsTestCase { public ForwardFromRenderObjectsTestCase(PortletTestCase seq) Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromResourceObjectsTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromResourceObjectsTestCase.java (rev 0) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromResourceObjectsTestCase.java 2008-01-31 08:36:23 UTC (rev 9672) @@ -0,0 +1,289 @@ +/* +* 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.PortletTestContext; +import org.jboss.portal.unit.Assertion; +import org.jboss.portal.unit.annotations.TestCase; +import org.jboss.portal.unit.base.AbstractUniversalTestPortlet; +import org.jboss.portal.unit.actions.PortletRenderTestAction; +import org.jboss.portal.unit.actions.PortletResourceTestAction; +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.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +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.ResourceRequest; +import javax.portlet.ResourceResponse; +import javax.portlet.PortletRequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.Cookie; +import java.io.IOException; +import java.util.Locale; +import java.util.List; +import java.util.LinkedList; +import java.util.Enumeration; +import java.util.Map; +import java.util.Collections; +import java.util.Iterator; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +@TestCase({ + Assertion.JSR286_278, + Assertion.JSR286_279, + Assertion.JSR286_280, + Assertion.JSR286_281, + Assertion.JSR286_282, + Assertion.JSR286_283, + Assertion.JSR286_284, + //Assertion.JSR286_285, + Assertion.JSR286_286, + Assertion.JSR286_287, + Assertion.JSR286_288 + }) +public class ForwardFromResourceObjectsTestCase +{ + + public ForwardFromResourceObjectsTestCase(PortletTestCase seq) + { + seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException + { + InvokeGetResponse resource = new InvokeGetResponse(response.createResourceURL().toString()); + resource.addHeader("myheader").addElement("render-value"); + return resource; + } + }); + + seq.bindAction(1, UTP1.RESOURCE_JOIN_POINT, new PortletResourceTestAction() + { + protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException + { + //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.forward(request, response); + return null; + } + }); + + seq.bindAction(1, 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 + ResourceRequest portletRequest = (ResourceRequest)request.getAttribute("javax.portlet.request"); + ResourceResponse portletResponse = (ResourceResponse)request.getAttribute("javax.portlet.response"); + + assertNotNull(portletRequest); + assertNotNull(portletResponse); + + //Part of SPEC:288 - must be set at the beggining + response.setContentType("text/html"); + + //SPEC:278 + assertNull(request.getRemoteAddr()); + assertNull(request.getRemoteHost()); + assertNull(request.getRealPath("toto")); + assertNull(request.getLocalAddr()); + assertNull(request.getLocalName()); + assertNull(request.getRequestURL()); + + //SPEC:279 + assertEquals(0, request.getRemotePort()); + assertEquals(0, request.getLocalPort()); + + //SPEC:280 + assertEquals(null, request.getPathInfo()); + //TODO:NYI + //assertEquals("",request.getPathTranslated()); + assertEquals("key1=k1value1&key2=k2value1", request.getQueryString()); + assertEquals("/test-jsr286-tck-dispatcher/universalServletA",request.getRequestURI()); + assertEquals("/universalServletA", request.getServletPath()); + + + //SPEC:281 + assertEquals(portletRequest.getScheme(), request.getScheme()); + assertEquals(portletRequest.getServerName(), request.getServerName()); + assertEquals(portletRequest.getServerPort(), request.getServerPort()); + + // getAttributeNames, setAttribute, getAttribute, removeAttribute + 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")); + + //getLocale, getLocales + 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()); + assertEquals(portletRequest.getCookies(), request.getCookies()); + + //SPEC:282 + try + { + // request was already read + request.setCharacterEncoding("utf8"); + assertTrue(false); + } + catch (IllegalStateException e) + { + //expected + } + assertEquals(portletRequest.getCharacterEncoding(), request.getCharacterEncoding()); + // + assertEquals(portletRequest.getContentType(), request.getContentType()); + assertEquals(portletRequest.getMethod(), request.getMethod()); + assertEquals(portletRequest.getReader(), request.getReader()); + + + //SPEC:283 + //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:284 + assertEquals(portletRequest.getProperty("myheader"), request.getHeader("myheader")); + List rheaders = Collections.list(request.getHeaders("myheader")); + List pheaders = Collections.list(portletRequest.getProperties("myheader")); + + for (Iterator iterator = pheaders.iterator(); iterator.hasNext();) + { + Object o = iterator.next(); + assertTrue(rheaders.contains(o)); + } + + List headerNames = Collections.list(request.getHeaderNames()); + Enumeration propertyNamesE = portletRequest.getPropertyNames(); + while (propertyNamesE.hasMoreElements()) + { + Object o = propertyNamesE.nextElement(); + assertTrue(headerNames.contains(o)); + } + assertTrue(headerNames.contains("myheader")); + + //TODO: seems to not be implemented + //assertEquals("?", request.getDateHeader("myheader")); + //assertEquals("?", request.getIntHeader("myheader")); + + //SPEC:285 + //TODO: + //TODO: The following methods of the HttpServletRequest must provide the + //TODO: functionality defined by the Servlet Specification: getRequestDispatcher, isUserInRole, getSession, + //TODO: isRequestedSessionIdFromCookie, isRequestedSessionIdFromURL and isRequestedSessionIdFromUrl. + + //SPEC:286 + assertEquals("HTTP/1.1", request.getProtocol()); + + //SPEC:287 + assertNull(response.encodeRedirectURL("lolo")); + assertNull(response.encodeRedirectUrl("blah")); + + + //SPEC:288 + assertEquals(portletResponse.getCharacterEncoding(), response.getCharacterEncoding()); + //TODO: setBufferSize, flushBuffer, resetBuffer, reset + assertEquals(portletResponse.getBufferSize(), response.getBufferSize()); + assertEquals(portletResponse.isCommitted(), response.isCommitted()); + //TODO: How to check if its the same behaviour as in PR? Its not the same object. + //and btw. if line below is failing this means that HSResponse.setContentType is not impl ok + assertNotNull(response.getOutputStream()); + //Cannot invoke both writer and outputstream in single request + //assertEquals(portletResponse.getWriter(), response.getWriter()); + assertEquals(portletResponse.getLocale(), response.getLocale()); + assertEquals(portletResponse.encodeURL("http://www.jboss.com/"), response.encodeURL("http://www.jboss.com/")); + assertEquals(portletResponse.encodeURL("http://www.jboss.com/"), response.encodeUrl("http://www.jboss.com/")); + + return new EndTestResponse(); + } + }); + + + } +} Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromActionEventObjectsTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromActionEventObjectsTestCase.java 2008-01-31 08:19:06 UTC (rev 9671) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromActionEventObjectsTestCase.java 2008-01-31 08:36:23 UTC (rev 9672) @@ -87,7 +87,7 @@ Assertion.JSR286_192, Assertion.JSR286_193, Assertion.JSR286_194, - Assertion.JSR286_195, + //Assertion.JSR286_195, Assertion.JSR286_196, Assertion.JSR286_197, Assertion.JSR286_198, Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromRenderObjectsTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromRenderObjectsTestCase.java 2008-01-31 08:19:06 UTC (rev 9671) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromRenderObjectsTestCase.java 2008-01-31 08:36:23 UTC (rev 9672) @@ -79,7 +79,7 @@ Assertion.JSR286_109, Assertion.JSR286_110, Assertion.JSR286_111, - Assertion.JSR286_112, + //Assertion.JSR286_112, Assertion.JSR286_113, Assertion.JSR286_114, Assertion.JSR286_115, Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromResourceObjectsTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromResourceObjectsTestCase.java 2008-01-31 08:19:06 UTC (rev 9671) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromResourceObjectsTestCase.java 2008-01-31 08:36:23 UTC (rev 9672) @@ -75,7 +75,7 @@ Assertion.JSR286_224, Assertion.JSR286_225, Assertion.JSR286_226, - Assertion.JSR286_227, + //Assertion.JSR286_227, Assertion.JSR286_228, Assertion.JSR286_229, Assertion.JSR286_230,