Author: julien(a)jboss.com Date: 2006-12-10 16:28:02 -0500 (Sun, 10 Dec 2006) New Revision: 5786 Modified: branches/JBoss_Portal_Branch_2_4/portlet/build.xml branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/TestAction.java branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/MutableValue.java branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java Log: minor tweaks in portlet session replication tests Modified: branches/JBoss_Portal_Branch_2_4/portlet/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_4/portlet/build.xml 2006-12-10 16:50:16 UTC (rev 5785) +++ branches/JBoss_Portal_Branch_2_4/portlet/build.xml 2006-12-10 21:28:02 UTC (rev 5786) @@ -594,7 +594,7 @@ </x-sysproperty> <x-test> <test todir="${test.reports}" name="org.jboss.portal.test.portlet.ha.session.ReplicateMutableValueTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.portlet.ha.session.ReplicateMutableValueTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.portlet.ha.session.ReplicateImmutableValueTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.portlet.ha.session.ModifyExistingAttributeWithoutExplicitSetDoesNotReplicateTestCase"/> </x-test> <x-classpath> Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java 2006-12-10 16:50:16 UTC (rev 5785) +++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java 2006-12-10 21:28:02 UTC (rev 5786) @@ -38,19 +38,18 @@ */ public abstract class PortletActionTestAction extends TestAction { - - public Result execute(Portlet servlet, ActionRequest request, ActionResponse response) + public Result execute(Portlet portlet, ActionRequest request, ActionResponse response) { try { - return run(servlet, request, response); + return run(portlet, request, response); } catch (Throwable t) { + log.error("An error occured in the portlet action", t); return decode(t); } } protected abstract AssertResult run(Portlet portlet, ActionRequest request, ActionResponse response) throws PortletException, PortletSecurityException, IOException; - } Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java 2006-12-10 16:50:16 UTC (rev 5785) +++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java 2006-12-10 21:28:02 UTC (rev 5786) @@ -37,15 +37,15 @@ */ public abstract class PortletRenderTestAction extends TestAction { - - public Result execute(Portlet servlet, RenderRequest request, RenderResponse response) + public Result execute(Portlet portlet, RenderRequest request, RenderResponse response) { try { - return run(servlet, request, response); + return run(portlet, request, response); } catch (Throwable t) { + log.error("An error occured in the portlet render", t); return decode(t); } } Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java 2006-12-10 16:50:16 UTC (rev 5785) +++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java 2006-12-10 21:28:02 UTC (rev 5786) @@ -38,24 +38,18 @@ */ public abstract class ServletServiceTestAction extends TestAction { - protected abstract Result run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException; - public Result execute(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { try { return run(servlet, request, response); } - catch (AssertionFailedError afe) + catch (Throwable t) { - //AssertResult.log.error("Failure during test", afe); - return new AssertResult(afe); + log.error("An error occured in the servlet", t); + return decode(t); } - catch (Throwable e) - { - //AssertResult.log.error("Error during test", e); - return new AssertResult(e); - } } + protected abstract Result run(Servlet servlet, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException; } Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/TestAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/TestAction.java 2006-12-10 16:50:16 UTC (rev 5785) +++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/TestAction.java 2006-12-10 21:28:02 UTC (rev 5786) @@ -26,6 +26,7 @@ import org.jboss.portal.test.framework.container.result.AssertResult; import org.jboss.portal.test.framework.container.result.Result; import org.jboss.portal.test.framework.junit.ExtendedAssert; +import org.apache.log4j.Logger; /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> @@ -34,6 +35,9 @@ public abstract class TestAction extends ExtendedAssert { + /** The logger. */ + protected final Logger log = Logger.getLogger(getClass()); + protected Result decode(Throwable t) { for (Throwable u = t; u != null; u = u.getCause()) Modified: branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/MutableValue.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/MutableValue.java 2006-12-10 16:50:16 UTC (rev 5785) +++ branches/JBoss_Portal_Branch_2_4/portlet/src/main/org/jboss/portal/test/portlet/ha/session/MutableValue.java 2006-12-10 21:28:02 UTC (rev 5786) @@ -74,4 +74,9 @@ string = in.readUTF(); System.out.print("Unserializing " + string); } + + public String toString() + { + return "MutableValue[" + string + "]"; + } } Modified: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java 2006-12-10 16:50:16 UTC (rev 5785) +++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java 2006-12-10 21:28:02 UTC (rev 5786) @@ -309,7 +309,7 @@ } } - public int executeMethod(HttpMethod method) throws Exception + public void executeMethod(HttpMethod method) throws Exception { int port = method.getURI().getPort(); if (port != -1) @@ -343,8 +343,11 @@ // log.info("# Invoking test case over http " + cfg + " " + method.getURI()); - // - return client.executeMethod(cfg, method); + // Execute http method + client.executeMethod(cfg, method); + + // Force a read of the response body + method.getResponseBody(); } private Node getNode(int port)