Author: julien(a)jboss.com Date: 2008-02-01 09:07:31 -0500 (Fri, 01 Feb 2008) New Revision: 9701 Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/CallbackQueue.java Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/PortletURLSnapshot.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListener.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListener1.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListener2.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListenerTestCase.java Log: - update the url gen listener test cases to scale more in # of test cases to write Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/CallbackQueue.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/CallbackQueue.java (rev 0) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/CallbackQueue.java 2008-02-01 14:07:31 UTC (rev 9701) @@ -0,0 +1,73 @@ +/****************************************************************************** + * 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.portleturl; + +import org.jboss.unit.api.Assert; + +import javax.portlet.PortletURLGenerationListener; +import javax.portlet.PortletURL; +import javax.portlet.ResourceURL; +import java.util.LinkedList; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class CallbackQueue +{ + + /** . */ + private static LinkedList<PortletURLSnapshot> queue = new LinkedList<PortletURLSnapshot>(); + + public static PortletURLSnapshot next() + { + Assert.assertTrue(queue.size() > 0); + return queue.removeFirst(); + } + + public static int size() + { + return queue.size(); + } + + public static PortletURLGenerationListener createListener(final String id) + { + return new PortletURLGenerationListener() + { + public void filterActionURL(PortletURL portletURL) + { + queue.addLast(PortletURLSnapshot.createActionURL(id, portletURL)); + } + + public void filterRenderURL(PortletURL portletURL) + { + queue.addLast(PortletURLSnapshot.createRenderURL(id, portletURL)); + } + + public void filterResourceURL(ResourceURL resourceURL) + { + queue.addLast(PortletURLSnapshot.createResourceURL(id, resourceURL)); + } + }; + } +} Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/PortletURLSnapshot.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/PortletURLSnapshot.java 2008-02-01 08:10:37 UTC (rev 9700) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/PortletURLSnapshot.java 2008-02-01 14:07:31 UTC (rev 9701) @@ -39,20 +39,6 @@ { /** . */ - public static LinkedList<PortletURLSnapshot> queue = new LinkedList<PortletURLSnapshot>(); - - public static PortletURLSnapshot next() - { - Assert.assertTrue(queue.size() > 0); - return queue.removeFirst(); - } - - public static int size() - { - return queue.size(); - } - - /** . */ private static final int ACTION = 0; /** . */ @@ -62,7 +48,7 @@ private static final int RESOURCE = 2; /** . */ - final Class source; + final String source; /** . */ final int type; @@ -76,37 +62,37 @@ /** . */ final Map<String, String[]> parameters; - public static PortletURLSnapshot createActionURL(Class source, PortletURL actionURL) + public static PortletURLSnapshot createActionURL(String source, PortletURL actionURL) { return new PortletURLSnapshot(source, ACTION, actionURL); } - public static PortletURLSnapshot createRenderURL(Class source, PortletURL renderURL) + public static PortletURLSnapshot createRenderURL(String source, PortletURL renderURL) { return new PortletURLSnapshot(source, RENDER, renderURL); } - public static PortletURLSnapshot createResourceURL(Class source, ResourceURL resourceURL) + public static PortletURLSnapshot createResourceURL(String source, ResourceURL resourceURL) { return new PortletURLSnapshot(source, resourceURL); } - public static PortletURLSnapshot createActionURL(Class source, PortletMode portletMode, WindowState windowState, Map<String, String[]> parameters) + public static PortletURLSnapshot createActionURL(String source, PortletMode portletMode, WindowState windowState, Map<String, String[]> parameters) { return new PortletURLSnapshot(source, ACTION, portletMode, windowState, parameters); } - public static PortletURLSnapshot createRenderRL(Class source, PortletMode portletMode, WindowState windowState, Map<String, String[]> parameters) + public static PortletURLSnapshot createRenderRL(String source, PortletMode portletMode, WindowState windowState, Map<String, String[]> parameters) { return new PortletURLSnapshot(source, RENDER, portletMode, windowState, parameters); } - public static PortletURLSnapshot createResourceURL(Class source, Map<String, String[]> parameters) + public static PortletURLSnapshot createResourceURL(String source, Map<String, String[]> parameters) { return new PortletURLSnapshot(source, parameters); } - private PortletURLSnapshot(Class source, int type, PortletURL portletURL) + private PortletURLSnapshot(String source, int type, PortletURL portletURL) { this.source = source; this.type = type; @@ -115,7 +101,7 @@ this.parameters = portletURL.getParameterMap(); } - private PortletURLSnapshot(Class source, ResourceURL portletURL) + private PortletURLSnapshot(String source, ResourceURL portletURL) { this.source = source; this.type = RESOURCE; @@ -124,7 +110,7 @@ this.parameters = portletURL.getParameterMap(); } - private PortletURLSnapshot(Class source, int type, PortletMode portletMode, WindowState windowState, Map<String, String[]> parameters) + private PortletURLSnapshot(String source, int type, PortletMode portletMode, WindowState windowState, Map<String, String[]> parameters) { this.source = source; this.type = type; @@ -133,7 +119,7 @@ this.parameters = parameters; } - private PortletURLSnapshot(Class source, Map<String, String[]> parameters) + private PortletURLSnapshot(String source, Map<String, String[]> parameters) { this.source = source; this.type = RESOURCE; Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListener.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListener.java 2008-02-01 08:10:37 UTC (rev 9700) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListener.java 2008-02-01 14:07:31 UTC (rev 9701) @@ -31,21 +31,36 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 630 $ */ -public class URLGenerationListener implements PortletURLGenerationListener +public abstract class URLGenerationListener implements PortletURLGenerationListener { public void filterActionURL(PortletURL portletURL) { - PortletURLSnapshot.queue.addLast(PortletURLSnapshot.createActionURL(getClass(), portletURL)); + PortletURLGenerationListener delegate = getListener(); + if (delegate != null) + { + delegate.filterActionURL(portletURL); + } } public void filterRenderURL(PortletURL portletURL) { - PortletURLSnapshot.queue.addLast(PortletURLSnapshot.createRenderURL(getClass(), portletURL)); + PortletURLGenerationListener delegate = getListener(); + if (delegate != null) + { + delegate.filterRenderURL(portletURL); + } } public void filterResourceURL(ResourceURL resourceURL) { - PortletURLSnapshot.queue.addLast(PortletURLSnapshot.createResourceURL(getClass(), resourceURL)); + PortletURLGenerationListener delegate = getListener(); + if (delegate != null) + { + delegate.filterResourceURL(resourceURL); + } } + + protected abstract PortletURLGenerationListener getListener(); + } \ No newline at end of file Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListener1.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListener1.java 2008-02-01 08:10:37 UTC (rev 9700) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListener1.java 2008-02-01 14:07:31 UTC (rev 9701) @@ -33,4 +33,12 @@ */ public class URLGenerationListener1 extends URLGenerationListener { + + /** . */ + public static PortletURLGenerationListener delegate; + + protected PortletURLGenerationListener getListener() + { + return delegate; + } } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListener2.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListener2.java 2008-02-01 08:10:37 UTC (rev 9700) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListener2.java 2008-02-01 14:07:31 UTC (rev 9701) @@ -33,4 +33,12 @@ */ public class URLGenerationListener2 extends URLGenerationListener { + + /** . */ + public static PortletURLGenerationListener delegate; + + protected PortletURLGenerationListener getListener() + { + return delegate; + } } \ No newline at end of file Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListenerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListenerTestCase.java 2008-02-01 08:10:37 UTC (rev 9700) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portleturl/URLGenerationListenerTestCase.java 2008-02-01 14:07:31 UTC (rev 9701) @@ -55,22 +55,25 @@ { PortletURL actionURL = response.createActionURL(); + URLGenerationListener1.delegate = CallbackQueue.createListener("l1"); + URLGenerationListener2.delegate = CallbackQueue.createListener("l2"); + // actionURL.toString(); - PortletURLSnapshot actionSnapshot1 = PortletURLSnapshot.next(); - PortletURLSnapshot actionSnapshot2 = PortletURLSnapshot.next(); - assertEquals(0, PortletURLSnapshot.size()); - actionSnapshot1.assertEquals(PortletURLSnapshot.createActionURL(URLGenerationListener1.class, null, null, new HashMap<String, String[]>())); - actionSnapshot2.assertEquals(PortletURLSnapshot.createActionURL(URLGenerationListener2.class, null, null, new HashMap<String, String[]>())); + PortletURLSnapshot actionSnapshot1 = CallbackQueue.next(); + PortletURLSnapshot actionSnapshot2 = CallbackQueue.next(); + assertEquals(0, CallbackQueue.size()); + actionSnapshot1.assertEquals(PortletURLSnapshot.createActionURL("l1", null, null, new HashMap<String, String[]>())); + actionSnapshot2.assertEquals(PortletURLSnapshot.createActionURL("l2", null, null, new HashMap<String, String[]>())); // actionURL.setPortletMode(PortletMode.EDIT); actionURL.toString(); - actionSnapshot1 = PortletURLSnapshot.next(); - actionSnapshot2 = PortletURLSnapshot.next(); - assertEquals(0, PortletURLSnapshot.size()); - actionSnapshot1.assertEquals(PortletURLSnapshot.createActionURL(URLGenerationListener1.class, PortletMode.EDIT, null, new HashMap<String, String[]>())); - actionSnapshot2.assertEquals(PortletURLSnapshot.createActionURL(URLGenerationListener2.class, PortletMode.EDIT, null, new HashMap<String, String[]>())); + actionSnapshot1 = CallbackQueue.next(); + actionSnapshot2 = CallbackQueue.next(); + assertEquals(0, CallbackQueue.size()); + actionSnapshot1.assertEquals(PortletURLSnapshot.createActionURL("l1", PortletMode.EDIT, null, new HashMap<String, String[]>())); + actionSnapshot2.assertEquals(PortletURLSnapshot.createActionURL("l2", PortletMode.EDIT, null, new HashMap<String, String[]>())); // return new EndTestResponse();