Author: julien(a)jboss.com
Date: 2007-04-22 18:48:41 -0400 (Sun, 22 Apr 2007)
New Revision: 7022
Added:
trunk/test/src/main/org/jboss/portal/test/framework/driver/web/command/DnDCommand.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/web/response/DnDResponse.java
trunk/theme/src/main/org/jboss/portal/test/theme/dyna/tests/dnd/
trunk/theme/src/main/org/jboss/portal/test/theme/dyna/tests/dnd/DnDTest.java
Modified:
trunk/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestConversation.java
trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js
trunk/theme/src/main/org/jboss/portal/test/theme/TestInfoServlet.java
trunk/theme/src/main/org/jboss/portal/test/theme/TestPhase.java
trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java
trunk/theme/src/main/org/jboss/portal/test/theme/model/RegionObject.java
trunk/theme/src/main/org/jboss/portal/test/theme/model/RenderedObject.java
trunk/theme/src/main/org/jboss/portal/test/theme/model/WindowObject.java
trunk/theme/src/main/org/jboss/portal/test/theme/render/TestDecorationRenderer.java
trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRegionRenderer.java
trunk/theme/src/main/org/jboss/portal/test/theme/render/TestWindowRenderer.java
trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java
trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml
trunk/theme/src/resources/test/theme-test-war/layouts/generic/index.jsp
trunk/theme/src/resources/test/theme-test-war/themes/style.css
Log:
started test case for DnD
Modified:
trunk/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestConversation.java
===================================================================
---
trunk/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestConversation.java 2007-04-22
17:39:33 UTC (rev 7021)
+++
trunk/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestConversation.java 2007-04-22
22:48:41 UTC (rev 7022)
@@ -30,9 +30,11 @@
import org.jboss.portal.test.framework.driver.web.response.PerformClickResponse;
import org.jboss.portal.test.framework.driver.web.response.WebDriverResponseContext;
import org.jboss.portal.test.framework.driver.web.response.GetPageResponse;
+import org.jboss.portal.test.framework.driver.web.response.DnDResponse;
import org.jboss.portal.test.framework.driver.web.command.PerformClickCommand;
import org.jboss.portal.test.framework.driver.web.command.WebDriverCommandContext;
import org.jboss.portal.test.framework.driver.web.command.GetPageCommand;
+import org.jboss.portal.test.framework.driver.web.command.DnDCommand;
import org.jboss.portal.test.framework.server.Node;
import org.jboss.portal.common.test.driver.DriverCommand;
import org.jboss.portal.common.test.driver.DriverResponse;
@@ -112,6 +114,21 @@
selenium.open(uri);
selenium.waitForPageToLoad("5000");
}
+ else if (command instanceof DnDCommand)
+ {
+ DnDCommand dnd = (DnDCommand)command;
+ String fromId = dnd.getFromId();
+ int deltaX = dnd.getDeltaX();
+ int deltaY = dnd.getDeltaY();
+ String move = (deltaX > 0 ? ("+" + deltaX) :
Integer.toString(deltaX)) + "," + (deltaY > 0 ? ("+" + deltaY) :
Integer.toString(deltaY));
+ log.info("# DnD : " + node + " : " + fromId + "
-> (" + move + ")");
+ requestCount++;
+ pushContext();
+ Selenium selenium = driver.getSelenium();
+ selenium.dragAndDrop(fromId, move);
+ Thread.sleep(5000);
+// selenium.waitForPageToLoad("50000");
+ }
//
TestContext ctx = popContext();
@@ -135,6 +152,11 @@
GetPageResponse getPage = (GetPageResponse)response;
return new GetPageCommand(getPage.getURI());
}
+ else if (response instanceof DnDResponse)
+ {
+ DnDResponse dnd = (DnDResponse)response;
+ return new DnDCommand(dnd.getFromId(), dnd.getDeltaX(), dnd.getDeltaY());
+ }
else
{
if (response instanceof EndTestResponse)
Added:
trunk/test/src/main/org/jboss/portal/test/framework/driver/web/command/DnDCommand.java
===================================================================
---
trunk/test/src/main/org/jboss/portal/test/framework/driver/web/command/DnDCommand.java
(rev 0)
+++
trunk/test/src/main/org/jboss/portal/test/framework/driver/web/command/DnDCommand.java 2007-04-22
22:48:41 UTC (rev 7022)
@@ -0,0 +1,62 @@
+/******************************************************************************
+ * 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.framework.driver.web.command;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class DnDCommand extends WebDriverCommand
+{
+
+ /** . */
+ private final String fromId;
+
+ /** . */
+ private final int deltaX;
+
+ /** . */
+ private final int deltaY;
+
+ public DnDCommand(String fromId, int deltaX, int deltaY)
+ {
+ this.fromId = fromId;
+ this.deltaX = deltaX;
+ this.deltaY = deltaY;
+ }
+
+ public String getFromId()
+ {
+ return fromId;
+ }
+
+ public int getDeltaX()
+ {
+ return deltaX;
+ }
+
+ public int getDeltaY()
+ {
+ return deltaY;
+ }
+}
Added:
trunk/test/src/main/org/jboss/portal/test/framework/driver/web/response/DnDResponse.java
===================================================================
---
trunk/test/src/main/org/jboss/portal/test/framework/driver/web/response/DnDResponse.java
(rev 0)
+++
trunk/test/src/main/org/jboss/portal/test/framework/driver/web/response/DnDResponse.java 2007-04-22
22:48:41 UTC (rev 7022)
@@ -0,0 +1,67 @@
+/******************************************************************************
+ * 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.framework.driver.web.response;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class DnDResponse extends WebDriverResponse
+{
+
+ /** . */
+ private final String fromId;
+
+ /** . */
+ private final int deltaX;
+
+ /** . */
+ private final int deltaY;
+
+ public DnDResponse(String fromId, int deltaX, int deltaY)
+ {
+ this.fromId = fromId;
+ this.deltaX = deltaX;
+ this.deltaY = deltaY;
+ }
+
+ public String getFromId()
+ {
+ return fromId;
+ }
+
+ public int getDeltaX()
+ {
+ return deltaX;
+ }
+
+ public int getDeltaY()
+ {
+ return deltaY;
+ }
+
+ public String toString()
+ {
+ return "DnD[fromId=" + fromId + ",deltaX=" + deltaX +
",deltaY=" + deltaY + "]";
+ }
+}
Modified: trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js
===================================================================
--- trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-22 17:39:33 UTC (rev 7021)
+++ trunk/theme/src/bin/portal-ajax-war/dyna/dyna.js 2007-04-22 22:48:41 UTC (rev 7022)
@@ -1,6 +1,6 @@
function sendData(action, windowId, fromPos, fromRegionId, toPos, toRegionId) {
var options = {
- requestHeaders: ["ajax","true"],
+ requestHeaders:
["ajax","true","bilto","toto"],
method: "post",
postBody: "action=" + action + "&windowId=" + windowId +
"&fromPos=" + fromPos + "&fromRegion=" + fromRegionId +
"&toPos=" + toPos + "&toRegion=" + toRegionId,
onSuccess: function(t)
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestInfoServlet.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/TestInfoServlet.java 2007-04-22
17:39:33 UTC (rev 7021)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/TestInfoServlet.java 2007-04-22
22:48:41 UTC (rev 7022)
@@ -22,10 +22,21 @@
******************************************************************************/
package org.jboss.portal.test.theme;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.portal.common.test.driver.TestDriverContainer;
+import org.jboss.portal.common.test.driver.TestDriver;
+import org.jboss.portal.common.test.driver.command.StartTestCommand;
+import org.jboss.portal.common.test.TestParametrization;
+import org.jboss.portal.test.framework.driver.remote.RemoteTestDriver;
+import org.jboss.portal.test.framework.driver.remote.TestContext;
+
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
import java.io.IOException;
/** @author <a href="mailto:roy@jboss.org">Roy Russo</a> */
@@ -33,12 +44,8 @@
public class TestInfoServlet extends HttpServlet
{
- /** . */
- private boolean selenium;
-
protected void service(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException
{
-// selenium = "true".equals(cfg.getInitParameter("selenium"));
try
{
proceed(request, response);
@@ -51,7 +58,17 @@
public void proceed(HttpServletRequest request, HttpServletResponse response) throws
Exception
{
-// String pathInfo = request.getPathInfo();
+ String pathInfo = request.getPathInfo();
+
+ //
+ MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
+ TestDriverContainer testServer =
(TestDriverContainer)MBeanProxy.get(TestDriverContainer.class, new
ObjectName("portal.test:service=TestDriverServer"), mbeanServer);
+
+ //
+ RemoteTestDriver driver =
(RemoteTestDriver)testServer.getDriver(pathInfo.substring(1));
+ driver.invoke("", new StartTestCommand(new TestParametrization()));
+ driver.pushContext("", new TestContext(0, null, new
TestParametrization()));
+
//
// //
// if (pathInfo.startsWith("/testsuite"))
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestPhase.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/TestPhase.java 2007-04-22 17:39:33
UTC (rev 7021)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/TestPhase.java 2007-04-22 22:48:41
UTC (rev 7022)
@@ -36,6 +36,9 @@
public static final int RENDER_LIFE_CYCLE = 1;
/** . */
+ public static final int AJAX_LIFE_CYCLE = 2;
+
+ /** . */
private int count;
/** . */
@@ -90,4 +93,9 @@
{
return new TestPhase(count, RENDER_LIFE_CYCLE);
}
+
+ public static TestPhase createAjax(int count)
+ {
+ return new TestPhase(count, AJAX_LIFE_CYCLE);
+ }
}
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-04-22 17:39:33
UTC (rev 7021)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/TestServlet.java 2007-04-22 22:48:41
UTC (rev 7022)
@@ -27,6 +27,7 @@
import org.jboss.portal.common.test.driver.TestDriverContainer;
import org.jboss.portal.test.theme.model.WindowObject;
import
org.jboss.portal.test.theme.dyna.tests.refresh.FormGetRefreshIsNotPartialWindowTest;
+import org.jboss.portal.test.theme.dyna.tests.dnd.DnDTest;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -75,15 +76,17 @@
// addTest(new FormPartialRefreshWindowTest("H", null, Boolean.FALSE,
false));
// addTest(new FormPartialRefreshWindowTest("I", null, null, false));
- addTest(new FormGetRefreshIsNotPartialWindowTest("A", Boolean.TRUE,
Boolean.TRUE));
- addTest(new FormGetRefreshIsNotPartialWindowTest("B", Boolean.TRUE,
Boolean.FALSE));
- addTest(new FormGetRefreshIsNotPartialWindowTest("C", Boolean.TRUE,
null));
- addTest(new FormGetRefreshIsNotPartialWindowTest("D", Boolean.FALSE,
Boolean.TRUE));
- addTest(new FormGetRefreshIsNotPartialWindowTest("E", Boolean.FALSE,
Boolean.FALSE));
- addTest(new FormGetRefreshIsNotPartialWindowTest("F", Boolean.FALSE,
null));
- addTest(new FormGetRefreshIsNotPartialWindowTest("G", null,
Boolean.TRUE));
- addTest(new FormGetRefreshIsNotPartialWindowTest("H", null,
Boolean.FALSE));
- addTest(new FormGetRefreshIsNotPartialWindowTest("I", null, null));
+// addTest(new FormGetRefreshIsNotPartialWindowTest("A", Boolean.TRUE,
Boolean.TRUE));
+// addTest(new FormGetRefreshIsNotPartialWindowTest("B", Boolean.TRUE,
Boolean.FALSE));
+// addTest(new FormGetRefreshIsNotPartialWindowTest("C", Boolean.TRUE,
null));
+// addTest(new FormGetRefreshIsNotPartialWindowTest("D", Boolean.FALSE,
Boolean.TRUE));
+// addTest(new FormGetRefreshIsNotPartialWindowTest("E", Boolean.FALSE,
Boolean.FALSE));
+// addTest(new FormGetRefreshIsNotPartialWindowTest("F", Boolean.FALSE,
null));
+// addTest(new FormGetRefreshIsNotPartialWindowTest("G", null,
Boolean.TRUE));
+// addTest(new FormGetRefreshIsNotPartialWindowTest("H", null,
Boolean.FALSE));
+// addTest(new FormGetRefreshIsNotPartialWindowTest("I", null, null));
+
+ addTest(new DnDTest("A"));
}
catch (Exception e)
{
@@ -124,6 +127,12 @@
RequestContext requestContext = new RequestContext(window, phase, request,
response);
testContext.invoke(requestContext);
}
+ else if ("/ajax".equals(pathInfo))
+ {
+ TestPhase phase = TestPhase.createAjax(testContext.getRequestCount());
+ RequestContext requestContext = new RequestContext(null, phase, request,
response);
+ testContext.invoke(requestContext);
+ }
}
//
Added: trunk/theme/src/main/org/jboss/portal/test/theme/dyna/tests/dnd/DnDTest.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/dyna/tests/dnd/DnDTest.java
(rev 0)
+++
trunk/theme/src/main/org/jboss/portal/test/theme/dyna/tests/dnd/DnDTest.java 2007-04-22
22:48:41 UTC (rev 7022)
@@ -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.theme.dyna.tests.dnd;
+
+import org.jboss.portal.test.theme.DynaTest;
+import org.jboss.portal.test.theme.DynaTestContext;
+import org.jboss.portal.test.theme.RequestContext;
+import org.jboss.portal.test.theme.TestPhase;
+import org.jboss.portal.test.theme.model.PageObject;
+import org.jboss.portal.test.theme.model.RegionObject;
+import org.jboss.portal.test.theme.model.WindowObject;
+import org.jboss.portal.test.framework.driver.web.response.DnDResponse;
+import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions;
+import org.jboss.portal.common.test.driver.response.EndTestResponse;
+import org.jboss.portal.common.test.driver.DriverResponse;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class DnDTest extends DynaTest
+{
+
+ /** . */
+ private DynaTestContext dynaTestContext;
+
+ public DnDTest(String id)
+ {
+ super(id);
+ }
+
+ public void init(DynaTestContext dynaTestContext)
+ {
+ PageObject page = dynaTestContext.getPage();
+ page.setRenderOptions(DynaRenderOptions.getOptions(Boolean.TRUE, Boolean.FALSE));
+
+ //
+ RegionObject regionA = page.createRegion("RegionB");
+ regionA.setRenderOptions(DynaRenderOptions.getOptions(Boolean.TRUE,
Boolean.FALSE));
+
+ //
+ WindowObject window0 = regionA.addWindow("0");
+ window0.setRenderOptions(DynaRenderOptions.getOptions(Boolean.TRUE,
Boolean.FALSE));
+
+ //
+ this.dynaTestContext = dynaTestContext;
+ }
+
+ public DriverResponse invoke(RequestContext requestContext)
+ {
+ TestPhase phase = requestContext.getPhase();
+ if (phase.getLifeCycle() == TestPhase.RENDER_LIFE_CYCLE)
+ {
+ switch(phase.getCount())
+ {
+ case 0:
+ return new DnDResponse("test.decoration.0", 0, -40);
+ default:
+ fail();
+ }
+ }
+ else if (phase.getLifeCycle() == TestPhase.AJAX_LIFE_CYCLE)
+ {
+ switch(phase.getCount())
+ {
+ case 1:
+
+ String windowId = requestContext.getParameter("windowId");
+ String fromRegion = requestContext.getParameter("fromRegion");
+ String toRegion = requestContext.getParameter("toRegion");
+
+ System.out.println("windowId = " + windowId);
+ System.out.println("fromRegion = " + fromRegion);
+ System.out.println("toRegion = " + toRegion);
+
+ return new EndTestResponse();
+ default:
+ fail();
+ }
+ }
+ else
+ {
+ switch(phase.getCount())
+ {
+ default:
+ fail();
+ }
+ }
+
+ //
+ return new EndTestResponse();
+ }
+}
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/model/RegionObject.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/model/RegionObject.java 2007-04-22
17:39:33 UTC (rev 7021)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/model/RegionObject.java 2007-04-22
22:48:41 UTC (rev 7022)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.test.theme.model;
-import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions;
import org.jboss.portal.theme.render.renderer.RegionRendererContext;
import org.jboss.portal.theme.Orientation;
import org.jboss.portal.common.NotYetImplemented;
@@ -61,16 +60,6 @@
return id;
}
- public DynaRenderOptions getRenderOptions()
- {
- return DynaRenderOptions.getOptions(properties);
- }
-
- public void setRenderOptions(DynaRenderOptions renderOptions)
- {
- renderOptions.setOptions(properties);
- }
-
public WindowObject getWindow(String id)
{
if (id == null)
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/model/RenderedObject.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/model/RenderedObject.java 2007-04-22
17:39:33 UTC (rev 7021)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/model/RenderedObject.java 2007-04-22
22:48:41 UTC (rev 7022)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.portal.test.theme.model;
+import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions;
+
import java.util.Map;
import java.util.HashMap;
import java.util.Collections;
@@ -55,4 +57,14 @@
{
return Collections.unmodifiableMap(properties);
}
+
+ public DynaRenderOptions getRenderOptions()
+ {
+ return DynaRenderOptions.getOptions(properties);
+ }
+
+ public void setRenderOptions(DynaRenderOptions renderOptions)
+ {
+ renderOptions.setOptions(properties);
+ }
}
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/model/WindowObject.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/model/WindowObject.java 2007-04-22
17:39:33 UTC (rev 7021)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/model/WindowObject.java 2007-04-22
22:48:41 UTC (rev 7022)
@@ -97,16 +97,6 @@
this.title = title;
}
- public DynaRenderOptions getRenderOptions()
- {
- return DynaRenderOptions.getOptions(properties);
- }
-
- public void setRenderOptions(DynaRenderOptions renderOptions)
- {
- renderOptions.setOptions(properties);
- }
-
public WindowRendererContext getRendererContext()
{
return rendererContext;
Modified:
trunk/theme/src/main/org/jboss/portal/test/theme/render/TestDecorationRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/test/theme/render/TestDecorationRenderer.java 2007-04-22
17:39:33 UTC (rev 7021)
+++
trunk/theme/src/main/org/jboss/portal/test/theme/render/TestDecorationRenderer.java 2007-04-22
22:48:41 UTC (rev 7022)
@@ -38,7 +38,8 @@
{
public void render(RendererContext rendererContext, DecorationRendererContext drc)
throws RenderException
{
+ String windowId = (String)rendererContext.getAttribute("test.windowId");
PrintWriter writer = rendererContext.getWriter();
- writer.print("<div
class=\"test-decoration\">Decoration</div>");
+ writer.print("<div id=\"test.decoration." + windowId +
"\" class=\"test-decoration\">Decoration</div>");
}
}
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRegionRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRegionRenderer.java 2007-04-22
17:39:33 UTC (rev 7021)
+++
trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRegionRenderer.java 2007-04-22
22:48:41 UTC (rev 7022)
@@ -42,7 +42,7 @@
public void renderHeader(RendererContext rendererContext, RegionRendererContext rrc)
throws RenderException
{
PrintWriter writer = rendererContext.getWriter();
- writer.print("<div class=\"test-region\">");
+ writer.print("<div id=\"test.region." + rrc.getId() +
"\" class=\"test-region\">");
}
public void renderFooter(RendererContext rendererContext, RegionRendererContext rrc)
throws RenderException
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestWindowRenderer.java
===================================================================
---
trunk/theme/src/main/org/jboss/portal/test/theme/render/TestWindowRenderer.java 2007-04-22
17:39:33 UTC (rev 7021)
+++
trunk/theme/src/main/org/jboss/portal/test/theme/render/TestWindowRenderer.java 2007-04-22
22:48:41 UTC (rev 7022)
@@ -39,7 +39,12 @@
{
PrintWriter writer = rendererContext.getWriter();
writer.print("<div class=\"test-window\">\n");
+
+ rendererContext.setAttribute("test.windowId", wrc.getId());
rendererContext.render(wrc.getDecoration());
+ rendererContext.setAttribute("test.windowId", null);
+
+ //
rendererContext.render(wrc.getPortlet());
writer.print("\n</div>\n");
}
Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java 2007-04-22
17:39:33 UTC (rev 7021)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java 2007-04-22
22:48:41 UTC (rev 7022)
@@ -85,9 +85,13 @@
PortalTheme theme = themeContext.getTheme();
- //
+ // Hard code here for now
+ // todo remove that hack
String jsBase = rendererContext.getProperty(DynaConstants.RESOURCE_BASE_URL);
- out.print("<link rel=\"stylesheet\" id=\"dyna_css\"
href=\"" + jsBase + "/style.css\"
type=\"text/css\"/>\n");
+ if (jsBase != null)
+ {
+ out.print("<link rel=\"stylesheet\" id=\"dyna_css\"
href=\"" + jsBase + "/style.css\"
type=\"text/css\"/>\n");
+ }
// If no theme provided we use what may be on the tag
if (theme == null && themeName != null && themeName.length() >
0)
Modified: trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml 2007-04-22 17:39:33 UTC
(rev 7021)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml 2007-04-22 22:48:41 UTC
(rev 7022)
@@ -40,33 +40,13 @@
<load-on-startup>0</load-on-startup>
</servlet>
- <servlet>
- <servlet-name>SeleniumServlet</servlet-name>
-
<servlet-class>org.jboss.portal.test.theme.TestInfoServlet</servlet-class>
- <init-param>
- <param-name>selenium</param-name>
- <param-value>true</param-value>
- </init-param>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
- <url-pattern>/test/invoke/*</url-pattern>
+ <url-pattern>/selenium/invoke/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>TestInfoServlet</servlet-name>
- <url-pattern>/test/*</url-pattern>
+ <url-pattern>/selenium/info/*</url-pattern>
</servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>TestServlet</servlet-name>
- <url-pattern>/selenium/invoke/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>SeleniumServlet</servlet-name>
- <url-pattern>/selenium/*</url-pattern>
- </servlet-mapping>
</web-app>
Modified: trunk/theme/src/resources/test/theme-test-war/layouts/generic/index.jsp
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/layouts/generic/index.jsp 2007-04-22
17:39:33 UTC (rev 7021)
+++ trunk/theme/src/resources/test/theme-test-war/layouts/generic/index.jsp 2007-04-22
22:48:41 UTC (rev 7022)
@@ -9,7 +9,6 @@
</head>
<body>
<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
-<p:region regionName='TestContextRegion'
regionID='TestContextRegion'/>
<p:region regionName='RegionA' regionID='regionA'/>
<p:region regionName='RegionB' regionID='regionB'/>
<p:region regionName='RegionC' regionID='regionC'/>
Modified: trunk/theme/src/resources/test/theme-test-war/themes/style.css
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/themes/style.css 2007-04-22 17:39:33 UTC
(rev 7021)
+++ trunk/theme/src/resources/test/theme-test-war/themes/style.css 2007-04-22 22:48:41 UTC
(rev 7022)
@@ -30,4 +30,8 @@
div.dyna-handle:hover {
cursor:move;
+}
+
+div.dyna-region {
+ background-color:cyan;
}
\ No newline at end of file