Author: bdaw Date: 2008-01-30 12:06:11 -0500 (Wed, 30 Jan 2008) New Revision: 9654 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/IncludeFromRenderObjectsTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromResourceObjectsTestCase.java Log: Include tests update 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-30 15:13:12 UTC (rev 9653) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromActionEventObjectsTestCase.java 2008-01-30 17:06:11 UTC (rev 9654) @@ -33,6 +33,7 @@ import org.jboss.portal.unit.actions.PortletEventTestAction; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTS1; +import org.jboss.portal.test.portlet.framework.UTP6; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.EndTestResponse; import static org.jboss.unit.api.Assert.assertNotNull; @@ -67,6 +68,8 @@ import java.util.Enumeration; import java.util.Map; import java.util.Locale; +import java.util.Collections; +import java.util.Iterator; /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> @@ -103,12 +106,15 @@ public IncludeFromActionEventObjectsTestCase(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 { - PortletURL actionURL = response.createActionURL(); - return new InvokeGetResponse(actionURL.toString()); + // Invoke render with header + InvokeGetResponse action = new InvokeGetResponse(response.createActionURL().toString()); + action.addHeader("myheader").addElement("render-value"); + return action; } @@ -332,25 +338,24 @@ } //SPEC:194 + assertEquals(portletRequest.getProperty("myheader"), request.getHeader("myheader")); + List rheaders = Collections.list(request.getHeaders("myheader")); + List pheaders = Collections.list(portletRequest.getProperties("myheader")); - //TODO:which values to use? - //assertEquals(portletRequest.getProperty("What?"), request.getHeader("What?")); - //assertEquals(portletRequest.getProperties("What?"), request.getHeaders("What?")); - Enumeration headerNamesE = request.getHeaderNames(); - - List headerNames = new LinkedList(); - while (headerNamesE.hasMoreElements()) + for (Iterator iterator = pheaders.iterator(); iterator.hasNext();) { - Object o = headerNamesE.nextElement(); - headerNames.add(o); + 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("What?", request.getDateHeader("What?")); 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-30 15:13:12 UTC (rev 9653) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromRenderObjectsTestCase.java 2008-01-30 17:06:11 UTC (rev 9654) @@ -31,13 +31,17 @@ 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.test.portlet.framework.UTP6; +import org.jboss.portal.common.util.Tools; 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 static org.jboss.unit.api.Assert.assertFalse; import org.jboss.unit.api.pojo.annotations.Test; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; import javax.portlet.Portlet; import javax.portlet.RenderRequest; @@ -49,11 +53,17 @@ 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.List; import java.util.LinkedList; import java.util.Enumeration; import java.util.Map; +import java.util.Locale; +import java.util.Set; +import java.util.Collections; +import java.util.Arrays; +import java.util.Iterator; /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> @@ -84,6 +94,18 @@ { seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) + { + // Invoke render with header + InvokeGetResponse render = new InvokeGetResponse(response.createRenderURL().toString()); + render.addHeader("myheader").addElement("render-value"); + + return render; + } + }); + + seq.bindAction(1, 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 @@ -96,7 +118,7 @@ }); - seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction() + seq.bindAction(1, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAction() { protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException { @@ -107,6 +129,23 @@ assertNotNull(portletRequest); assertNotNull(portletResponse); + //SPEC:117 + //Those should do nothing - some of the getters will be checked later + response.setContentType("lolo"); + response.setContentLength(22); + response.setLocale(Locale.TRADITIONAL_CHINESE); + response.addCookie(new Cookie("lolo", "bobo")); + response.sendError(404,"bobo"); + response.sendRedirect("http://www.jboss.org"); + response.setDateHeader("bobo",11); + response.addDateHeader("bobo",21); + response.setHeader("bobo", "toto"); + response.addHeader("bobo", "bubu"); + response.setIntHeader("toto",13); + response.addIntHeader("lala",25); + response.setStatus(505); + + //SPEC:104 assertNull(request.getRemoteAddr()); assertNull(request.getRemoteHost()); @@ -120,13 +159,12 @@ assertEquals(0, request.getLocalPort()); //SPEC:106 - //TODO:getPathInfo - //assertEquals(null, request.getPathInfo()); - //TODO:getPathTranslated + assertEquals(null, request.getPathInfo()); + //TODO:NYI //assertEquals("",request.getPathTranslated()); assertEquals("key1=k1value1&key2=k2value1", request.getQueryString()); - //TODO:getRequestURI - //assertEquals("/requestObjectServlet",request.getRequestURI()); + + assertEquals("/test-jsr286-tck-dispatcher/universalServletA",request.getRequestURI()); assertEquals("/universalServletA", request.getServletPath()); @@ -134,8 +172,6 @@ assertEquals(portletRequest.getScheme(), request.getScheme()); assertEquals(portletRequest.getServerName(), request.getServerName()); assertEquals(portletRequest.getServerPort(), request.getServerPort()); - //TODO:fail - //assertEquals(portletRequest.getAttributeNames(), request.getAttributeNames()); // getAttributeNames, setAttribute, getAttribute, removeAttribute request.setAttribute("key1", "k1atrr1"); request.setAttribute("key2", "k2attr2"); @@ -180,9 +216,9 @@ assertEquals(portletRequest.getUserPrincipal(), request.getUserPrincipal()); assertEquals(portletRequest.getRequestedSessionId(), request.getRequestedSessionId()); assertEquals(portletRequest.isRequestedSessionIdValid(), request.isRequestedSessionIdValid()); - //TODO:fail - //assertEquals(portletRequest.getCookies(), request.getCookies()); + assertEquals(portletRequest.getCookies(), request.getCookies()); + //SPEC:108 //in this assertions we use parameters passed in query string of dispatcher List paramNames = new LinkedList(); @@ -212,17 +248,40 @@ assertEquals(0, request.getContentLength()); //SPEC:111 - //TODO: + 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:112 //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:113 assertEquals("GET", request.getMethod()); //SPEC:114 - //TODO:fail - //assertEquals("HTTP/1.1", request.getProtocol()); + assertEquals("HTTP/1.1", request.getProtocol()); //SPEC:115 assertNull(response.encodeRedirectURL("lolo")); @@ -233,13 +292,13 @@ //TODO: setBufferSize, flushBuffer, resetBuffer, reset assertEquals(portletResponse.getBufferSize(), response.getBufferSize()); assertEquals(portletResponse.isCommitted(), response.isCommitted()); - //TODO:fail - //assertEquals(portletResponse.getPortletOutputStream(), response.getOutputStream()); - assertEquals(portletResponse.getWriter(), response.getWriter()); - //TODO: encodeURL, encodeUrl + //TODO: How to check if its the same behaviour as in PR? Its not the same object. + assertNotNull(response.getOutputStream()); + //Cannot invoke both writer and outputstream in single request + //assertEquals(portletResponse.getWriter(), response.getWriter()); + 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/")); - //SPEC:117 - //TODO: //SPEC:118 assertEquals(false, response.containsHeader("blah")); 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-30 15:13:12 UTC (rev 9653) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludeFromResourceObjectsTestCase.java 2008-01-30 17:06:11 UTC (rev 9654) @@ -53,11 +53,15 @@ 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.List; import java.util.LinkedList; import java.util.Enumeration; import java.util.Map; +import java.util.Collections; +import java.util.Iterator; +import java.util.Locale; /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> @@ -80,7 +84,6 @@ }) public class IncludeFromResourceObjectsTestCase { - private String blah; public IncludeFromResourceObjectsTestCase(PortletTestCase seq) { @@ -88,9 +91,9 @@ { protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException { - blah = response.createRenderURL().toString(); - ResourceURL resourceURL = response.createResourceURL(); - return new InvokeGetResponse(resourceURL.toString()); + InvokeGetResponse resource = new InvokeGetResponse(response.createResourceURL().toString()); + resource.addHeader("myheader").addElement("render-value"); + return resource; } }); @@ -103,11 +106,10 @@ PortletRequestDispatcher dispatcher = ((AbstractUniversalTestPortlet)portlet).getPortletContext().getRequestDispatcher("/universalServletA" + queryString); response.setContentType("text/html"); dispatcher.include(request, response); - return new InvokeGetResponse(blah); + 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 @@ -119,6 +121,23 @@ assertNotNull(portletRequest); assertNotNull(portletResponse); + //SPEC:231 + //Those should do nothing - some of the getters will be checked later + response.setCharacterEncoding("lolo"); + response.setContentType("lolo"); + response.setContentLength(22); + response.setLocale(Locale.TRADITIONAL_CHINESE); + response.addCookie(new Cookie("lolo", "bobo")); + response.sendError(404,"bobo"); + response.sendRedirect("http://www.jboss.org"); + response.setDateHeader("bobo",11); + response.addDateHeader("bobo",21); + response.setHeader("bobo", "toto"); + response.addHeader("bobo", "bubu"); + response.setIntHeader("toto",13); + response.addIntHeader("lala",25); + response.setStatus(505); + //SPEC:220 assertNull(request.getRemoteAddr()); assertNull(request.getRemoteHost()); @@ -132,13 +151,11 @@ assertEquals(0, request.getLocalPort()); //SPEC:222 - //TODO:getPathInfo - //assertEquals(null, request.getPathInfo()); - //TODO:getPathTranslated + assertEquals(null, request.getPathInfo()); + //TODO:NYI //assertEquals("",request.getPathTranslated()); assertEquals("key1=k1value1&key2=k2value1", request.getQueryString()); - //TODO:getRequestURI - //assertEquals("/requestObjectServlet",request.getRequestURI()); + assertEquals("/test-jsr286-tck-dispatcher/universalServletA",request.getRequestURI()); assertEquals("/universalServletA", request.getServletPath()); @@ -146,8 +163,7 @@ assertEquals(portletRequest.getScheme(), request.getScheme()); assertEquals(portletRequest.getServerName(), request.getServerName()); assertEquals(portletRequest.getServerPort(), request.getServerPort()); - //TODO:fail - //assertEquals(portletRequest.getAttributeNames(), request.getAttributeNames()); + // getAttributeNames, setAttribute, getAttribute, removeAttribute request.setAttribute("key1", "k1atrr1"); request.setAttribute("key2", "k2attr2"); @@ -195,8 +211,24 @@ assertEquals(portletRequest.getCookies(), request.getCookies()); //SPEC:224 - //TODO: + 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.getContentLength(), request.getContentLength()); + assertEquals(portletRequest.getReader(), request.getReader()); + //SPEC:225 //in this assertions we use parameters passed in query string of dispatcher List paramNames = new LinkedList(); @@ -216,10 +248,34 @@ assertTrue(paramNamesMap.containsKey("key2")); //SPEC:226 - //TODO: + 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:227 //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:228 assertEquals("HTTP/1.1", request.getProtocol()); @@ -234,29 +290,24 @@ //TODO: setBufferSize, flushBuffer, resetBuffer, reset assertEquals(portletResponse.getBufferSize(), response.getBufferSize()); assertEquals(portletResponse.isCommitted(), response.isCommitted()); - //TODO:fail - //assertEquals(portletResponse.getPortletOutputStream(), response.getOutputStream()); - assertEquals(portletResponse.getWriter(), response.getWriter()); + //TODO: How to check if its the same behaviour as in PR? Its not the same object. + assertNotNull(response.getOutputStream()); + //Cannot invoke both writer and outputstream in single request + //assertEquals(portletResponse.getWriter(), response.getWriter()); assertEquals(portletResponse.getLocale(), response.getLocale()); - //TODO: encodeURL, encodeUrl + 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/")); - //SPEC:231 - //TODO: + //SPEC:232 assertEquals(false, response.containsHeader("blah")); - return null; + return new EndTestResponse(); } }); - seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() - { - protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException - { - return new EndTestResponse(); - } - }); + } }