[jboss-svn-commits] JBoss Portal SVN: r5551 - in trunk/portlet/src/main/org/jboss/portal/test: framework/portlet/components portlet/jsr168/tck/portletinterface/spec
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 1 11:22:01 EST 2006
Author: julien at jboss.com
Date: 2006-11-01 11:21:53 -0500 (Wed, 01 Nov 2006)
New Revision: 5551
Modified:
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
Log:
testCaseId -> testName for more coherence
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2006-11-01 16:20:37 UTC (rev 5550)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java 2006-11-01 16:21:53 UTC (rev 5551)
@@ -49,23 +49,23 @@
{
/** The test id. */
- private final String testCaseId;
+ private final String testName;
- /** Construct a test portlet with a test id computed with the method <code>getTestId(Class)</code>. */
+ /** Construct a test portlet with a test name computed with the method <code>getTestId(Class)</code>. */
public AbstractTestGenericPortlet()
{
- testCaseId = createCaseTestId(getClass());
+ testName = createTestName(getClass());
}
/** Get the test id from the class name. It can be overriden. */
- protected String createCaseTestId(Class clazz)
+ protected String createTestName(Class clazz)
{
return Tools.getShortNameOf(clazz);
}
public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentTestName(testCaseId))
+ if (HttpTestContext.isCurrentTestName(testName))
{
DriverResponse response;
try
@@ -91,7 +91,7 @@
public void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
- if (HttpTestContext.isCurrentTestName(testCaseId))
+ if (HttpTestContext.isCurrentTestName(testName))
{
DriverResponse response;
try
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2006-11-01 16:20:37 UTC (rev 5550)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java 2006-11-01 16:21:53 UTC (rev 5551)
@@ -26,7 +26,6 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.response.FailureResponse;
import org.jboss.portal.common.test.driver.response.ErrorResponse;
-import org.jboss.portal.common.test.driver.response.EndTestResponse;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -50,7 +49,7 @@
{
/** The test id. */
- private final String testCaseId;
+ private final String testName;
/** To keep PortletConfig for some tests* */
private PortletConfig config;
@@ -58,7 +57,7 @@
/** Construct a test portlet with a test id computed with the method <code>getTestId(Class)</code>. */
public AbstractTestPortlet()
{
- testCaseId = createCaseTestId(getClass());
+ testName = createTestName(getClass());
}
/**
@@ -74,7 +73,7 @@
}
//
- this.testCaseId = testCaseId;
+ this.testName = testCaseId;
}
public void init(PortletConfig config) throws PortletException
@@ -104,7 +103,7 @@
public final void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
{
- if (HttpTestContext.isCurrentTestName(testCaseId))
+ if (HttpTestContext.isCurrentTestName(testName))
{
DriverResponse response;
try
@@ -130,7 +129,7 @@
public final void render(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
{
- if (HttpTestContext.isCurrentTestName(testCaseId))
+ if (HttpTestContext.isCurrentTestName(testName))
{
DriverResponse response;
try
@@ -165,7 +164,7 @@
}
/** Get the test id from the class name. It can be overriden. */
- protected String createCaseTestId(Class clazz)
+ protected String createTestName(Class clazz)
{
String s = clazz.getName();
int index = s.lastIndexOf('.');
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2006-11-01 16:20:37 UTC (rev 5550)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2006-11-01 16:21:53 UTC (rev 5551)
@@ -54,7 +54,7 @@
public class ExceptionsDuringRequestHandlingControllerPortlet extends AbstractTestPortlet
{
//we override this to force 3 Portlets to have same test id
- protected String createCaseTestId(Class clazz)
+ protected String createTestName(Class clazz)
{
return "ExceptionsDuringRequestHandlingPortlet";
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2006-11-01 16:20:37 UTC (rev 5550)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2006-11-01 16:21:53 UTC (rev 5551)
@@ -52,7 +52,7 @@
public static String actionURL = "";
// We override this to force 3 Portlets to have same test id
- protected String createCaseTestId(Class clazz)
+ protected String createTestName(Class clazz)
{
return "ExceptionsDuringRequestHandlingPortlet";
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2006-11-01 16:20:37 UTC (rev 5550)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2006-11-01 16:21:53 UTC (rev 5551)
@@ -54,7 +54,7 @@
public static String actionURL = "";
//we override this to force 3 Portlets to have same test id
- protected String createCaseTestId(Class clazz)
+ protected String createTestName(Class clazz)
{
return "ExceptionsDuringRequestHandlingPortlet";
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2006-11-01 16:20:37 UTC (rev 5550)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2006-11-01 16:21:53 UTC (rev 5551)
@@ -29,7 +29,6 @@
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -53,7 +52,7 @@
public static String actionURL = "";
// We override this to force 3 Portlets to have same test id
- protected String createCaseTestId(Class clazz)
+ protected String createTestName(Class clazz)
{
return "ExceptionsDuringRequestHandlingPortlet";
}
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2006-11-01 16:20:37 UTC (rev 5550)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2006-11-01 16:21:53 UTC (rev 5551)
@@ -47,7 +47,7 @@
public static boolean destroyed;
//we override this to force 3 Portlets to have same test id
- protected String createCaseTestId(Class clazz)
+ protected String createTestName(Class clazz)
{
return "ExceptionsDuringRequestHandlingPortlet";
}
More information about the jboss-svn-commits
mailing list