[portal-commits] JBoss Portal SVN: r9502 - in modules/portlet/trunk: test/src/test/resources/test and 1 other directory.

Author: julien(a)jboss.com Date: 2008-01-14 20:10:39 -0500 (Mon, 14 Jan 2008) New Revision: 9502 Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/PublishMultipleEventsDuringActionTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/PublishMultipleEventsDuringEventTestCase.java Removed: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/SendMultipleEventsDuringActionTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/SendMultipleEventsDuringEventTestCase.java Modified: modules/portlet/trunk/test/src/test/resources/test/remote-jboss-unit.xml Log: - renamed test case - my bad: commented most of jboss unit tests Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/PublishMultipleEventsDuringActionTestCase.java (from rev 9499, modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/SendMultipleEventsDuringActionTestCase.java) =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/PublishMultipleEventsDuringActionTestCase.java (rev 0) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/PublishMultipleEventsDuringActionTestCase.java 2008-01-15 01:10:39 UTC (rev 9502) @@ -0,0 +1,103 @@ +/****************************************************************************** + * 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.event; + +import org.jboss.portal.unit.annotations.TestCase; +import org.jboss.portal.unit.Assertion; +import org.jboss.portal.unit.PortletTestCase; +import org.jboss.portal.unit.PortletTestContext; +import org.jboss.portal.unit.actions.PortletRenderTestAction; +import org.jboss.portal.unit.actions.PortletActionTestAction; +import org.jboss.portal.unit.actions.PortletEventTestAction; +import org.jboss.portal.test.portlet.framework.UTP4; +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.*; +import static org.jboss.unit.api.Assert.assertEquals; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; + +import javax.portlet.RenderRequest; +import javax.portlet.Portlet; +import javax.portlet.RenderResponse; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.PortletException; +import javax.portlet.EventRequest; +import javax.portlet.EventResponse; +import javax.portlet.Event; +import javax.xml.namespace.QName; +import java.io.IOException; +import java.util.Set; +import java.util.HashSet; +import java.util.List; +import java.util.ArrayList; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +(a)TestCase({Assertion.JSR286_136}) +public class PublishMultipleEventsDuringActionTestCase +{ + + /** . */ + private final List<QName> events = new ArrayList<QName>(); + + public PublishMultipleEventsDuringActionTestCase(PortletTestCase seq) + { + seq.bindAction(0, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) + { + return new InvokeGetResponse(response.createActionURL().toString()); + } + }); + seq.bindAction(1, UTP4.ACTION_JOIN_POINT, new PortletActionTestAction() + { + protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException + { + events.clear(); + response.setEvent("Foo", null); + response.setEvent(new QName("urn:explicit-namespace", "Foo"), null); + } + }); + seq.bindAction(1, UTP4.EVENT_JOIN_POINT, new PortletEventTestAction() + { + protected void run(Portlet portlet, EventRequest request, EventResponse response, PortletTestContext context) throws PortletException, IOException + { + Event event = request.getEvent(); + events.add(event.getQName()); + } + }); + seq.bindAction(1, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) + { + assertEquals(2, events.size()); + assertEquals(Tools.toSet(new QName("urn:default-namespace", "Foo"), new QName("urn:explicit-namespace", "Foo")), new HashSet<QName>(events)); + return new EndTestResponse(); + } + }); + } +} \ No newline at end of file Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/PublishMultipleEventsDuringEventTestCase.java (from rev 9499, modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/SendMultipleEventsDuringEventTestCase.java) =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/PublishMultipleEventsDuringEventTestCase.java (rev 0) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/PublishMultipleEventsDuringEventTestCase.java 2008-01-15 01:10:39 UTC (rev 9502) @@ -0,0 +1,113 @@ +/****************************************************************************** + * 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.event; + +import org.jboss.portal.unit.annotations.TestCase; +import org.jboss.portal.unit.Assertion; +import org.jboss.portal.unit.PortletTestCase; +import org.jboss.portal.unit.PortletTestContext; +import org.jboss.portal.unit.actions.PortletRenderTestAction; +import org.jboss.portal.unit.actions.PortletActionTestAction; +import org.jboss.portal.unit.actions.PortletEventTestAction; +import org.jboss.portal.test.portlet.framework.UTP4; +import org.jboss.portal.test.portlet.framework.UTP5; +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.*; +import static org.jboss.unit.api.Assert.assertEquals; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; + +import javax.portlet.RenderRequest; +import javax.portlet.Portlet; +import javax.portlet.RenderResponse; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.PortletException; +import javax.portlet.EventRequest; +import javax.portlet.EventResponse; +import javax.portlet.Event; +import javax.xml.namespace.QName; +import java.io.IOException; +import java.util.Set; +import java.util.HashSet; +import java.util.List; +import java.util.ArrayList; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +(a)TestCase({Assertion.JSR286_136}) +public class PublishMultipleEventsDuringEventTestCase +{ + + /** . */ + private final List<QName> events = new ArrayList<QName>(); + + public PublishMultipleEventsDuringEventTestCase(PortletTestCase seq) + { + seq.bindAction(0, UTP5.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) + { + return new InvokeGetResponse(response.createActionURL().toString()); + } + }); + seq.bindAction(1, UTP5.ACTION_JOIN_POINT, new PortletActionTestAction() + { + protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException + { + events.clear(); + response.setEvent("Foo", null); + } + }); + seq.bindAction(1, UTP5.EVENT_JOIN_POINT, new PortletEventTestAction() + { + protected void run(Portlet portlet, EventRequest request, EventResponse response, PortletTestContext context) throws PortletException, IOException + { + Event event = request.getEvent(); + + // + if (events.size() == 0) + { + response.setEvent("Foo", null); + response.setEvent(new QName("urn:explicit-namespace", "Foo"), null); + } + + // Add this event too otherwise it would loop forever + events.add(event.getQName()); + } + }); + seq.bindAction(1, UTP5.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) + { + assertEquals(3, events.size()); + events.remove(0); + assertEquals(Tools.toSet(new QName("urn:default-namespace", "Foo"), new QName("urn:explicit-namespace", "Foo")), new HashSet<QName>(events)); + return new EndTestResponse(); + } + }); + } +} \ No newline at end of file Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/SendMultipleEventsDuringActionTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/SendMultipleEventsDuringActionTestCase.java 2008-01-15 00:57:45 UTC (rev 9501) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/SendMultipleEventsDuringActionTestCase.java 2008-01-15 01:10:39 UTC (rev 9502) @@ -1,103 +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.jsr286.tck.event; - -import org.jboss.portal.unit.annotations.TestCase; -import org.jboss.portal.unit.Assertion; -import org.jboss.portal.unit.PortletTestCase; -import org.jboss.portal.unit.PortletTestContext; -import org.jboss.portal.unit.actions.PortletRenderTestAction; -import org.jboss.portal.unit.actions.PortletActionTestAction; -import org.jboss.portal.unit.actions.PortletEventTestAction; -import org.jboss.portal.test.portlet.framework.UTP4; -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.*; -import static org.jboss.unit.api.Assert.assertEquals; -import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; - -import javax.portlet.RenderRequest; -import javax.portlet.Portlet; -import javax.portlet.RenderResponse; -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; -import javax.portlet.PortletException; -import javax.portlet.EventRequest; -import javax.portlet.EventResponse; -import javax.portlet.Event; -import javax.xml.namespace.QName; -import java.io.IOException; -import java.util.Set; -import java.util.HashSet; -import java.util.List; -import java.util.ArrayList; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -(a)TestCase({Assertion.JSR286_136}) -public class SendMultipleEventsDuringActionTestCase -{ - - /** . */ - private final List<QName> events = new ArrayList<QName>(); - - public SendMultipleEventsDuringActionTestCase(PortletTestCase seq) - { - seq.bindAction(0, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction() - { - protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) - { - return new InvokeGetResponse(response.createActionURL().toString()); - } - }); - seq.bindAction(1, UTP4.ACTION_JOIN_POINT, new PortletActionTestAction() - { - protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException - { - events.clear(); - response.setEvent("Foo", null); - response.setEvent(new QName("urn:explicit-namespace", "Foo"), null); - } - }); - seq.bindAction(1, UTP4.EVENT_JOIN_POINT, new PortletEventTestAction() - { - protected void run(Portlet portlet, EventRequest request, EventResponse response, PortletTestContext context) throws PortletException, IOException - { - Event event = request.getEvent(); - events.add(event.getQName()); - } - }); - seq.bindAction(1, UTP4.RENDER_JOIN_POINT, new PortletRenderTestAction() - { - protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) - { - assertEquals(2, events.size()); - assertEquals(Tools.toSet(new QName("urn:default-namespace", "Foo"), new QName("urn:explicit-namespace", "Foo")), new HashSet<QName>(events)); - return new EndTestResponse(); - } - }); - } -} \ No newline at end of file Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/SendMultipleEventsDuringEventTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/SendMultipleEventsDuringEventTestCase.java 2008-01-15 00:57:45 UTC (rev 9501) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/SendMultipleEventsDuringEventTestCase.java 2008-01-15 01:10:39 UTC (rev 9502) @@ -1,113 +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.jsr286.tck.event; - -import org.jboss.portal.unit.annotations.TestCase; -import org.jboss.portal.unit.Assertion; -import org.jboss.portal.unit.PortletTestCase; -import org.jboss.portal.unit.PortletTestContext; -import org.jboss.portal.unit.actions.PortletRenderTestAction; -import org.jboss.portal.unit.actions.PortletActionTestAction; -import org.jboss.portal.unit.actions.PortletEventTestAction; -import org.jboss.portal.test.portlet.framework.UTP4; -import org.jboss.portal.test.portlet.framework.UTP5; -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.*; -import static org.jboss.unit.api.Assert.assertEquals; -import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; - -import javax.portlet.RenderRequest; -import javax.portlet.Portlet; -import javax.portlet.RenderResponse; -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; -import javax.portlet.PortletException; -import javax.portlet.EventRequest; -import javax.portlet.EventResponse; -import javax.portlet.Event; -import javax.xml.namespace.QName; -import java.io.IOException; -import java.util.Set; -import java.util.HashSet; -import java.util.List; -import java.util.ArrayList; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -(a)TestCase({Assertion.JSR286_136}) -public class SendMultipleEventsDuringEventTestCase -{ - - /** . */ - private final List<QName> events = new ArrayList<QName>(); - - public SendMultipleEventsDuringEventTestCase(PortletTestCase seq) - { - seq.bindAction(0, UTP5.RENDER_JOIN_POINT, new PortletRenderTestAction() - { - protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) - { - return new InvokeGetResponse(response.createActionURL().toString()); - } - }); - seq.bindAction(1, UTP5.ACTION_JOIN_POINT, new PortletActionTestAction() - { - protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException - { - events.clear(); - response.setEvent("Foo", null); - } - }); - seq.bindAction(1, UTP5.EVENT_JOIN_POINT, new PortletEventTestAction() - { - protected void run(Portlet portlet, EventRequest request, EventResponse response, PortletTestContext context) throws PortletException, IOException - { - Event event = request.getEvent(); - - // - if (events.size() == 0) - { - response.setEvent("Foo", null); - response.setEvent(new QName("urn:explicit-namespace", "Foo"), null); - } - - // Add this event too otherwise it would loop forever - events.add(event.getQName()); - } - }); - seq.bindAction(1, UTP5.RENDER_JOIN_POINT, new PortletRenderTestAction() - { - protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) - { - assertEquals(3, events.size()); - events.remove(0); - assertEquals(Tools.toSet(new QName("urn:default-namespace", "Foo"), new QName("urn:explicit-namespace", "Foo")), new HashSet<QName>(events)); - return new EndTestResponse(); - } - }); - } -} \ No newline at end of file Modified: modules/portlet/trunk/test/src/test/resources/test/remote-jboss-unit.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/test/remote-jboss-unit.xml 2008-01-15 00:57:45 UTC (rev 9501) +++ modules/portlet/trunk/test/src/test/resources/test/remote-jboss-unit.xml 2008-01-15 01:10:39 UTC (rev 9502) @@ -4,10 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> -<!-- - --> -<!--Spec TCK Assertions tests--> -<!-- + <!--Spec TCK Assertions tests--> <generic> <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> <property name="archiveId" value="test-jsr168-tck-dispatcher.war"/> @@ -53,9 +50,7 @@ <property name="archiveId" value="test-jsr168-tck-windowstates.war"/> </generic> - --> -<!--API Tests--> -<!-- + <!--API Tests--> <generic> <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> <property name="archiveId" value="test-jsr168-api-actionrequest.war"/> @@ -109,9 +104,7 @@ <property name="archiveId" value="test-jsr168-api-windowstate.war"/> </generic> - --> -<!--Ext Tests--> -<!-- + <!--Ext Tests--> <generic> <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> <property name="archiveId" value="test-jsr168-ext-dispatcher.war"/> @@ -153,9 +146,7 @@ <property name="archiveId" value="test-jsr168-ext-nocache.war"/> </generic> - --> -<!--Spec TCK Assertions tests--> -<!-- + <!--Spec TCK Assertions tests--> <generic> <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> <property name="archiveId" value="test-jsr286-tck-portletconfig.war"/> @@ -164,17 +155,14 @@ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> <property name="archiveId" value="test-jsr286-tck-portletconfignonamespace.war"/> </generic> ---> <generic> <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> <property name="archiveId" value="test-jsr286-tck-event.war"/> </generic> -<!-- <generic> <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> <property name="archiveId" value="test-jsr286-tck-eventnonamespace.war"/> </generic> ---> <!--Misc Tests--> <!--