January 2008 - portal-commits - Jboss List Archives

JBoss Portal SVN: r9680 - modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-01-31 05:32:11 -0500 (Thu, 31 Jan 2008) New Revision: 9680 Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java Log: rest of placeholders Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-01-31 10:25:17 UTC (rev 9679) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-01-31 10:32:11 UTC (rev 9680) @@ -1076,9 +1076,8 @@ // PLT.23 Portlet Applications JSR286_303(new TCK(303), "", ""), - - //.. - + JSR286_304(new TCK(304), "", ""), + JSR286_305(new TCK(305), "", ""), JSR286_306(new TCK(306), "", ""), @@ -1086,9 +1085,9 @@ JSR286_307(new TCK(307), "", ""), - - //.. - + JSR286_308(new TCK(308), "", ""), + JSR286_309(new TCK(309), "", ""), + JSR286_310(new TCK(310), "", ""), JSR286_311(new TCK(311), "", ""),

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r9679 - in modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168: api and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-01-31 05:25:17 -0500 (Thu, 31 Jan 2008) New Revision: 9679 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestDispatcherImpl.java Log: implemented the never implemented (and used probably) getTranslatedPath() method on the dispatched http servlet request Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java 2008-01-31 10:23:45 UTC (rev 9678) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java 2008-01-31 10:25:17 UTC (rev 9679) @@ -34,6 +34,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.ServletInputStream; +import javax.servlet.ServletContext; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -123,10 +124,14 @@ /** . */ private final String[] infos; + /** . */ + private final ServletContext servletContext; + public DispatchedHttpServletRequest( Dispatch dispatch, PortletRequestImpl preq, - HttpServletRequest dreq) + HttpServletRequest dreq, + ServletContext servletContext) { super(dreq); @@ -134,6 +139,7 @@ this.dispatchType = dispatch.getType(); this.preq = preq; this.dreq = dreq; + this.servletContext = servletContext; this.containerAttributesStack = new LinkedList<Map<String, String>>(); // Push dispatch @@ -212,7 +218,10 @@ public final String getPathTranslated() { - return "PathTranslated"; // todo + String pathInfo = getPathInfo(); + + // + return pathInfo == null ? null : servletContext.getRealPath(pathInfo); } public final String getQueryString() @@ -641,9 +650,9 @@ /** . */ private final ClientDataRequestImpl cdreq; - public ClientData(Dispatch dispatch, ClientDataRequestImpl cdreq, HttpServletRequest dreq) + public ClientData(Dispatch dispatch, ClientDataRequestImpl cdreq, HttpServletRequest dreq, ServletContext servletContext) { - super(dispatch, cdreq, dreq); + super(dispatch, cdreq, dreq, servletContext); // this.cdreq = cdreq; @@ -709,26 +718,26 @@ public static final class Action extends ClientData { - public Action(Dispatch dispatch, ActionRequestImpl areq, HttpServletRequest dreq) + public Action(Dispatch dispatch, ActionRequestImpl areq, HttpServletRequest dreq, ServletContext servletContext) { - super(dispatch, areq, dreq); + super(dispatch, areq, dreq, servletContext); } } public static final class Resource extends ClientData { - public Resource(Dispatch dispatch, ResourceRequestImpl rreq, HttpServletRequest dreq) + public Resource(Dispatch dispatch, ResourceRequestImpl rreq, HttpServletRequest dreq, ServletContext servletContext) { - super(dispatch, rreq, dreq); + super(dispatch, rreq, dreq, servletContext); } } public static abstract class Mime extends DispatchedHttpServletRequest { - public Mime(Dispatch dispatch, PortletRequestImpl preq, HttpServletRequest dreq) + public Mime(Dispatch dispatch, PortletRequestImpl preq, HttpServletRequest dreq, ServletContext servletContext) { - super(dispatch, preq, dreq); + super(dispatch, preq, dreq, servletContext); } public final String getCharacterEncoding() @@ -767,9 +776,9 @@ /** . */ private final EventRequestImpl ereq; - public Event(Dispatch dispatch, EventRequestImpl ereq, HttpServletRequest dreq) + public Event(Dispatch dispatch, EventRequestImpl ereq, HttpServletRequest dreq, ServletContext servletContext) { - super(dispatch, ereq, dreq); + super(dispatch, ereq, dreq, servletContext); // this.ereq = ereq; @@ -784,9 +793,9 @@ public static final class Render extends Mime { - public Render(Dispatch dispatch, RenderRequestImpl rreq, HttpServletRequest dreq) + public Render(Dispatch dispatch, RenderRequestImpl rreq, HttpServletRequest dreq, ServletContext servletContext) { - super(dispatch, rreq, dreq); + super(dispatch, rreq, dreq, servletContext); } public String getMethod() Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestDispatcherImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestDispatcherImpl.java 2008-01-31 10:23:45 UTC (rev 9678) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestDispatcherImpl.java 2008-01-31 10:25:17 UTC (rev 9679) @@ -28,6 +28,8 @@ import org.jboss.portal.portlet.impl.jsr168.DispatchedHttpServletResponse; import org.jboss.portal.portlet.impl.jsr168.DispatchType; import org.jboss.portal.portlet.impl.jsr168.Dispatch; +import org.jboss.portal.portlet.container.PortletApplication; +import org.jboss.portal.portlet.container.PortletApplicationContext; import javax.portlet.PortletException; import javax.portlet.PortletRequestDispatcher; @@ -39,6 +41,7 @@ import javax.portlet.EventRequest; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; +import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -97,6 +100,11 @@ PortletInvocation invocation = (PortletInvocation)req.getAttribute(ContextDispatcherInterceptor.REQ_ATT_COMPONENT_INVOCATION); // + PortletApplication application = ((PortletRequestImpl)req).container.getApplication(); + PortletApplicationContext applicationContext = application.getContext(); + ServletContext servletContext = applicationContext.getServletContext(); + + // HttpServletRequest dreq = invocation.getDispatchedRequest(); HttpServletResponse dresp = invocation.getDispatchedResponse(); @@ -105,22 +113,22 @@ DispatchedHttpServletResponse diresp; if (req instanceof ActionRequest) { - direq = new DispatchedHttpServletRequest.Action(dispatch, (ActionRequestImpl)req, dreq); + direq = new DispatchedHttpServletRequest.Action(dispatch, (ActionRequestImpl)req, dreq, servletContext); diresp = new DispatchedHttpServletResponse.StateAware(direq, (StateAwareResponseImpl)resp, dresp); } else if (req instanceof EventRequest) { - direq = new DispatchedHttpServletRequest.Event(dispatch, (EventRequestImpl)req, dreq); + direq = new DispatchedHttpServletRequest.Event(dispatch, (EventRequestImpl)req, dreq, servletContext); diresp = new DispatchedHttpServletResponse.StateAware(direq, (StateAwareResponseImpl)resp, dresp); } else if (req instanceof RenderRequest) { - direq = new DispatchedHttpServletRequest.Render(dispatch, (RenderRequestImpl)req, dreq); + direq = new DispatchedHttpServletRequest.Render(dispatch, (RenderRequestImpl)req, dreq, servletContext); diresp = new DispatchedHttpServletResponse.Mime(direq, (MimeResponseImpl)resp, dresp); } else { - direq = new DispatchedHttpServletRequest.Resource(dispatch, (ResourceRequestImpl)req, dreq); + direq = new DispatchedHttpServletRequest.Resource(dispatch, (ResourceRequestImpl)req, dreq, servletContext); diresp = new DispatchedHttpServletResponse.Mime(direq, (MimeResponseImpl)resp, dresp); }

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r9678 - in modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck: portletconfig and 3 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-01-31 05:23:45 -0500 (Thu, 31 Jan 2008) New Revision: 9678 Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ErrorHandlingTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ObtainingDispatcherTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/DefaultNamespaceTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/LocalesTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/NoEventTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/NoLocalesTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/NoPublicRenderParameterTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/ProcessingEventTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/PublicRenderParameterTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/PublishingEventTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/PublishingProcessingEventTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/DefaultNamespaceTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/NoEventTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/ProcessingEventTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/PublishingEventTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/PublishingProcessingEventTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/PortletDoesNotReceiveUnsupportedRenderParametersTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/PublicRenderParameterAvailableInLifeCycleMethodTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/PublicRenderParameterTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/DowngradeCacheabilityTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/HTTPMethodTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/ResourceIDTestCase.java Log: - some info update Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ErrorHandlingTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ErrorHandlingTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ErrorHandlingTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -63,7 +63,9 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -(a)TestCase({Assertion.JSR168_142, Assertion.JSR168_143}) +@TestCase({ + Assertion.JSR168_142, + Assertion.JSR168_143}) public class ErrorHandlingTestCase { Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ObtainingDispatcherTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ObtainingDispatcherTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ObtainingDispatcherTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -54,7 +54,10 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -(a)TestCase({Assertion.JSR168_121, Assertion.JSR168_122}) +@TestCase({ + Assertion.JSR168_121, + Assertion.JSR168_122 + }) public class ObtainingDispatcherTestCase { public ObtainingDispatcherTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/DefaultNamespaceTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/DefaultNamespaceTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/DefaultNamespaceTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -42,7 +42,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +(a)TestCase({Assertion.JSR286_28}) public class DefaultNamespaceTestCase { public DefaultNamespaceTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/LocalesTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/LocalesTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/LocalesTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -47,7 +47,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +(a)TestCase({Assertion.JSR286_34}) public class LocalesTestCase { public LocalesTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/NoEventTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/NoEventTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/NoEventTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -44,7 +44,10 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +@TestCase({ + Assertion.JSR286_29, + Assertion.JSR286_30 + }) public class NoEventTestCase { public NoEventTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/NoLocalesTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/NoLocalesTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/NoLocalesTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -44,7 +44,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +(a)TestCase({Assertion.JSR286_34}) public class NoLocalesTestCase { public NoLocalesTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/NoPublicRenderParameterTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/NoPublicRenderParameterTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/NoPublicRenderParameterTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -43,7 +43,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +(a)TestCase({Assertion.JSR286_29}) public class NoPublicRenderParameterTestCase { public NoPublicRenderParameterTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/ProcessingEventTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/ProcessingEventTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/ProcessingEventTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -49,7 +49,12 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +@TestCase({ + Assertion.JSR286_30, + Assertion.JSR286_31, + Assertion.JSR286_32, + Assertion.JSR286_33 + }) public class ProcessingEventTestCase { public ProcessingEventTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/PublicRenderParameterTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/PublicRenderParameterTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/PublicRenderParameterTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -46,7 +46,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +(a)TestCase({Assertion.JSR286_29}) public class PublicRenderParameterTestCase { public PublicRenderParameterTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/PublishingEventTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/PublishingEventTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/PublishingEventTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -49,7 +49,12 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +@TestCase({ + Assertion.JSR286_30, + Assertion.JSR286_31, + Assertion.JSR286_32, + Assertion.JSR286_33 + }) public class PublishingEventTestCase { Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/PublishingProcessingEventTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/PublishingProcessingEventTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfig/PublishingProcessingEventTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -49,7 +49,12 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +@TestCase({ + Assertion.JSR286_30, + Assertion.JSR286_31, + Assertion.JSR286_32, + Assertion.JSR286_33 + }) public class PublishingProcessingEventTestCase { public PublishingProcessingEventTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/DefaultNamespaceTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/DefaultNamespaceTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/DefaultNamespaceTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -43,7 +43,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +(a)TestCase({Assertion.JSR286_28}) public class DefaultNamespaceTestCase { public DefaultNamespaceTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/NoEventTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/NoEventTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/NoEventTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -44,7 +44,10 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +@TestCase({ + Assertion.JSR286_30, + Assertion.JSR286_32 + }) public class NoEventTestCase { public NoEventTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/ProcessingEventTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/ProcessingEventTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/ProcessingEventTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -49,7 +49,12 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +@TestCase({ + Assertion.JSR286_30, + Assertion.JSR286_31, + Assertion.JSR286_32, + Assertion.JSR286_33 + }) public class ProcessingEventTestCase { public ProcessingEventTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/PublishingEventTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/PublishingEventTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/PublishingEventTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -50,7 +50,12 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +@TestCase({ + Assertion.JSR286_30, + Assertion.JSR286_31, + Assertion.JSR286_32, + Assertion.JSR286_33 + }) public class PublishingEventTestCase { Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/PublishingProcessingEventTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/PublishingProcessingEventTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletconfignonamespace/PublishingProcessingEventTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -48,7 +48,12 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +@TestCase({ + Assertion.JSR286_30, + Assertion.JSR286_31, + Assertion.JSR286_32, + Assertion.JSR286_33 + }) public class PublishingProcessingEventTestCase { public PublishingProcessingEventTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/PortletDoesNotReceiveUnsupportedRenderParametersTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/PortletDoesNotReceiveUnsupportedRenderParametersTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/PortletDoesNotReceiveUnsupportedRenderParametersTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -76,7 +76,11 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +@TestCase({ + Assertion.JSR168_82, + Assertion.JSR168_83, + Assertion.JSR168_84 + }) public class PortletDoesNotReceiveUnsupportedRenderParametersTestCase { Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/PublicRenderParameterAvailableInLifeCycleMethodTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/PublicRenderParameterAvailableInLifeCycleMethodTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/PublicRenderParameterAvailableInLifeCycleMethodTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -82,7 +82,11 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +@TestCase({ + Assertion.JSR168_84, + Assertion.JSR168_85, + Assertion.JSR168_86 + }) public class PublicRenderParameterAvailableInLifeCycleMethodTestCase { Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/PublicRenderParameterTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/PublicRenderParameterTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/PublicRenderParameterTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -58,7 +58,9 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -(a)TestCase({Assertion.JSR168_1000}) +@TestCase({ + Assertion.JSR168_1000 + }) public class PublicRenderParameterTestCase { Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/DowngradeCacheabilityTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/DowngradeCacheabilityTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/DowngradeCacheabilityTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -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.actions.PortletRenderTestAction; import org.jboss.portal.unit.actions.PortletResourceTestAction; @@ -63,7 +64,11 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -@TestCase() +@TestCase({ + Assertion.JSR286_130, + Assertion.JSR286_131, + Assertion.JSR286_132 + }) public class DowngradeCacheabilityTestCase { public DowngradeCacheabilityTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/HTTPMethodTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/HTTPMethodTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/HTTPMethodTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -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.actions.PortletRenderTestAction; import org.jboss.portal.unit.actions.PortletResourceTestAction; @@ -53,7 +54,9 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -@TestCase() +@TestCase({ + Assertion.JSR286_122 + }) public class HTTPMethodTestCase { public HTTPMethodTestCase(PortletTestCase seq) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/ResourceIDTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/ResourceIDTestCase.java 2008-01-31 09:50:56 UTC (rev 9677) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/resourceserving/ResourceIDTestCase.java 2008-01-31 10:23:45 UTC (rev 9678) @@ -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.actions.PortletRenderTestAction; import org.jboss.portal.unit.actions.PortletResourceTestAction; @@ -53,7 +54,9 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -@TestCase() +@TestCase({ + Assertion.JSR286_124 + }) public class ResourceIDTestCase { public ResourceIDTestCase(PortletTestCase seq)

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r9677 - modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-01-31 04:50:56 -0500 (Thu, 31 Jan 2008) New Revision: 9677 Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java Log: more and more.... Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-01-31 09:39:40 UTC (rev 9676) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-01-31 09:50:56 UTC (rev 9677) @@ -1040,16 +1040,29 @@ // PLT.20 Portlet Filter - JSR286_292(new TCK(292), "", ""), - JSR286_293(new TCK(293), "", ""), - JSR286_294(new TCK(294), "", ""), - JSR286_295(new TCK(295), "", ""), - JSR286_296(new TCK(296), "", ""), - JSR286_297(new TCK(297), "", ""), - JSR286_298(new TCK(298), "", ""), - JSR286_299(new TCK(299), "", ""), - JSR286_300(new TCK(300), "", ""), - JSR286_301(new TCK(301), "", ""), + JSR286_292(new TCK(292), "PLT.20.2.1", "After deployment of the portlet application, and before a request causes " + + "the portlet container to access a portlet, the portlet container must locate the list of portlet filters that " + + "must be applied to the portlet as described below."), + JSR286_293(new TCK(293), "PLT.20.2.1", "The portlet container must ensure that it has instantiated a filter of the " + + "appropriate class for each filter in the list, and called its init(FilterConfig config) method"), + JSR286_294(new TCK(294), "PLT.20.2.1", "Depending on the target method of doFilter call the PortletRequest and " + + "PortletResponse must be instances of the following interfaces: ActionRequest and ActionResponse for " + + "processAction calls, EventRequest and EventResponse for processEvent calls, RenderRequest and RenderResponse " + + "for render calls, ResourceRequest and ResourceResponse for serveResource calls"), + JSR286_295(new TCK(295), "PLT.20.2.1", "Before a filter instance can be removed from service by the portlet " + + "container, the portlet container must first call the destroy method on the filter to enable the filter to " + + "release any resources and perform other cleanup operations."), + JSR286_296(new TCK(296), "PLT.20.2.2", "When a filter invokes the doFilter method on the portlet container’s " + + "filter chain implementation, the container must ensure that the request and\n" + + "response object that it passes to the next component in the filter chain, or to the target portlet if the " + + "filter was the last in the chain, is the same object that was passed into the doFilter method by the calling " + + "filter or one of the above mentioned wrappers."), + JSR286_297(new TCK(297), "PLT.20.2.4", "The portlet container must instantiate exactly one instance of the Java " + + "class defining the filter per filter declaration in the deployment descriptor."), + JSR286_298(new TCK(298), "PLT.20.2.4", "Filters can be associated with groups of portlets using the ‘*’ character as a wildcard at the end of a string to indicate that the filter must be applied to any portlet whose name starts with the characters before the “*” character."), + JSR286_299(new TCK(299), "PLT.20.2.4", "The portlet container is free to add additional filters at any place in this filter chain, but must not remove filters matching a specific portlet."), + JSR286_300(new TCK(300), "PLT.20.2.5", "A portlet filter can be applied to different lifecycle method calls: processAction, processEvent, render, serveResource"), + JSR286_301(new TCK(301), "PLT.20.2.5", "Thus the filter must define the lifecycle method for which the filter is written in the <lifecycle> element of the <filter> element."), // PLT.21 User Information @@ -1085,16 +1098,46 @@ // PLT.26 Portlet Tag Library - JSR286_312(new TCK(312), "", ""), - - //.. - - JSR286_350(new TCK(350), "", ""), - - - + JSR286_312(new TCK(312), "PLT.26.1", "The portlet-container must provide an implementation of the portlet tag library"), + JSR286_313(new TCK(313), "PLT.26.1", "The defineObjects tag must define the following variables in the JSP page: [REF TO THE SPEC]"), + JSR286_314(new TCK(314), "PLT.26.2", "The defineObjects tag must not define any attribute and it must not contain any body content"), + JSR286_315(new TCK(315), "PLT.26.2", "The portlet actionURL tag creates a URL that must point to the current portlet and must trigger an action request with the supplied parameters"), + JSR286_316(new TCK(316), "PLT.26.2", "If the specified window state is illegal for the current request, a JspException must be thrown."), + JSR286_317(new TCK(317), "PLT.26.2", "If a window state is notset for a URL, it should stay the same as the window state of the current request."), + JSR286_318(new TCK(318), "PLT.26.2", "portletMode (Type: String, non-required) – indicates the portlet mode that the portlet must have when this link is executed, if no error condition ocurred"), + JSR286_319(new TCK(319), "PLT.26.2", "If the specified portlet mode is illegal for the current request, a JspException must be thrown."), + JSR286_320(new TCK(320), "PLT.26.2", ""), + JSR286_321(new TCK(321), "PLT.26.2", ""), + JSR286_322(new TCK(322), "PLT.26.2", ""), + JSR286_323(new TCK(323), "PLT.26.2", ""), + JSR286_324(new TCK(324), "PLT.26.2", ""), + JSR286_325(new TCK(325), "PLT.26.2", ""), + JSR286_326(new TCK(326), "PLT.26.2", ""), + JSR286_327(new TCK(327), "PLT.26.3", ""), + JSR286_328(new TCK(328), "PLT.26.3", ""), + JSR286_329(new TCK(329), "PLT.26.3", ""), + JSR286_330(new TCK(330), "PLT.26.3", ""), + JSR286_331(new TCK(331), "PLT.26.3", ""), + JSR286_332(new TCK(332), "PLT.26.3", ""), + JSR286_333(new TCK(333), "PLT.26.3", ""), + JSR286_334(new TCK(334), "PLT.26.3", ""), + JSR286_335(new TCK(335), "PLT.26.3", ""), + JSR286_336(new TCK(336), "PLT.26.3", ""), + JSR286_337(new TCK(337), "PLT.26.3", ""), + JSR286_338(new TCK(338), "PLT.26.3", ""), + JSR286_339(new TCK(339), "PLT.26.4", ""), + JSR286_340(new TCK(340), "PLT.26.4", ""), + JSR286_341(new TCK(341), "PLT.26.4", ""), + JSR286_342(new TCK(342), "PLT.26.4", ""), + JSR286_343(new TCK(343), "PLT.26.4", ""), + JSR286_344(new TCK(344), "PLT.26.4", ""), + JSR286_345(new TCK(345), "PLT.26.4", ""), + JSR286_346(new TCK(346), "PLT.26.5", ""), + JSR286_347(new TCK(347), "PLT.26.6", ""), + JSR286_348(new TCK(348), "PLT.26.6", ""), + JSR286_349(new TCK(349), "PLT.26.6", ""), + JSR286_350(new TCK(350), "PLT.26.6", "") - ; /**

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r9676 - in modules/portlet/trunk/portlet/src: test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-01-31 04:39:40 -0500 (Thu, 31 Jan 2008) New Revision: 9676 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/DispatchedContainerAttributesTestCase.java Log: - test case for getAttributeNames now Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java 2008-01-31 09:20:20 UTC (rev 9675) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java 2008-01-31 09:39:40 UTC (rev 9676) @@ -44,7 +44,6 @@ import java.util.Locale; import java.util.Map; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedList; import java.util.Set; import java.util.HashSet; @@ -250,16 +249,19 @@ public final Object getAttribute(String s) { - Map<String, String> containerAttributes = containerAttributesStack.getLast(); - if (containerAttributes.containsKey(s)) + if (s != null) { - return containerAttributes.get(s); - } + Map<String, String> containerAttributes = containerAttributesStack.getLast(); + if (containerAttributes.containsKey(s)) + { + return containerAttributes.get(s); + } - // - if (ALL_CONTAINER_ATTRIBUTES.contains(s)) - { - return null; + // + if (ALL_CONTAINER_ATTRIBUTES.contains(s)) + { + return null; + } } // @@ -268,52 +270,25 @@ public final Enumeration getAttributeNames() { - final Map<String, String> containerAttributes = containerAttributesStack.getLast(); - final Iterator<String> i = preq.getAttributes().getAttributeNames((HttpServletRequest)getRequest()); + Set<String> names = Tools.toSet(preq.getAttributes().getAttributeNames(null)); - // - return new Enumeration() + // Add super stuff that is not reserved + for (Enumeration e = super.getAttributeNames();e.hasMoreElements();) { - // The next element - String next; + String name = (String)e.nextElement(); + // + if (!ALL_CONTAINER_ATTRIBUTES.contains(name)) { - next(); + names.add(name); } + } - public boolean hasMoreElements() - { - return next != null; - } + // + names.addAll(containerAttributesStack.getLast().keySet()); - public Object nextElement() - { - Object next = this.next; - next(); - return next; - } - - private void next() - { - next = null; - while (true) - { - if (i.hasNext()) - { - String next = i.next(); - if (!containerAttributes.containsKey(next)) - { - this.next = next; - break; - } - } - else - { - break; - } - } - } - }; + // + return Collections.enumeration(names); } public final void setAttribute(String s, Object o) Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/DispatchedContainerAttributesTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/DispatchedContainerAttributesTestCase.java 2008-01-31 09:20:20 UTC (rev 9675) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/DispatchedContainerAttributesTestCase.java 2008-01-31 09:39:40 UTC (rev 9676) @@ -33,9 +33,11 @@ import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTS1; import org.jboss.portal.portlet.LifeCyclePhase; +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.assertEquals; +import static org.jboss.unit.api.Assert.fail; import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; import javax.portlet.Portlet; @@ -58,6 +60,8 @@ import java.io.IOException; import java.util.Map; import java.util.HashMap; +import java.util.Set; +import java.util.HashSet; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -169,18 +173,41 @@ { PortletContext portletContext = ((AbstractUniversalTestPortlet)portlet).getPortletContext(); dispatch(request, response, portletContext); - assertMap(expectedAttributes, collectedAttributes); - assertMap(expectedInfos, collectedInfos); - } - private void assertMap(Map<String, String> expectedMap, Map<String, Object> actualMap) - { - assertEquals(expectedMap.keySet(), actualMap.keySet()); - for (Map.Entry<String, String> entry : expectedMap.entrySet()) + // + for (Map.Entry<String, String> entry : expectedAttributes.entrySet()) { + String name = entry.getKey(); + String expectedValue = entry.getValue(); + + // + if (expectedValue == null) + { + if (collectedAttributes.containsKey(name)) + { + fail("The actual map " + collectedAttributes + " should not contain the name " + name); + } + } + else + { + if (collectedAttributes.containsKey(name)) + { + Object collectedValue = collectedAttributes.get(name); + assertEquals("Was expecting a value " + expectedValue + " for key " + name + " but had instead " + collectedValue, expectedValue, collectedValue); + } + else + { + fail("The actual map " + collectedAttributes + " should contain the name " + name); + } + } + } + + // + for (Map.Entry<String, String> entry : expectedInfos.entrySet()) + { String key = entry.getKey(); String expectedValue = entry.getValue(); - Object collectedValue = actualMap.get(key); + Object collectedValue = collectedInfos.get(key); assertEquals("Was expecting a value " + expectedValue + " for key " + key + " but had instead " + collectedValue, expectedValue, collectedValue); } } @@ -189,11 +216,15 @@ { protected DriverResponse run(Servlet servlet, HttpServletRequest request, HttpServletResponse response, PortletTestContext context) throws ServletException, IOException { + Set attributeNames = Tools.toSet(request.getAttributeNames()); collectedAttributes.clear(); - for (String key : expectedAttributes.keySet()) + for (String name : expectedAttributes.keySet()) { - Object value = request.getAttribute(key); - collectedAttributes.put(key, value); + if (attributeNames.contains(name)) + { + Object value = request.getAttribute(name); + collectedAttributes.put(name, value); + } } //

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r9675 - modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-01-31 04:20:20 -0500 (Thu, 31 Jan 2008) New Revision: 9675 Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java Log: Rest of PLT.19 Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-01-31 08:51:22 UTC (rev 9674) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-01-31 09:20:20 UTC (rev 9675) @@ -741,14 +741,28 @@ // PLT.19 Dispatching Requests to Servlets and JSPs - JSR286_177(new TCK(177), "", ""), - JSR286_178(new TCK(178), "", ""), - JSR286_179(new TCK(179), "", ""), - JSR286_180(new TCK(180), "", ""), - JSR286_181(new TCK(181), "", ""), - JSR286_182(new TCK(182), "", ""), - JSR286_183(new TCK(183), "", ""), - JSR286_184(new TCK(184), "", ""), + JSR286_177(new TCK(177), "PLT.19.1", "The getRequestDispatcher method takes a String argument describing a path " + + "within the scope of the PortletContext of a portlet application. This path must begin with a ‘/’ and it is " + + "relative to the PortletContext root."), + JSR286_178(new TCK(178), "PLT.19.1", "If no resource can be resolved based on the given path or name the methods " + + "must return null."), + JSR286_179(new TCK(179), "PLT.19.1.1", "The parameters associated with a PortletRequestDispatcher are scoped to " + + "apply only for the duration of the include call."), + JSR286_180(new TCK(180), "PLT.19.2", "The parameters to these methods must be the request and response arguments " + + "that were passed in via the corresponding lifecycle method (e.g. processAction, processEvent, serveResource, " + + "render) , or the request and response arguments must be instances of the corresponding subclasses of the request " + + "and response wrapper classes that were introduced for version 2.0 of the specification."), + JSR286_181(new TCK(181), "PLT.19.2", "The portlet container must ensure that the servlet or JSP called through a" + + " PortletRequestDispatcher is called in the same thread as the PortletRequestDispatcher include invocation"), + JSR286_182(new TCK(182), "PLT.19.3", "Servlets and JSPs included from portlets in the render method must be handled " + + "as HTTP GET requests."), + JSR286_183(new TCK(183), "PLT.19.3.1", "Except for servlets obtained by using the getNamedDispatcher method, a " + + "servlet or JSP being used from within an include call has access to the path used to obtain the " + + "PortletRequestDispatcher. The following request attributes must be set: javax.servlet.include.request_uri, " + + "javax.servlet.include.context_path, javax.servlet.include.servlet_path, javax.servlet.include.path_info, " + + "javax.servlet.include.query_string"), + JSR286_184(new TCK(184), "PLT.19.3.2", "These attributes must be the same Portlet API objects accessible to the " + + "portlet doing the include call."), // PLT.19.3.3 Request and Response Objects for Included Servlets/JSPs from within the Action and Event processing Methods JSR286_185(new TCK(185), "PLT.19.3.3", "The following methods of the HttpServletRequest must return null: " + @@ -872,16 +886,30 @@ JSR286_232(new TCK(232), "PLT.19.3.5", "The containsHeader method of the HttpServletResponse must return false."), // - JSR286_233(new TCK(233), "", ""), - JSR286_234(new TCK(234), "", ""), - JSR286_235(new TCK(235), "", ""), - JSR286_236(new TCK(236), "", ""), - JSR286_237(new TCK(237), "", ""), - JSR286_238(new TCK(238), "", ""), - JSR286_239(new TCK(239), "", ""), - JSR286_240(new TCK(240), "", ""), - JSR286_241(new TCK(241), "", ""), - JSR286_242(new TCK(242), "", ""), + JSR286_233(new TCK(233), "PLT.19.3.7", "If the servlet or JSP that is the target of a request dispatcher throws a " + + "runtime exception or a checked exception of type IOException, it must be propagated to the calling portlet."), + JSR286_234(new TCK(234), "PLT.19.3.7", "All other exceptions, including a ServletException, must be wrapped with a" + + " PortletException. The root cause of the exception must be set to the original exception before being propagated."), + JSR286_235(new TCK(235), "PLT.19.3.8", "Thus the portlet acts as starting point of the include chain and the " + + "included / forwarded servlet must get the path and query string information used to obtain the " + + "PortletRequestDispatcher object."), + JSR286_236(new TCK(236), "PLT.19.4", "If output data exists in the response buffer that has not been committed, " + + "the content must be cleared before the target servlet’s service method is called."), + JSR286_237(new TCK(237), "PLT.19.4", "If the response has been committed, an IllegalStateException must be thrown."), + JSR286_238(new TCK(238), "PLT.19.4", "Before the forward method of the RequestDispatcher interface returns, the " + + "response content must be sent and committed, and closed by the portlet container."), + JSR286_239(new TCK(239), "PLT.19.4.2", "The following request attributes must be set: " + + "javax.servlet.forward.request_uri, javax.servlet.forward.context_path, javax.servlet.forward.servlet_path, " + + "javax.servlet.forward.path_info, javax.servlet.forward.query_string"), + JSR286_240(new TCK(240), "PLT.19.4.2", "The values of these attributes must be equal to the return values of the " + + "HttpServletRequest methods getRequestURI, getContextPath, getServletPath, getPathInfo, getQueryString " + + "respectively, invoked on the request object passed to the first servlet object in the forward call chain."), + JSR286_241(new TCK(241), "PLT.19.4.2", "These attributes are accessible from the forwarded servlet via the " + + "getAttribute method on the request object. Note that these attributes must always reflect the information " + + "in the target of the first forward servlet in the situation that multiple forwards and subsequent includes " + + "are called."), + JSR286_242(new TCK(242), "PLT.19.4.2", "If the forwarded servlet was obtained by using the getNamedDispatcher" + + " method, these attributes must not be set."), // PLT.19.4.3 Request and Response Objects for Forwarded Servlets/JSPs from within the Action and Event processing Methods JSR286_243(new TCK(243), "PLT.19.4.3", "The following methods of the HttpServletRequest must return null: " + @@ -1005,7 +1033,9 @@ JSR286_290(new TCK(290), "PLT.19.4.5", "The containsHeader method of the HttpServletResponse must return false."), // - JSR286_291(new TCK(291), "PLT.19.5", ""), + JSR286_291(new TCK(291), "PLT.19.5", "Since the Java Servlet Specification V2.4 you can specify servlet filters " + + "for request dispatcher include calls. Portlet containers must support this capability for included servlets " + + "via the PortletRequestDispatcher."), // PLT.20 Portlet Filter

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r9674 - modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/tck/dispatcher.

by portal-commits＠lists.jboss.org

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(); - } - }); - } -}

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r9673 - modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-01-31 03:50:02 -0500 (Thu, 31 Jan 2008) New Revision: 9673 Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromResourceObjectsTestCase.java Log: bobo Modified: 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 2008-01-31 08:36:23 UTC (rev 9672) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardFromResourceObjectsTestCase.java 2008-01-31 08:50:02 UTC (rev 9673) @@ -100,7 +100,6 @@ //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; }

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r9672 - modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher.

by portal-commits＠lists.jboss.org

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,

16 years, 3 months

1
0
0 / 0

JBoss Portal SVN: r9671 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-01-31 03:19:06 -0500 (Thu, 31 Jan 2008) New Revision: 9671 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml Log: spelling correction File/Files Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-01-31 08:15:19 UTC (rev 9670) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-01-31 08:19:06 UTC (rev 9671) @@ -67,7 +67,7 @@ </mediaobject> </para> <para> - File contained in this download will be used in later sections. Download and extract the JBoss Portal binary zip file before proceeding. + Files contained in this download will be used in later sections. Download and extract the JBoss Portal binary zip file before proceeding. </para> </sect3> <sect3>

16 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits January 2008