[portal-commits] JBoss Portal SVN: r6814 - in trunk: portlet-server and 1 other directory.
Author: julien(a)jboss.com
Date: 2007-03-23 21:24:32 -0400 (Fri, 23 Mar 2007)
New Revision: 6814
Modified:
trunk/portlet-server/build.xml
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java
Log:
make jsr168 test execute
Modified:
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java
===================================================================
---
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2007-03-24
01:11:33 UTC (rev 6813)
+++
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2007-03-24
01:24:32 UTC (rev 6814)
@@ -23,6 +23,7 @@
package org.jboss.portal.test.framework.portlet;
import org.jboss.portal.common.test.driver.DriverResponse;
+import org.jboss.portal.common.test.TestParameterValue;
import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.server.NodeId;
@@ -40,6 +41,10 @@
public PortletTestContext(HttpTestContext httpTestContext)
{
+ if (httpTestContext == null)
+ {
+ throw new IllegalArgumentException("No http test context to wrap");
+ }
this.httpTestContext = httpTestContext;
}
@@ -69,6 +74,7 @@
{
throw new IllegalArgumentException();
}
- return
(String)httpTestContext.getParametrization().getParameterValue(parameterName).get();
+ TestParameterValue parameterValue =
httpTestContext.getParametrization().getParameterValue(parameterName);
+ return parameterValue != null ? (String)parameterValue.get() : null;
}
}
Modified: trunk/portlet-server/build.xml
===================================================================
--- trunk/portlet-server/build.xml 2007-03-24 01:11:33 UTC (rev 6813)
+++ trunk/portlet-server/build.xml 2007-03-24 01:24:32 UTC (rev 6814)
@@ -281,9 +281,9 @@
</target>
<target name="tests" depends="init,
_buildmagic:configure:deployment">
- <!--<deploy file="${build.lib}/test.sar"
config="default"/>-->
- <!--<antcall target="test-jsr168"/>-->
- <!--<undeploy file="${build.lib}/test.sar"
config="default"/>-->
+ <deploy file="${build.lib}/test.sar" config="default"/>
+ <antcall target="test-jsr168"/>
+ <undeploy file="${build.lib}/test.sar"
config="default"/>
<antcall target="test-info"/>
</target>