[portal-commits] JBoss Portal SVN: r8837 - in modules/portlet/trunk/portlet/src/main/org/jboss/portal: test/portlet/jsr168/tck/dispatcher and 12 other directories.

portal-commits at lists.jboss.org portal-commits at lists.jboss.org
Wed Nov 7 10:15:09 EST 2007


Author: julien at jboss.com
Date: 2007-11-07 10:15:08 -0500 (Wed, 07 Nov 2007)
New Revision: 8837

Added:
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/Assertion.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TestCase.java
Removed:
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TCKAssertion.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TCK.java
Modified:
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatchedRequestTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ErrorHandlingTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/GETMethodTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestAttributesTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestParametersTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ObtainingDispatcherTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/QueryStringInRequestDispatcherTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesNotInResourceBundleTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesWithNoResourceBundleDefinedTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/AccessSameSetOfResourcesTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/ContextAttributesTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/InitializationParametersTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/TempDirTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsOnInitTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InitializeBeforeHandleTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeActionFirstTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterActionURLTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterRenderURLTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/SendRedirectDuringActionTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/NotInvokeModeDeclaredForNotSupportedMarkupTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModeTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRenderParametersTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRequestParametersNotPropagatedTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/AuthTypeTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContentTypeTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContextPathTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ObtainingInputStreamAndReaderTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParameterAccessMethodTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParametersDuringRenderNotTargetedTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferResetTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferSizeTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/GetContentTypeTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/IllegalStateExceptionAfterSendRedirectTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NamespaceEncodingTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotAllowedModeTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotSupportedWindowStateTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/OutputStreamOrWriterTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/ParametersSetAfterSendRedirectTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/RenderParametersTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectAfterChangeStateMethodsTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectWithRelativeURLTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetContentTypeBeforeOutputStreamOrWriterTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetNotSupportedContentTypeTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/StateChangesAfterRedirectionSendTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionInvalidatesPortletSessionTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionRelationsTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionInvalidatesHTTPSessionTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionAttributesTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionCreateTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionInvalidationTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLParametersTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedModeTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedStateTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/RenderURLNotInvokeActionTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/SecurityLevelTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CanModifyNonReadOnlyPreferenceTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ChangesMadeButNotStoredAreDiscardedTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CreateASingleInstanceOfValidatorTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/DynamicPreferenceTreatedLikeModifiablePreferenceTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/InvalidationCancelsStoreTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesCanBeSetToNullTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ReadOnlyPreferenceCannotBeModifiedTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ResetPreferenceHavingNoDefaultValueDeletesItTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ValidationStoresTestCase.java
   modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/CustomStateNotMappedNotInvokedTestCase.java
Log:
- make TCK and TCKAssertion more generic as TestCase and Assertion in order to reuse them for the API and EXT test cases

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.common.net.URLNavigator;
 import org.jboss.portal.common.net.URLVisitor;
 import org.jboss.portal.common.net.URLFilter;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
@@ -129,18 +129,18 @@
             {
                for (Class clazz : getClasses(event.getServletContext()))
                {
-                  TCK tck = ((AnnotatedElement)clazz).getAnnotation(TCK.class);
+                  TestCase tck = ((AnnotatedElement)clazz).getAnnotation(TestCase.class);
 
                   //
                   boolean active = true;
                   if (tck != null)
                   {
-                     for (TCKAssertion assertion : tck.value())
+                     for (Assertion assertion : tck.value())
                      {
-                        if (assertion.getStatus() instanceof TCKAssertion.Inactive)
+                        if (assertion.getStatus() instanceof Assertion.Inactive)
                         {
                            active = false;
-                           log.error("Skip test case " + clazz.getName() + " because the assertion " + assertion.getId() + " is not enabled");
+                           log.error("Skip test case " + clazz.getName() + " because the assertion " + assertion.getRef() + " is not enabled");
                         }
                      }
                   }

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatchedRequestTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatchedRequestTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatchedRequestTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -29,8 +29,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNotNull;
@@ -51,7 +51,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_124,TCKAssertion.JSR168_125})
+ at TestCase({Assertion.JSR168_124, Assertion.JSR168_125})
 public class DispatchedRequestTestCase
 {
    public DispatchedRequestTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ErrorHandlingTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ErrorHandlingTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ErrorHandlingTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -29,8 +29,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNotNull;
@@ -52,7 +52,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_142,TCKAssertion.JSR168_143})
+ at TestCase({Assertion.JSR168_142, Assertion.JSR168_143})
 public class ErrorHandlingTestCase
 {
 

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/GETMethodTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/GETMethodTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/GETMethodTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -29,8 +29,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNotNull;
@@ -51,7 +51,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_126})
+ at TestCase({Assertion.JSR168_126})
 public class GETMethodTestCase
 {
 

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestAttributesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestAttributesTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestAttributesTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -29,8 +29,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNotNull;
@@ -51,7 +51,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_128})
+ at TestCase({Assertion.JSR168_128})
 public class IncludedRequestAttributesTestCase
 {
    public IncludedRequestAttributesTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestParametersTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/IncludedRequestParametersTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -29,8 +29,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNotNull;
@@ -52,7 +52,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_127})
+ at TestCase({Assertion.JSR168_127})
 public class IncludedRequestParametersTestCase
 {
    public IncludedRequestParametersTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ObtainingDispatcherTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ObtainingDispatcherTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ObtainingDispatcherTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,13 +22,12 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
 
-import org.jboss.portal.test.framework.portlet.PortletTestDriver;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNotNull;
@@ -43,7 +42,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_121,TCKAssertion.JSR168_122})
+ at TestCase({Assertion.JSR168_121, Assertion.JSR168_122})
 public class ObtainingDispatcherTestCase
 {
    public ObtainingDispatcherTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/QueryStringInRequestDispatcherTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/QueryStringInRequestDispatcherTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/QueryStringInRequestDispatcherTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -30,8 +30,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -56,7 +56,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_123})
+ at TestCase({Assertion.JSR168_123})
 public class QueryStringInRequestDispatcherTestCase
 {
    public QueryStringInRequestDispatcherTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/RequestObjectTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -29,8 +29,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNotNull;
@@ -57,7 +57,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_129,TCKAssertion.JSR168_130,TCKAssertion.JSR168_131,TCKAssertion.JSR168_132,TCKAssertion.JSR168_133,TCKAssertion.JSR168_134,TCKAssertion.JSR168_137})
+ at TestCase({Assertion.JSR168_129, Assertion.JSR168_130, Assertion.JSR168_131, Assertion.JSR168_132, Assertion.JSR168_133, Assertion.JSR168_134, Assertion.JSR168_137})
 public class RequestObjectTestCase
 {
    public RequestObjectTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/ResponseObjectTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -29,8 +29,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNotNull;
@@ -52,7 +52,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_138,TCKAssertion.JSR168_141})
+ at TestCase({Assertion.JSR168_138, Assertion.JSR168_141})
 public class ResponseObjectTestCase
 {
    public ResponseObjectTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesNotInResourceBundleTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesNotInResourceBundleTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesNotInResourceBundleTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesNotInResourceBundlePortlet;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertEquals;
@@ -44,7 +44,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_24})
+ at TestCase({Assertion.JSR168_24})
 public class InlineValuesNotInResourceBundleTestCase
 {
    public InlineValuesNotInResourceBundleTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesWithNoResourceBundleDefinedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesWithNoResourceBundleDefinedTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/InlineValuesWithNoResourceBundleDefinedTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesWithNoResourceBundleDefinedPortlet;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.fail;
@@ -46,7 +46,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_24})
+ at TestCase({Assertion.JSR168_24})
 public class InlineValuesWithNoResourceBundleDefinedTestCase
 {
    public InlineValuesWithNoResourceBundleDefinedTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/AccessSameSetOfResourcesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/AccessSameSetOfResourcesTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/AccessSameSetOfResourcesTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -30,8 +30,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNotNull;
@@ -55,7 +55,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_45})
+ at TestCase({Assertion.JSR168_45})
 public class AccessSameSetOfResourcesTestCase
 {
    public AccessSameSetOfResourcesTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/ContextAttributesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/ContextAttributesTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/ContextAttributesTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -30,8 +30,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNotNull;
@@ -53,7 +53,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_44})
+ at TestCase({Assertion.JSR168_44})
 public class ContextAttributesTestCase
 {
    public ContextAttributesTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/InitializationParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/InitializationParametersTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/InitializationParametersTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -31,8 +31,8 @@
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
 import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNotNull;
@@ -55,7 +55,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_43})
+ at TestCase({Assertion.JSR168_43})
 public class InitializationParametersTestCase
 {
    public InitializationParametersTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/TempDirTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/TempDirTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/TempDirTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -30,8 +30,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNotNull;
@@ -53,7 +53,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_46})
+ at TestCase({Assertion.JSR168_46})
 public class TempDirTestCase
 {
    public TempDirTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -23,8 +23,8 @@
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
 
 import org.jboss.portal.test.framework.portlet.PortletTest;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 
 /**
  * This case is based on:
@@ -42,7 +42,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_17,TCKAssertion.JSR168_18,TCKAssertion.JSR168_19})
+ at TestCase({Assertion.JSR168_17, Assertion.JSR168_18, Assertion.JSR168_19})
 public class ExceptionsDuringRequestHandlingTestCase
 {
    public ExceptionsDuringRequestHandlingTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsOnInitTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsOnInitTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/ExceptionsOnInitTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -29,8 +29,8 @@
 import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.RuntimeExceptionDuringInitPortlet;
 import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.UnavailableExceptionDuringInitPortlet;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -44,7 +44,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_5,TCKAssertion.JSR168_6,TCKAssertion.JSR168_8})
+ at TestCase({Assertion.JSR168_5, Assertion.JSR168_6, Assertion.JSR168_8})
 public class ExceptionsOnInitTestCase
 {
    public ExceptionsOnInitTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InitializeBeforeHandleTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InitializeBeforeHandleTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InitializeBeforeHandleTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -26,8 +26,8 @@
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec.InitializeBeforeHandlePortlet;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertTrue;
@@ -40,7 +40,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_4})
+ at TestCase({Assertion.JSR168_4})
 public class InitializeBeforeHandleTestCase
 {
    public InitializeBeforeHandleTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeActionFirstTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeActionFirstTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeActionFirstTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -44,7 +44,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_9})
+ at TestCase({Assertion.JSR168_9})
 public class InvokeActionFirstTestCase
 {
 

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterActionURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterActionURLTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterActionURLTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -28,8 +28,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTP2;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -46,7 +46,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_10})
+ at TestCase({Assertion.JSR168_10})
 public class InvokeRenderAfterActionURLTestCase
 {
 

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterRenderURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterRenderURLTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/InvokeRenderAfterRenderURLTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTP2;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -42,7 +42,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_11})
+ at TestCase({Assertion.JSR168_11})
 public class InvokeRenderAfterRenderURLTestCase
 {
    public InvokeRenderAfterRenderURLTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/SendRedirectDuringActionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/SendRedirectDuringActionTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/SendRedirectDuringActionTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -29,8 +29,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.driver.response.FailureResponse;
@@ -54,7 +54,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_12})
+ at TestCase({Assertion.JSR168_12})
 public class SendRedirectDuringActionTestCase
 {
    public SendRedirectDuringActionTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/NotInvokeModeDeclaredForNotSupportedMarkupTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/NotInvokeModeDeclaredForNotSupportedMarkupTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/NotInvokeModeDeclaredForNotSupportedMarkupTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec.NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -45,7 +45,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK(TCKAssertion.JSR168_38)
+ at TestCase(Assertion.JSR168_38)
 public class NotInvokeModeDeclaredForNotSupportedMarkupTestCase
 {
    public NotInvokeModeDeclaredForNotSupportedMarkupTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModeTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/RequestDispatchingDependingOnModeTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -23,15 +23,14 @@
 package org.jboss.portal.test.portlet.jsr168.tck.portletmode;
 
 import org.jboss.portal.test.framework.portlet.PortletTest;
-import org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec.RequestDispatchingDependingOnModePortlet;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_36,TCKAssertion.JSR168_37})
+ at TestCase({Assertion.JSR168_36, Assertion.JSR168_37})
 public class RequestDispatchingDependingOnModeTestCase
 {
    public RequestDispatchingDependingOnModeTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRenderParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRenderParametersTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRenderParametersTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletrequests;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -45,7 +45,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK(TCKAssertion.JSR168_52)
+ at TestCase(Assertion.JSR168_52)
 public class ActionToRenderParametersTestCase
 {
    public ActionToRenderParametersTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRequestParametersNotPropagatedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRequestParametersNotPropagatedTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ActionToRequestParametersNotPropagatedTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletrequests;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -46,7 +46,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK(TCKAssertion.JSR168_50)
+ at TestCase(Assertion.JSR168_50)
 public class ActionToRequestParametersNotPropagatedTestCase
 {
    public ActionToRequestParametersNotPropagatedTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/AuthTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/AuthTypeTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/AuthTypeTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletrequests;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -45,7 +45,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK(TCKAssertion.JSR168_60)
+ at TestCase(Assertion.JSR168_60)
 public class AuthTypeTestCase
 {
    public AuthTypeTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContentTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContentTypeTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContentTypeTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletrequests;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -46,7 +46,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK(TCKAssertion.JSR168_61)
+ at TestCase(Assertion.JSR168_61)
 public class ContentTypeTestCase
 {
    public ContentTypeTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContextPathTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContextPathTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ContextPathTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletrequests;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -45,7 +45,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_58,TCKAssertion.JSR168_59})
+ at TestCase({Assertion.JSR168_58, Assertion.JSR168_59})
 public class ContextPathTestCase
 {
    public ContextPathTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ObtainingInputStreamAndReaderTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ObtainingInputStreamAndReaderTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ObtainingInputStreamAndReaderTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletrequests;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -46,7 +46,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK(TCKAssertion.JSR168_63)
+ at TestCase(Assertion.JSR168_63)
 public class ObtainingInputStreamAndReaderTestCase
 {
    public ObtainingInputStreamAndReaderTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParameterAccessMethodTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParameterAccessMethodTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParameterAccessMethodTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletrequests;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -45,7 +45,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_55,TCKAssertion.JSR168_56})
+ at TestCase({Assertion.JSR168_55, Assertion.JSR168_56})
 public class ParameterAccessMethodTestCase
 {
    public ParameterAccessMethodTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParametersDuringRenderNotTargetedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParametersDuringRenderNotTargetedTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/ParametersDuringRenderNotTargetedTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletrequests;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -44,7 +44,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_51,TCKAssertion.JSR168_54})
+ at TestCase({Assertion.JSR168_51, Assertion.JSR168_54})
 public class ParametersDuringRenderNotTargetedTestCase
 {
 

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferResetTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferResetTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferResetTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -26,8 +26,8 @@
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -43,7 +43,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_83})
+ at TestCase({Assertion.JSR168_83})
 public class BufferResetTestCase
 {
    public BufferResetTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferSizeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferSizeTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/BufferSizeTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -26,8 +26,8 @@
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertEquals;
@@ -41,7 +41,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_80,TCKAssertion.JSR168_81})
+ at TestCase({Assertion.JSR168_80, Assertion.JSR168_81})
 public class BufferSizeTestCase
 {
    public BufferSizeTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/GetContentTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/GetContentTypeTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/GetContentTypeTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -26,8 +26,8 @@
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertNull;
@@ -41,7 +41,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_78})
+ at TestCase({Assertion.JSR168_78})
 public class GetContentTypeTestCase
 {
    public GetContentTypeTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/IllegalStateExceptionAfterSendRedirectTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/IllegalStateExceptionAfterSendRedirectTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/IllegalStateExceptionAfterSendRedirectTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -29,8 +29,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS2;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.FailureResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
@@ -53,7 +53,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_71})
+ at TestCase({Assertion.JSR168_71})
 public class IllegalStateExceptionAfterSendRedirectTestCase
 {
    public IllegalStateExceptionAfterSendRedirectTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NamespaceEncodingTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NamespaceEncodingTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NamespaceEncodingTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -26,8 +26,8 @@
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertTrue;
@@ -41,7 +41,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_86,TCKAssertion.JSR168_87,TCKAssertion.JSR168_88})
+ at TestCase({Assertion.JSR168_86, Assertion.JSR168_87, Assertion.JSR168_88})
 public class NamespaceEncodingTestCase
 {
    public NamespaceEncodingTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotAllowedModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotAllowedModeTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotAllowedModeTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -47,7 +47,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_67})
+ at TestCase({Assertion.JSR168_67})
 public class NotAllowedModeTestCase
 {
    public NotAllowedModeTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotSupportedWindowStateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotSupportedWindowStateTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/NotSupportedWindowStateTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -47,7 +47,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_68})
+ at TestCase({Assertion.JSR168_68})
 public class NotSupportedWindowStateTestCase
 {
    public NotSupportedWindowStateTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/OutputStreamOrWriterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/OutputStreamOrWriterTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/OutputStreamOrWriterTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -26,8 +26,8 @@
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.fail;
@@ -43,7 +43,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_79})
+ at TestCase({Assertion.JSR168_79})
 public class OutputStreamOrWriterTestCase
 {
    public OutputStreamOrWriterTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/ParametersSetAfterSendRedirectTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/ParametersSetAfterSendRedirectTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/ParametersSetAfterSendRedirectTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -29,8 +29,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.driver.response.FailureResponse;
@@ -56,7 +56,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_74,TCKAssertion.JSR168_75})
+ at TestCase({Assertion.JSR168_74, Assertion.JSR168_75})
 public class ParametersSetAfterSendRedirectTestCase
 {
    public ParametersSetAfterSendRedirectTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/RenderParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/RenderParametersTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/RenderParametersTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -46,7 +46,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_72,TCKAssertion.JSR168_73})
+ at TestCase({Assertion.JSR168_72, Assertion.JSR168_73})
 public class RenderParametersTestCase
 {
    public RenderParametersTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectAfterChangeStateMethodsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectAfterChangeStateMethodsTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectAfterChangeStateMethodsTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -52,7 +52,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_66})
+ at TestCase({Assertion.JSR168_66})
 public class SendRedirectAfterChangeStateMethodsTestCase
 {
    public SendRedirectAfterChangeStateMethodsTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectWithRelativeURLTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectWithRelativeURLTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SendRedirectWithRelativeURLTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -46,7 +46,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_65})
+ at TestCase({Assertion.JSR168_65})
 public class SendRedirectWithRelativeURLTestCase
 {
    public SendRedirectWithRelativeURLTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetContentTypeBeforeOutputStreamOrWriterTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetContentTypeBeforeOutputStreamOrWriterTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetContentTypeBeforeOutputStreamOrWriterTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -26,8 +26,8 @@
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.fail;
@@ -42,7 +42,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_77})
+ at TestCase({Assertion.JSR168_77})
 public class SetContentTypeBeforeOutputStreamOrWriterTestCase
 {
    public SetContentTypeBeforeOutputStreamOrWriterTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetNotSupportedContentTypeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetNotSupportedContentTypeTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/SetNotSupportedContentTypeTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -26,8 +26,8 @@
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.fail;
@@ -40,7 +40,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_76})
+ at TestCase({Assertion.JSR168_76})
 public class SetNotSupportedContentTypeTestCase
 {
    public SetNotSupportedContentTypeTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/StateChangesAfterRedirectionSendTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/StateChangesAfterRedirectionSendTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/StateChangesAfterRedirectionSendTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -29,8 +29,8 @@
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTS1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.driver.response.FailureResponse;
@@ -58,7 +58,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_69,TCKAssertion.JSR168_70})
+ at TestCase({Assertion.JSR168_69, Assertion.JSR168_70})
 public class StateChangesAfterRedirectionSendTestCase
 {
    public StateChangesAfterRedirectionSendTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionInvalidatesPortletSessionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionInvalidatesPortletSessionTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionInvalidatesPortletSessionTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletsession;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
@@ -47,7 +47,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_115})
+ at TestCase({Assertion.JSR168_115})
 public class HTTPSessionInvalidatesPortletSessionTestCase
 {
    public HTTPSessionInvalidatesPortletSessionTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionRelationsTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionRelationsTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HTTPSessionRelationsTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletsession;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -49,7 +49,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_113,TCKAssertion.JSR168_114})
+ at TestCase({Assertion.JSR168_113, Assertion.JSR168_114})
 public class HTTPSessionRelationsTestCase
 {
    public HTTPSessionRelationsTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionInvalidatesHTTPSessionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionInvalidatesHTTPSessionTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionInvalidatesHTTPSessionTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletsession;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -45,7 +45,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_116})
+ at TestCase({Assertion.JSR168_116})
 public class PortletSessionInvalidatesHTTPSessionTestCase
 {
    public PortletSessionInvalidatesHTTPSessionTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionAttributesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionAttributesTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionAttributesTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletsession;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -59,7 +59,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_110,TCKAssertion.JSR168_111,TCKAssertion.JSR168_112,TCKAssertion.JSR168_117,TCKAssertion.JSR168_118,TCKAssertion.JSR168_119})
+ at TestCase({Assertion.JSR168_110, Assertion.JSR168_111, Assertion.JSR168_112, Assertion.JSR168_117, Assertion.JSR168_118, Assertion.JSR168_119})
 public class SessionAttributesTestCase
 {
    public SessionAttributesTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionCreateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionCreateTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionCreateTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,8 +22,8 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletsession;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
@@ -45,7 +45,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_106,TCKAssertion.JSR168_107})
+ at TestCase({Assertion.JSR168_106, Assertion.JSR168_107})
 public class SessionCreateTestCase
 {
    public SessionCreateTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionInvalidationTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionInvalidationTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/SessionInvalidationTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -22,15 +22,15 @@
  ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletsession;
 
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.portal.test.framework.portlet.PortletTest;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_120})
+ at TestCase({Assertion.JSR168_120})
 public class SessionInvalidationTestCase
 {
    public SessionInvalidationTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLParametersTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLParametersTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLParametersTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -48,7 +48,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_27,TCKAssertion.JSR168_28,TCKAssertion.JSR168_29})
+ at TestCase({Assertion.JSR168_27, Assertion.JSR168_28, Assertion.JSR168_29})
 public class PortletURLParametersTestCase
 {
    public PortletURLParametersTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedModeTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedModeTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -26,8 +26,8 @@
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.fail;
@@ -43,7 +43,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_32})
+ at TestCase({Assertion.JSR168_32})
 public class PortletURLWithNotSupportedModeTestCase
 {
    public PortletURLWithNotSupportedModeTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedStateTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedStateTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLWithNotSupportedStateTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -26,8 +26,8 @@
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.fail;
@@ -43,7 +43,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_34})
+ at TestCase({Assertion.JSR168_34})
 public class PortletURLWithNotSupportedStateTestCase
 {
    public PortletURLWithNotSupportedStateTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/RenderURLNotInvokeActionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/RenderURLNotInvokeActionTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/RenderURLNotInvokeActionTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -45,7 +45,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_26})
+ at TestCase({Assertion.JSR168_26})
 public class RenderURLNotInvokeActionTestCase
 {
    public RenderURLNotInvokeActionTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/SecurityLevelTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/SecurityLevelTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/SecurityLevelTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -45,7 +45,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_35})
+ at TestCase({Assertion.JSR168_35})
 public class SecurityLevelTestCase
 {
    public SecurityLevelTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CanModifyNonReadOnlyPreferenceTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CanModifyNonReadOnlyPreferenceTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CanModifyNonReadOnlyPreferenceTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -48,7 +48,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_99})
+ at TestCase({Assertion.JSR168_99})
 public class CanModifyNonReadOnlyPreferenceTestCase
 {
    public CanModifyNonReadOnlyPreferenceTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ChangesMadeButNotStoredAreDiscardedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ChangesMadeButNotStoredAreDiscardedTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ChangesMadeButNotStoredAreDiscardedTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP3;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -46,7 +46,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_96})
+ at TestCase({Assertion.JSR168_96})
 public class ChangesMadeButNotStoredAreDiscardedTestCase
 {
    public ChangesMadeButNotStoredAreDiscardedTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CreateASingleInstanceOfValidatorTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CreateASingleInstanceOfValidatorTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/CreateASingleInstanceOfValidatorTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP6;
 import org.jboss.portal.test.portlet.jsr168.tck.preferences.spec.CreateASingleInstanceOfValidatorValidator;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.assertEquals;
@@ -41,7 +41,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_101})
+ at TestCase({Assertion.JSR168_101})
 public class CreateASingleInstanceOfValidatorTestCase
 {
    public CreateASingleInstanceOfValidatorTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/DynamicPreferenceTreatedLikeModifiablePreferenceTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/DynamicPreferenceTreatedLikeModifiablePreferenceTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/DynamicPreferenceTreatedLikeModifiablePreferenceTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP4;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -48,7 +48,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_100})
+ at TestCase({Assertion.JSR168_100})
 public class DynamicPreferenceTreatedLikeModifiablePreferenceTestCase
 {
    public DynamicPreferenceTreatedLikeModifiablePreferenceTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/InvalidationCancelsStoreTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/InvalidationCancelsStoreTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/InvalidationCancelsStoreTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP7;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -49,7 +49,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_104})
+ at TestCase({Assertion.JSR168_104})
 public class InvalidationCancelsStoreTestCase
 {
    public InvalidationCancelsStoreTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesCanBeSetToNullTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesCanBeSetToNullTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesCanBeSetToNullTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP2;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -48,7 +48,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_90})
+ at TestCase({Assertion.JSR168_90})
 public class PreferencesCanBeSetToNullTestCase
 {
    public PreferencesCanBeSetToNullTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -46,7 +46,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_91})
+ at TestCase({Assertion.JSR168_91})
 public class PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase
 {
    public PreferencesMapModificationDoesNotModifyPreferencesValuesTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ReadOnlyPreferenceCannotBeModifiedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ReadOnlyPreferenceCannotBeModifiedTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ReadOnlyPreferenceCannotBeModifiedTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP5;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -47,7 +47,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_93})
+ at TestCase({Assertion.JSR168_93})
 public class ReadOnlyPreferenceCannotBeModifiedTestCase
 {
    public ReadOnlyPreferenceCannotBeModifiedTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ResetPreferenceHavingNoDefaultValueDeletesItTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ResetPreferenceHavingNoDefaultValueDeletesItTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ResetPreferenceHavingNoDefaultValueDeletesItTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP4;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -48,7 +48,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_92})
+ at TestCase({Assertion.JSR168_92})
 public class ResetPreferenceHavingNoDefaultValueDeletesItTestCase
 {
    public ResetPreferenceHavingNoDefaultValueDeletesItTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -26,8 +26,8 @@
 import org.jboss.portal.test.framework.portlet.PortletTestContext;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP4;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.fail;
@@ -43,7 +43,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_97})
+ at TestCase({Assertion.JSR168_97})
 public class StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase
 {
    public StoreCalledDuringRenderThrowsIllegalArgumentExceptionTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ValidationStoresTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ValidationStoresTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/ValidationStoresTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -28,8 +28,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.portlet.framework.UTP8;
 import org.jboss.portal.test.portlet.jsr168.tck.preferences.spec.ValidationStoresValidator;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
@@ -50,7 +50,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_103,TCKAssertion.JSR168_105})
+ at TestCase({Assertion.JSR168_103, Assertion.JSR168_105})
 public class ValidationStoresTestCase
 {
    public ValidationStoresTestCase(PortletTest seq)

Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/CustomStateNotMappedNotInvokedTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/CustomStateNotMappedNotInvokedTestCase.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/CustomStateNotMappedNotInvokedTestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -27,8 +27,8 @@
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.test.portlet.framework.UTP2;
-import org.jboss.portal.unit.annotations.TCK;
-import org.jboss.portal.unit.TCKAssertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.Assertion;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.FailureResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
@@ -46,7 +46,7 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */
- at TCK({TCKAssertion.JSR168_40})
+ at TestCase({Assertion.JSR168_40})
 public class CustomStateNotMappedNotInvokedTestCase
 {
    public CustomStateNotMappedNotInvokedTestCase(PortletTest seq)

Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/Assertion.java (from rev 8836, modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TCKAssertion.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/Assertion.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/Assertion.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -0,0 +1,624 @@
+/******************************************************************************
+ * 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.unit;
+
+/**
+ * Define TCK assertions.
+ *
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public enum Assertion
+{
+
+   JSR168_4(new TCK(4), "After the portlet object is instantiated, the portlet container must" +
+      " initialize the portlet before invoking it to handle requests"),
+
+   JSR168_5(new TCK(5), "During initialization, the portlet object may throw an" +
+      " UnavailableException or a PortletException. In this case, the portlet container must not place the portlet object" +
+      " into active service and it must release the portlet object."),
+
+   JSR168_6(new TCK(6), "The destroy method must not be called because the initialization is" +
+      " considered unsuccessful."),
+
+   JSR168_8(new TCK(8), "A RuntimeException thrown during initialization must be handled as a" +
+      " PortletException."),
+
+   JSR168_9(new TCK(9), "If the client request is triggered by an action URL, the" +
+      " portal/portlet-container must first trigger the action request by invoking the processAction method of the" +
+      " targeted portlet."),
+
+   JSR168_10(new TCK(10), "The portal/portlet-container must wait until the action request finishes." +
+      " Then, the portal/portlet-container must trigger the render request by invoking the render method for all the" +
+      " portlets in the portal page with the possible exception of portlets for which their content is being cached."),
+
+   JSR168_11(new TCK(11), "If the client request is triggered by a render URL, the" +
+      " portal/portlet-container must invoke the render method for all the portlets in the portal page with the possible" +
+      " exception of portlets for which their content is being cached."),
+
+   JSR168_12(new TCK(12), "While processing an action request, the portlet may instruct the" +
+      " portal/portlet-container to redirect the user to a specific URL. If the portlet issues a redirection, when the" +
+      " processAction method concludes, the portal/portlet-container must send the redirection back to the user agent"),
+
+   JSR168_17(new TCK(17), "A PortletException signals that an error has occurred during the processing" +
+      " of the request and that the portlet container should take appropriate measures to clean up the request. If a portlet" +
+      " throws an exception in the processAction method, all operations on the ActionResponse must be ignored and the render" +
+      " method must not be invoked within the current client request", Status.disabled("spec?")),
+
+   JSR168_18(new TCK(18), "If a permanent unavailability is indicated by the UnavailableException, the" +
+      " portlet container must remove the portlet from service immediately, call the portlet’s destroy method, and release" +
+      " the portlet object.", Status.disabled("spec?")),
+
+   JSR168_19(new TCK(19), "A RuntimeException thrown during the request handling must be handled as a" +
+      " PortletException", Status.disabled("spec?")),
+
+   JSR168_24(new TCK(24), ""),
+
+   JSR168_26(new TCK(26), "A render URL is an optimization for a special type of action URLs. The" +
+      " portal/portletcontainer must not invoke the processAction method of the targeted portlet."),
+
+   JSR168_27(new TCK(27), "The portal/portlet-container must ensure that all the parameters set when" +
+      " constructing the render URL become render parameters of the subsequent render requests for the portlet."),
+
+   JSR168_28(new TCK(28), "Portlets can add application specific parameters to the PortletURL" +
+      " objects using the setParameter and setParameters methods. A call to any of the setParameter methods must replace" +
+      " any parameter with the same name previously set."),
+
+   JSR168_30(new TCK(30), "", Status.jbossUntestable("why?")),
+
+   JSR168_31(new TCK(31), "", Status.jbossUntestable("why?")),
+
+   JSR168_29(new TCK(29), "All the parameters a portlet adds to a PortletURL object must be made" +
+      " available to the portlet as request parameters"),
+
+   JSR168_32(new TCK(32), "A portlet cannot create a portlet URL using a portlet mode that is not" +
+      " defined as supported by the portlet or that the user it is not allowed to use. The setPortletMode methods must" +
+      " throw a PortletModeException in that situation."),
+
+   JSR168_34(new TCK(34), "A portlet cannot create a portlet URL using a window state that is not" +
+      " supported by the portlet container. The setWindowState method must throw a WindowStateException if that is the" +
+      " case"),
+
+   JSR168_35(new TCK(35), "The setSecure method of the PortletURL interface allows a portlet to" +
+      " indicate if the portlet URL has to be a secure URL or not (i.e. HTTPS or HTTP). If the setSecure method is not" +
+      " used, the portlet URL must be of the same security level of the current request."),
+
+   JSR168_36(new TCK(36), "The GenericPortlet class implementation of the render method dispatches" +
+      " requests to the doView, doEdit or doHelp method depending on the portlet mode indicated in the request using the" +
+      " doDispatch method"),
+
+   JSR168_33(new TCK(33), "", Status.duplicate(JSR168_36, "")),
+
+   JSR168_37(new TCK(37), "", Status.duplicate(JSR168_36, "RequestDispatchingDependingOnModePortlet as VIEW mode isn't specified in descriptor")),
+
+   JSR168_38(new TCK(38), "The portlet must not be invoked in a portlet mode that has not been" +
+      " declared as supported for a given markup type", Status.disabled("spec?")),
+
+   JSR168_40(new TCK(40), "If a custom window state defined in the deployment descriptor is not" +
+      " mapped to a custom window state provided by the portal, portlets must not be invoked in that window state."),
+
+   JSR168_43(new TCK(43), "The initialization parameters accessible through the PortletContext must" +
+      " be the same that are accessible through the ServletContext of the portlet application."),
+
+   JSR168_44(new TCK(44), "Context attributes set using the PortletContext must be stored in the" +
+      " ServletContext of the portlet application. A direct consequence of this is that data stored in the ServletContext" +
+      " by servlets or JSPs is accessible to portlets through the PortletContext and vice versa."),
+
+   JSR168_45(new TCK(45), "The PortletContext must offer access to the same set of resources the" +
+      " ServletContext exposes."),
+
+   JSR168_46(new TCK(46), "The PortletContext must handle the same temporary working directory the" +
+      " ServletContext handles. It must be accessible as a context attribute using the same constant defined in the" +
+      " Servlet Specification 2.3 SVR 3 Servlet Context Chapter, javax.servlet.context.tempdir."),
+
+   JSR168_47(new TCK(47), "", Status.postponed("spec?")),
+
+   JSR168_48(new TCK(48), "", Status.postponed("spec?")),
+
+   JSR168_49(new TCK(49), "", Status.postponed("spec?")),
+
+   JSR168_50(new TCK(50), "The portlet-container must not propagate parameters received in an action" +
+      " request to subsequent render requests of the portlet."),
+
+   JSR168_51(new TCK(51), "If a portlet receives a render request that is the result of a client" +
+      " request targeted to another portlet in the portal page, the parameters must be the same parameters as of the" +
+      " previous render request."),
+
+   JSR168_52(new TCK(52), "If a portlet receives a render request following an action request as" +
+      " part of the same client request, the parameters received with render request must be the render parameters set" +
+      " during the action request."),
+
+   JSR168_53(new TCK(53), "", Status.postponed("spec?")),
+
+   JSR168_54(new TCK(54), "A portlet must not see any parameter targeted to other portlets."),
+
+   JSR168_55(new TCK(55), "The getParameterValues method returns an array of String objects" +
+      " containing all the parameter values associated with a parameter name. The value returned from the getParameter" +
+      " method must be the first value in the array of String objects returned by getParameterValues"),
+
+   JSR168_56(new TCK(56), "If there is a single parameter value associated with a parameter name the" +
+      " method returns must return an array of size one containing the parameter value"),
+
+   JSR168_57(new TCK(57), "", Status.specUntestable("")),
+
+   JSR168_58(new TCK(58), "The context path of a request is exposed via the request object. The" +
+      " context path is the path prefix associated with the deployed portlet application. If the portlet application is" +
+      " rooted at the base of the web server URL namespace (also known as \"default\" context), this path must be an empty" +
+      " string"),
+
+   JSR168_59(new TCK(59), "Otherwise, it must be the path the portlet application is rooted to, the" +
+      " path must start with a '/' and it must not end with a '/' character."),
+
+   JSR168_60(new TCK(60), "If the user is not authenticated the getAuthType method must return null"),
+
+   JSR168_61(new TCK(61), "If the portlet container supports additional content types for the" +
+      " portlet’s output, it must declare the additional content types through the getResponseContentTypes method of the" +
+      " request object. The returned Enumeration of strings should contain the content types the portlet container" +
+      " supports in order of preference. The first element of the enumeration must be the same content type returned by" +
+      " the getResponseContentType method."),
+
+   JSR168_62(new TCK(62), "", Status.jbossUntestable("PORTAL DOESN'T SUPPORT ADDITIONAL CONTENT TYPES")),
+
+   JSR168_63(new TCK(63), "Only one of the two methods, getPortletInputStream or getReader, can be" +
+      " used during an action request. If the input stream is obtained, a call to the getReader must throw an" +
+      " IllegalStateException. Similarly, if the reader is obtained, a call to the getPortletInputStream must throw an" +
+      " IllegalStateException."),
+
+   JSR168_64(new TCK(64), "", Status.postponed("")),
+
+   JSR168_65(new TCK(65), "The sendRedirect method instructs the portal/portlet-container to set the" +
+      " appropriate headers and content body to redirect the user to a different URL. A fully qualified URL or a full path" +
+      " URL must be specified. If a relative path URL is given, an IllegalArgumentException must be thrown."),
+
+   JSR168_66(new TCK(66), "If the sendRedirect method is called after the setPortletMode," +
+      " setWindowState, setRenderParameter or setRenderParameters methods of the ActionResponse interface, an" +
+      " IllegalStateException must be thrown and the redirection must not be executed"),
+
+   JSR168_67(new TCK(67), "The setPortletMode method allows a portlet to change its current portlet" +
+      " mode. The new portlet mode would be effective in the following render request. If a portlet attempts to set a" +
+      " portlet mode that is not allowed to switch to, a PortletModeException must be thrown."),
+
+   JSR168_68(new TCK(68), "The setWindowState method allows a portlet to change its current window" +
+      " state. The new window state would be effective in the following render request. If a portlet attempts to set a" +
+      " window state that it is not allowed to switch to, a WindowStateException must be thrown."),
+
+   JSR168_69(new TCK(69), "If the setPortletMode or setWindowState methods are called after the" +
+      " sendRedirect method has been called an IllegalStateException must be thrown."),
+
+   JSR168_70(new TCK(70), "If the exception is caught by the portlet, the redirection must be" +
+      " executed."),
+
+   JSR168_71(new TCK(71), "If the setPortletMode or setWindowState methods are called after the" +
+      " sendRedirect method has been called an IllegalStateException must be thrown. (...) If the exception is propagated" +
+      " back to the portlet-container, the redirection must not be executed.", Status.disabled("This is disabled as after propagating IllegalStateException to PortletContainer" +
+      " '500' code is returned which doesn't allow us to end test properly")),
+
+   JSR168_72(new TCK(72), "Using the setRenderParameter and setRenderParameters methods of the" +
+      " ActionResponse interface portlets may set render parameters during an action request. A call to any of the" +
+      " setRenderParameter methods must replace any parameter with the same name previously set."),
+
+   JSR168_73(new TCK(73), "If no render parameters are set during the processAction invocation, the" +
+      " render request must not contain any request parameters."),
+
+   JSR168_74(new TCK(74), "If the setRenderParameter or setRenderParameters methods are called after" +
+      " the sendRedirect method has been called an IllegalStateException must be thrown"),
+
+   // done only partially - see SPEC:71 comment for the reason
+   JSR168_75(new TCK(75), "If the exception is caught by the portlet, the redirection must be" +
+      " executed. If the exception is propagated back to the portlet-container, the redirection must not be executed."),
+
+   JSR168_76(new TCK(76), "A portlet must set the content type of the response using the" +
+      " setContentType method of the RenderResponse interface. The setContentType method must throw an" +
+      " IllegalArgumentException if the content type set does not match (including wildcard matching) any of the content" +
+      " types returned by the getResponseContentType method of the PortleRequest object"),
+
+   JSR168_77(new TCK(77), "If the getWriter or getPortletOutputStream methods are called before the" +
+      " setContentType method, they must throw an IllegalStateException."),
+
+   JSR168_78(new TCK(78), "If the portlet has set a content type, the getContentType method must" +
+      " return it. Otherwise, the getContentType method must return null."),
+
+   JSR168_79(new TCK(79), "A portlet may generate its content by writing to the OutputStream or to" +
+      " the Writer of the RenderResponse object. A portlet must use only one of these objects. The portlet container must" +
+      " throw an IllegalStateException if a portlet attempts to use both."),
+
+   JSR168_80(new TCK(80), "The getBufferSize method returns the size of the underlying buffer being" +
+      " used. If no buffering is being used, this method must return the int value of 0 (zero)", Status.disabled("no buffering is implemented yet")),
+
+   JSR168_81(new TCK(81), "The portlet can request a preferred buffer size by using the" +
+      " setBufferSize method. The buffer assigned is not required to be the size requested by the portlet, but must be at" +
+      " least as large as the size requested.", Status.disabled("no buffering is implemented yet")),
+
+   JSR168_82(new TCK(82), "", Status.postponed("")),
+
+   JSR168_83(new TCK(83), "If the response is committed and the reset or resetBuffer method is" +
+      " called, an IllegalStateException must be thrown.", Status.disabled("no buffering is implemented yet")),
+
+   JSR168_84(new TCK(84), "", Status.postponed("")),
+
+   JSR168_85(new TCK(85), "", Status.postponed("")),
+
+   JSR168_86(new TCK(86), "The getNamespace method must provide the portlet with a mechanism that" +
+      " ensures the uniqueness of the returned string in the whole portal page"),
+
+   JSR168_87(new TCK(87), "The getNamespace method must return the same value if invoked multiple" +
+      " times within a render request."),
+
+   JSR168_88(new TCK(88), "The getNamespace method must return a valid identifier as defined in the" +
+      " 3.8 Identifier Section of the Java Language Specification Second Edition."),
+
+   JSR168_90(new TCK(90), "Preference attributes are String array objects. Preferences attributes can" +
+      " be set to null."),
+
+   JSR168_91(new TCK(91), "The getMap method returns an immutable Map of String keys and String[]" +
+      " values containing all current preference values. Preferences values must not be modified if the values in the Map" +
+      " are altered."),
+
+   // Does not cover restore to default test yet.
+   JSR168_92(new TCK(92), "The reset method must reset a preference attribute to its default value." +
+      " If there is no default value, the preference attribute must be deleted."),
+
+   JSR168_93(new TCK(93), "If a preference attribute is read only, the setValue, setValues and reset" +
+      " methods must throw a ReadOnlyException when the portlet is in any of the standard modes"),
+
+   JSR168_94(new TCK(94), "", Status.disabled("Tested in every over case in this chapter... DONE")),
+
+   JSR168_95(new TCK(95), "", Status.postponed("why?")),
+
+   JSR168_96(new TCK(96), "All changes made to PortletPreferences object not followed by a call to" +
+      " the store method must be discarded when the portlet finishes the 20 processAction method."),
+
+   JSR168_97(new TCK(97), "If the store method is invoked within the scope of a render method" +
+      " invocation, it must throw an IllegalStateException."),
+
+   JSR168_98(new TCK(98), "", Status.postponed("why?")),
+
+   JSR168_99(new TCK(99), "If a preference attribute definition does not contain the read-only" +
+      " element set to true, the preference attribute is modifiable when the portlet is processing an action request in" +
+      " any of the standard portlet modes (VIEW, EDIT or HELP)."),
+
+   JSR168_100(new TCK(100), "Portlets are not restricted to use preference attributes defined in the" +
+      " deployment descriptor. They can programmatically add preference attributes using names not defined in the" +
+      " deployment descriptor. These preferences attributes must be treated as modifiable attributes."),
+
+   JSR168_101(new TCK(101), "If a portlet definition includes a validator, the portlet container must" +
+      " create a single validator instance per portlet definition. (according to spec: Testable=false ;)"),
+
+   JSR168_102(new TCK(102), "", Status.specUntestable("")),
+
+   JSR168_103(new TCK(103), "When a validator is associated with the preferences of a portlet" +
+      " definition, the store method of the PortletPreferences implementation must invoke the validate method of the" +
+      " validator before writing the changes to the persistent store."),
+
+   JSR168_104(new TCK(104), "If the validation fails, the PreferencesValidator implementation must" +
+      " throw a ValidatorException. If a ValidatorException is thrown, the portlet container must cancel the store" +
+      " operation and it must propagate the exception to the portlet"),
+
+   JSR168_105(new TCK(105), "If the validation is successful, the store operation must be completed"),
+
+   JSR168_106(new TCK(106), "For portlets within the same portlet application, a portlet container" +
+      " must ensure that every portlet request generated as result of a group of requests originated from the portal to" +
+      " complete a single client request receive or acquire the same session"),
+
+   JSR168_107(new TCK(107), "In addition, if within these portlet requests more than one portlet" +
+      " creates a session, the session object must be the same for all the portlets in the same portlet application"),
+
+   JSR168_110(new TCK(110), "Any object stored in the session using the APPLICATION_SCOPE is" +
+      " available to any other portlet that belongs to the same portlet application and that handles a request identified" +
+      " as being a part of the same session."),
+
+   JSR168_111(new TCK(111), "Objects stored in the session using the PORTLET_SCOPE must be available" +
+      " to the portlet during requests for the same portlet window that the objects where stored from."),
+
+   JSR168_112(new TCK(112), "The object must be stored in the APPLICATION_SCOPE with the following" +
+      " fabricated attribute name 'javax.portlet.p.<ID>?<ATTRIBUTE_NAME>'. <ID> is a unique identification for the portlet" +
+      " window (assigned by the portal/portlet-container) that must not contain a '?' character."),
+
+   JSR168_113(new TCK(113), "The PortletSession must store all attributes in the HttpSession of the" +
+      " portlet application. A direct consequence of this is that data stored in the HttpSession by servlets or JSPs is" +
+      " accessible to portlets through the PortletSession in the portlet application scope."),
+
+   JSR168_114(new TCK(114), "Conversely, data stored by portlets in the PortletSession in the portlet" +
+      " application scope is accessible to servlets and JSPs through the HttpSession."),
+
+   JSR168_115(new TCK(115), "If the HttpSession object is invalidated, the PortletSession object must" +
+      " also be invalidated by the portlet container."),
+
+   JSR168_116(new TCK(116), "If the PortletSession object is invalidated by a portlet, the portlet" +
+      " container must invalidate the associated HttpSession object."),
+
+   JSR168_117(new TCK(117), "The attribute names must be the same if APPLICATION_SCOPE scope is" +
+      " used."),
+
+   JSR168_118(new TCK(118), "The attribute name has to conform with the specified prefixing if" +
+      " PORTLET_SCOPE is used"),
+
+   JSR168_119(new TCK(119), "The variant of these methods that does not receive a scope must be" +
+      " treated as PORTLET_SCOPE."),
+
+   JSR168_120(new TCK(120), "", Status.jbossUntestable("why?")),
+
+   JSR168_121(new TCK(121), "The getRequestDispatcher method takes a String argument describing a" +
+      " path within the scope of the PortletContext of a portlet application. This path must begin with a ‘/’ and it is" +
+      " relative to the PortletContext root."),
+
+   JSR168_122(new TCK(122), "The getNamedDispatcher method takes a String argument indicating the" +
+      " name of a servlet known to the PortletContext of the portlet application. If no resource can be resolved based on" +
+      " the given path or name the methods must return null"),
+
+   JSR168_123(new TCK(123), "The parameters associated with a PortletRequestDispatcher are scoped to" +
+      " apply only for the duration of the include call."),
+
+   JSR168_124(new TCK(124), "To include a servlet or a JSP, a portlet calls the include method of the" +
+      " PortletRequestDispatcher interface. The parameters to these methods must be the request and response arguments" +
+      " that were passed in via the render method of the Portlet interface."),
+
+   JSR168_125(new TCK(125), "The portlet container must ensure that the servlet or JSP called through" +
+      " a PortletRequestDispatcher is called in the same thread as the PortletRequestDispatcher include invocation."),
+
+   JSR168_126(new TCK(126), "Servlets and JSPs included from portlets must be handled as HTTP GET requests."),
+
+   JSR168_127(new TCK(127), "Except for servlets obtained by using the getNamedDispatcher method, a" +
+      " servlet or JSP being used from within an include call has access to the path used to obtain the" +
+      " PortletRequestDispatcher. The following request attributes must be set: javax.servlet.include.request_uri," +
+      " javax.servlet.include.context_path javax.servlet.include.servlet_path, javax.servlet.include.path_info," +
+      " javax.servlet.include.query_string"),
+
+   JSR168_128(new TCK(128), "javax.portlet.config, javax.portlet.request, javax.portlet.response." +
+      " These attributes must be the same Portlet API objects accessible to the portlet doing the include call."),
+
+   JSR168_129(new TCK(129), "The following methods of the HttpServletRequest must return null:" +
+      " getProtocol, getRemoteAddr, getRemoteHost, getRealPath, and getRequestURL."),
+
+   JSR168_130(new TCK(130), "The following methods of the HttpServletRequest must return the path and"+
+      " query string information used to obtain the PortletRequestDispatcher object: getPathInfo, getPathTranslated,"+
+      " getQueryString, getRequestURI and getServletPath"),
+
+   JSR168_131(new TCK(131), "The following methods of the HttpServletRequest must be equivalent to" +
+      " the methods of the PortletRequest of similar name: getScheme, getServerName,getServerPort, getAttribute," +
+      " getAttributeNames, setAttribute,removeAttribute, getLocale, getLocales, isSecure, getAuthType, getContextPath," +
+      " getRemoteUser, getUserPrincipal, getRequestedSessionId, isRequestedSessionIdValid"),
+
+   JSR168_132(new TCK(132), "The following methods of the HttpServletRequest must be equivalent to" +
+      " the methods of the PortletRequest of similar name with the provision defined in PLT.16.1.1 Query Strings in" +
+      " Request Dispatcher Paths Section: getParameter, getParameterNames, getParameterValues and getParameterMap."),
+
+   JSR168_133(new TCK(133), "The following methods of the HttpServletRequest must do no operations" +
+      " and return null: getCharacterEncoding, setCharacterEncoding, getContentType, getInputStream and getReader."),
+
+   JSR168_134(new TCK(134), "The getContentLength method of the HttpServletRequest must return 0."),
+
+
+   JSR168_137(new TCK(137), "The getMethod method of the HttpServletRequest must always return 'GET'"),
+
+   JSR168_138(new TCK(138), "The following methods of the HttpServletResponse must return" +
+      " null:encodeRedirectURL and encodeRedirectUrl"),
+
+   JSR168_141(new TCK(141), "The getLocale method of the HttpServletResponse must be based on the" +
+      " getLocale method of the RenderResponse."),
+
+   JSR168_142(new TCK(142), "If the servlet or JSP that is the target of a request dispatcher throws" +
+      " a runtime exception or a checked exception of type IOException, it must be propagated to the calling portlet."),
+
+   JSR168_143(new TCK(143), "All other exceptions, including a ServletException, must be wrapped with" +
+      " a PortletException. The root cause of the exception must be set to the original exception before being" +
+      " propagated."),
+
+   ;
+
+   /**
+    * An abstract reference.
+    */
+   public abstract static class Ref
+   {
+      public abstract String toString();
+   }
+
+   /**
+    * A reference to a JSR 168 TCK test.
+    */
+   public static class TCK extends Ref
+   {
+
+      /** . */
+      private int index;
+
+      public TCK(int index)
+      {
+         this.index = index;
+      }
+
+      public int getIndex()
+      {
+         return index;
+      }
+
+      public String toString()
+      {
+         return "TCK[" + index + "]";
+      }
+   }
+
+   /**
+    * The status of an assertion.
+    */
+   public abstract static class Status
+   {
+      protected Status()
+      {
+      }
+
+      private static Inactive disabled(String cause)
+      {
+         return new Inactive(Inactive.Type.DISABLED, cause);
+      }
+
+      private static Inactive todo(String cause)
+      {
+         return new Inactive(Inactive.Type.TODO, cause);
+      }
+
+      private static Inactive postponed(String cause)
+      {
+         return new Inactive(Inactive.Type.POSTPONED, cause);
+      }
+
+      private static Inactive specUntestable(String cause)
+      {
+         return new Untestable(Untestable.Kind.SPEC, cause);
+      }
+
+      private static Inactive jbossUntestable(String cause)
+      {
+         return new Untestable(Untestable.Kind.JBOSS, cause);
+      }
+
+      private static Duplicate duplicate(Assertion target, String description)
+      {
+         return new Duplicate(target, description);
+      }
+   }
+
+   public static class Active extends Status
+   {
+
+   }
+
+   public static class Inactive extends Status
+   {
+
+      /** . */
+      private final Type type;
+
+      /** . */
+      private final String msg;
+
+      public enum Type
+      {
+         POSTPONED, TODO, DISABLED, UNTESTABLE
+      }
+
+      public Inactive(Type type, String msg)
+      {
+         this.type = type;
+         this.msg = msg;
+      }
+
+      public Type getType()
+      {
+         return type;
+      }
+
+      public String getMessage()
+      {
+         return msg;
+      }
+   }
+
+   public static class Untestable extends Inactive
+   {
+
+      public enum Kind
+      {
+         JBOSS, SPEC
+      }
+
+      /** . */
+      private final Kind kind;
+
+      public Untestable(Kind kind, String msg)
+      {
+         super(Inactive.Type.UNTESTABLE, msg);
+
+         //
+         this.kind = kind;
+      }
+
+      public Kind getKind()
+      {
+         return kind;
+      }
+   }
+
+   public static class Duplicate extends Active
+   {
+
+      /** . */
+      private final Assertion target;
+
+      /** . */
+      private final String description;
+
+      private Duplicate(Assertion target, String description)
+      {
+         this.target = target;
+         this.description = description;
+      }
+
+      public Assertion getTarget()
+      {
+         return target;
+      }
+
+      public String getDescription()
+      {
+         return description;
+      }
+   }
+
+   /** . */
+   private final Ref ref;
+
+   /** . */
+   private final String description;
+
+   /** . */
+   private Status status;
+
+   Assertion(Ref ref, String description)
+   {
+      this(ref, description, new Active());
+   }
+
+   Assertion(Ref ref, String description, Status status)
+   {
+      this.ref = ref;
+      this.description = description;
+      this.status = status;
+   }
+
+   public Ref getRef()
+   {
+      return ref;
+   }
+
+   public String getDescription()
+   {
+      return description;
+   }
+
+   public Status getStatus()
+   {
+      return status;
+   }
+}

Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TCKAssertion.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TCKAssertion.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/TCKAssertion.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -1,588 +0,0 @@
-/******************************************************************************
- * 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.unit;
-
-/**
- * Define TCK assertions.
- *
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public enum TCKAssertion
-{
-
-   JSR168_4(4, "After the portlet object is instantiated, the portlet container must" +
-      " initialize the portlet before invoking it to handle requests"),
-
-   JSR168_5(5, "During initialization, the portlet object may throw an" +
-      " UnavailableException or a PortletException. In this case, the portlet container must not place the portlet object" +
-      " into active service and it must release the portlet object."),
-
-   JSR168_6(6, "The destroy method must not be called because the initialization is" +
-      " considered unsuccessful."),
-
-   JSR168_8(8, "A RuntimeException thrown during initialization must be handled as a" +
-      " PortletException."),
-
-   JSR168_9(9, "If the client request is triggered by an action URL, the" +
-      " portal/portlet-container must first trigger the action request by invoking the processAction method of the" +
-      " targeted portlet."),
-
-   JSR168_10(10, "The portal/portlet-container must wait until the action request finishes." +
-      " Then, the portal/portlet-container must trigger the render request by invoking the render method for all the" +
-      " portlets in the portal page with the possible exception of portlets for which their content is being cached."),
-
-   JSR168_11(11, "If the client request is triggered by a render URL, the" +
-      " portal/portlet-container must invoke the render method for all the portlets in the portal page with the possible" +
-      " exception of portlets for which their content is being cached."),
-
-   JSR168_12(12, "While processing an action request, the portlet may instruct the" +
-      " portal/portlet-container to redirect the user to a specific URL. If the portlet issues a redirection, when the" +
-      " processAction method concludes, the portal/portlet-container must send the redirection back to the user agent"),
-
-   JSR168_17(17, "A PortletException signals that an error has occurred during the processing" +
-      " of the request and that the portlet container should take appropriate measures to clean up the request. If a portlet" +
-      " throws an exception in the processAction method, all operations on the ActionResponse must be ignored and the render" +
-      " method must not be invoked within the current client request", Status.disabled("spec?")),
-
-   JSR168_18(18, "If a permanent unavailability is indicated by the UnavailableException, the" +
-      " portlet container must remove the portlet from service immediately, call the portlet’s destroy method, and release" +
-      " the portlet object.", Status.disabled("spec?")),
-
-   JSR168_19(19, "A RuntimeException thrown during the request handling must be handled as a" +
-      " PortletException", Status.disabled("spec?")),
-
-   JSR168_24(24, ""),
-
-   JSR168_26(26, "A render URL is an optimization for a special type of action URLs. The" +
-      " portal/portletcontainer must not invoke the processAction method of the targeted portlet."),
-
-   JSR168_27(27, "The portal/portlet-container must ensure that all the parameters set when" +
-      " constructing the render URL become render parameters of the subsequent render requests for the portlet."),
-
-   JSR168_28(28, "Portlets can add application specific parameters to the PortletURL" +
-      " objects using the setParameter and setParameters methods. A call to any of the setParameter methods must replace" +
-      " any parameter with the same name previously set."),
-
-   JSR168_30(30, "", Status.jbossUntestable("why?")),
-
-   JSR168_31(31, "", Status.jbossUntestable("why?")),
-
-   JSR168_29(29, "All the parameters a portlet adds to a PortletURL object must be made" +
-      " available to the portlet as request parameters"),
-
-   JSR168_32(32, "A portlet cannot create a portlet URL using a portlet mode that is not" +
-      " defined as supported by the portlet or that the user it is not allowed to use. The setPortletMode methods must" +
-      " throw a PortletModeException in that situation."),
-
-   JSR168_34(34, "A portlet cannot create a portlet URL using a window state that is not" +
-      " supported by the portlet container. The setWindowState method must throw a WindowStateException if that is the" +
-      " case"),
-
-   JSR168_35(35, "The setSecure method of the PortletURL interface allows a portlet to" +
-      " indicate if the portlet URL has to be a secure URL or not (i.e. HTTPS or HTTP). If the setSecure method is not" +
-      " used, the portlet URL must be of the same security level of the current request."),
-
-   JSR168_36(36, "The GenericPortlet class implementation of the render method dispatches" +
-      " requests to the doView, doEdit or doHelp method depending on the portlet mode indicated in the request using the" +
-      " doDispatch method"),
-
-   JSR168_33(33, "", Status.duplicate(JSR168_36, "")),
-
-   JSR168_37(37, "", Status.duplicate(JSR168_36, "RequestDispatchingDependingOnModePortlet as VIEW mode isn't specified in descriptor")),
-
-   JSR168_38(38, "The portlet must not be invoked in a portlet mode that has not been" +
-      " declared as supported for a given markup type", Status.disabled("spec?")),
-
-   JSR168_40(40, "If a custom window state defined in the deployment descriptor is not" +
-      " mapped to a custom window state provided by the portal, portlets must not be invoked in that window state."),
-
-   JSR168_43(43, "The initialization parameters accessible through the PortletContext must" +
-      " be the same that are accessible through the ServletContext of the portlet application."),
-
-   JSR168_44(44, "Context attributes set using the PortletContext must be stored in the" +
-      " ServletContext of the portlet application. A direct consequence of this is that data stored in the ServletContext" +
-      " by servlets or JSPs is accessible to portlets through the PortletContext and vice versa."),
-
-   JSR168_45(45, "The PortletContext must offer access to the same set of resources the" +
-      " ServletContext exposes."),
-
-   JSR168_46(46, "The PortletContext must handle the same temporary working directory the" +
-      " ServletContext handles. It must be accessible as a context attribute using the same constant defined in the" +
-      " Servlet Specification 2.3 SVR 3 Servlet Context Chapter, javax.servlet.context.tempdir."),
-
-   JSR168_47(47, "", Status.postponed("spec?")),
-
-   JSR168_48(48, "", Status.postponed("spec?")),
-
-   JSR168_49(49, "", Status.postponed("spec?")),
-
-   JSR168_50(50, "The portlet-container must not propagate parameters received in an action" +
-      " request to subsequent render requests of the portlet."),
-
-   JSR168_51(51, "If a portlet receives a render request that is the result of a client" +
-      " request targeted to another portlet in the portal page, the parameters must be the same parameters as of the" +
-      " previous render request."),
-
-   JSR168_52(52, "If a portlet receives a render request following an action request as" +
-      " part of the same client request, the parameters received with render request must be the render parameters set" +
-      " during the action request."),
-
-   JSR168_53(53, "", Status.postponed("spec?")),
-
-   JSR168_54(54, "A portlet must not see any parameter targeted to other portlets."),
-
-   JSR168_55(55, "The getParameterValues method returns an array of String objects" +
-      " containing all the parameter values associated with a parameter name. The value returned from the getParameter" +
-      " method must be the first value in the array of String objects returned by getParameterValues"),
-
-   JSR168_56(56, "If there is a single parameter value associated with a parameter name the" +
-      " method returns must return an array of size one containing the parameter value"),
-
-   JSR168_57(57, "", Status.specUntestable("")),
-
-   JSR168_58(58, "The context path of a request is exposed via the request object. The" +
-      " context path is the path prefix associated with the deployed portlet application. If the portlet application is" +
-      " rooted at the base of the web server URL namespace (also known as \"default\" context), this path must be an empty" +
-      " string"),
-
-   JSR168_59(59, "Otherwise, it must be the path the portlet application is rooted to, the" +
-      " path must start with a '/' and it must not end with a '/' character."),
-
-   JSR168_60(60, "If the user is not authenticated the getAuthType method must return null"),
-
-   JSR168_61(61, "If the portlet container supports additional content types for the" +
-      " portlet’s output, it must declare the additional content types through the getResponseContentTypes method of the" +
-      " request object. The returned Enumeration of strings should contain the content types the portlet container" +
-      " supports in order of preference. The first element of the enumeration must be the same content type returned by" +
-      " the getResponseContentType method."),
-
-   JSR168_62(62, "", Status.jbossUntestable("PORTAL DOESN'T SUPPORT ADDITIONAL CONTENT TYPES")),
-
-   JSR168_63(63, "Only one of the two methods, getPortletInputStream or getReader, can be" +
-      " used during an action request. If the input stream is obtained, a call to the getReader must throw an" +
-      " IllegalStateException. Similarly, if the reader is obtained, a call to the getPortletInputStream must throw an" +
-      " IllegalStateException."),
-
-   JSR168_64(64, "", Status.postponed("")),
-
-   JSR168_65(65, "The sendRedirect method instructs the portal/portlet-container to set the" +
-      " appropriate headers and content body to redirect the user to a different URL. A fully qualified URL or a full path" +
-      " URL must be specified. If a relative path URL is given, an IllegalArgumentException must be thrown."),
-
-   JSR168_66(66, "If the sendRedirect method is called after the setPortletMode," +
-      " setWindowState, setRenderParameter or setRenderParameters methods of the ActionResponse interface, an" +
-      " IllegalStateException must be thrown and the redirection must not be executed"),
-
-   JSR168_67(67, "The setPortletMode method allows a portlet to change its current portlet" +
-      " mode. The new portlet mode would be effective in the following render request. If a portlet attempts to set a" +
-      " portlet mode that is not allowed to switch to, a PortletModeException must be thrown."),
-
-   JSR168_68(68, "The setWindowState method allows a portlet to change its current window" +
-      " state. The new window state would be effective in the following render request. If a portlet attempts to set a" +
-      " window state that it is not allowed to switch to, a WindowStateException must be thrown."),
-
-   JSR168_69(69, "If the setPortletMode or setWindowState methods are called after the" +
-      " sendRedirect method has been called an IllegalStateException must be thrown."),
-
-   JSR168_70(70, "If the exception is caught by the portlet, the redirection must be" +
-      " executed."),
-
-   JSR168_71(71, "If the setPortletMode or setWindowState methods are called after the" +
-      " sendRedirect method has been called an IllegalStateException must be thrown. (...) If the exception is propagated" +
-      " back to the portlet-container, the redirection must not be executed.", Status.disabled("This is disabled as after propagating IllegalStateException to PortletContainer" +
-      " '500' code is returned which doesn't allow us to end test properly")),
-
-   JSR168_72(72, "Using the setRenderParameter and setRenderParameters methods of the" +
-      " ActionResponse interface portlets may set render parameters during an action request. A call to any of the" +
-      " setRenderParameter methods must replace any parameter with the same name previously set."),
-
-   JSR168_73(73, "If no render parameters are set during the processAction invocation, the" +
-      " render request must not contain any request parameters."),
-
-   JSR168_74(74, "If the setRenderParameter or setRenderParameters methods are called after" +
-      " the sendRedirect method has been called an IllegalStateException must be thrown"),
-
-   // done only partially - see SPEC:71 comment for the reason
-   JSR168_75(75, "If the exception is caught by the portlet, the redirection must be" +
-      " executed. If the exception is propagated back to the portlet-container, the redirection must not be executed."),
-
-   JSR168_76(76, "A portlet must set the content type of the response using the" +
-      " setContentType method of the RenderResponse interface. The setContentType method must throw an" +
-      " IllegalArgumentException if the content type set does not match (including wildcard matching) any of the content" +
-      " types returned by the getResponseContentType method of the PortleRequest object"),
-
-   JSR168_77(77, "If the getWriter or getPortletOutputStream methods are called before the" +
-      " setContentType method, they must throw an IllegalStateException."),
-
-   JSR168_78(78, "If the portlet has set a content type, the getContentType method must" +
-      " return it. Otherwise, the getContentType method must return null."),
-
-   JSR168_79(79, "A portlet may generate its content by writing to the OutputStream or to" +
-      " the Writer of the RenderResponse object. A portlet must use only one of these objects. The portlet container must" +
-      " throw an IllegalStateException if a portlet attempts to use both."),
-
-   JSR168_80(80, "The getBufferSize method returns the size of the underlying buffer being" +
-      " used. If no buffering is being used, this method must return the int value of 0 (zero)", Status.disabled("no buffering is implemented yet")),
-
-   JSR168_81(81, "The portlet can request a preferred buffer size by using the" +
-      " setBufferSize method. The buffer assigned is not required to be the size requested by the portlet, but must be at" +
-      " least as large as the size requested.", Status.disabled("no buffering is implemented yet")),
-
-   JSR168_82(82, "", Status.postponed("")),
-
-   JSR168_83(83, "If the response is committed and the reset or resetBuffer method is" +
-      " called, an IllegalStateException must be thrown.", Status.disabled("no buffering is implemented yet")),
-
-   JSR168_84(84, "", Status.postponed("")),
-
-   JSR168_85(85, "", Status.postponed("")),
-
-   JSR168_86(86, "The getNamespace method must provide the portlet with a mechanism that" +
-      " ensures the uniqueness of the returned string in the whole portal page"),
-
-   JSR168_87(87, "The getNamespace method must return the same value if invoked multiple" +
-      " times within a render request."),
-
-   JSR168_88(88, "The getNamespace method must return a valid identifier as defined in the" +
-      " 3.8 Identifier Section of the Java Language Specification Second Edition."),
-
-   JSR168_90(90, "Preference attributes are String array objects. Preferences attributes can" +
-      " be set to null."),
-
-   JSR168_91(91, "The getMap method returns an immutable Map of String keys and String[]" +
-      " values containing all current preference values. Preferences values must not be modified if the values in the Map" +
-      " are altered."),
-
-   // Does not cover restore to default test yet.
-   JSR168_92(92, "The reset method must reset a preference attribute to its default value." +
-      " If there is no default value, the preference attribute must be deleted."),
-
-   JSR168_93(93, "If a preference attribute is read only, the setValue, setValues and reset" +
-      " methods must throw a ReadOnlyException when the portlet is in any of the standard modes"),
-
-   JSR168_94(94, "", Status.disabled("Tested in every over case in this chapter... DONE")),
-
-   JSR168_95(95, "", Status.postponed("why?")),
-
-   JSR168_96(96, "All changes made to PortletPreferences object not followed by a call to" +
-      " the store method must be discarded when the portlet finishes the 20 processAction method."),
-
-   JSR168_97(97, "If the store method is invoked within the scope of a render method" +
-      " invocation, it must throw an IllegalStateException."),
-
-   JSR168_98(98, "", Status.postponed("why?")),
-
-   JSR168_99(99, "If a preference attribute definition does not contain the read-only" +
-      " element set to true, the preference attribute is modifiable when the portlet is processing an action request in" +
-      " any of the standard portlet modes (VIEW, EDIT or HELP)."),
-
-   JSR168_100(100, "Portlets are not restricted to use preference attributes defined in the" +
-      " deployment descriptor. They can programmatically add preference attributes using names not defined in the" +
-      " deployment descriptor. These preferences attributes must be treated as modifiable attributes."),
-
-   JSR168_101(101, "If a portlet definition includes a validator, the portlet container must" +
-      " create a single validator instance per portlet definition. (according to spec: Testable=false ;)"),
-
-   JSR168_102(102, "", Status.specUntestable("")),
-
-   JSR168_103(103, "When a validator is associated with the preferences of a portlet" +
-      " definition, the store method of the PortletPreferences implementation must invoke the validate method of the" +
-      " validator before writing the changes to the persistent store."),
-
-   JSR168_104(104, "If the validation fails, the PreferencesValidator implementation must" +
-      " throw a ValidatorException. If a ValidatorException is thrown, the portlet container must cancel the store" +
-      " operation and it must propagate the exception to the portlet"),
-
-   JSR168_105(105, "If the validation is successful, the store operation must be completed"),
-
-   JSR168_106(106, "For portlets within the same portlet application, a portlet container" +
-      " must ensure that every portlet request generated as result of a group of requests originated from the portal to" +
-      " complete a single client request receive or acquire the same session"),
-
-   JSR168_107(107, "In addition, if within these portlet requests more than one portlet" +
-      " creates a session, the session object must be the same for all the portlets in the same portlet application"),
-
-   JSR168_110(110, "Any object stored in the session using the APPLICATION_SCOPE is" +
-      " available to any other portlet that belongs to the same portlet application and that handles a request identified" +
-      " as being a part of the same session."),
-
-   JSR168_111(111, "Objects stored in the session using the PORTLET_SCOPE must be available" +
-      " to the portlet during requests for the same portlet window that the objects where stored from."),
-
-   JSR168_112(112, "The object must be stored in the APPLICATION_SCOPE with the following" +
-      " fabricated attribute name 'javax.portlet.p.<ID>?<ATTRIBUTE_NAME>'. <ID> is a unique identification for the portlet" +
-      " window (assigned by the portal/portlet-container) that must not contain a '?' character."),
-
-   JSR168_113(113, "The PortletSession must store all attributes in the HttpSession of the" +
-      " portlet application. A direct consequence of this is that data stored in the HttpSession by servlets or JSPs is" +
-      " accessible to portlets through the PortletSession in the portlet application scope."),
-
-   JSR168_114(114, "Conversely, data stored by portlets in the PortletSession in the portlet" +
-      " application scope is accessible to servlets and JSPs through the HttpSession."),
-
-   JSR168_115(115, "If the HttpSession object is invalidated, the PortletSession object must" +
-      " also be invalidated by the portlet container."),
-
-   JSR168_116(116, "If the PortletSession object is invalidated by a portlet, the portlet" +
-      " container must invalidate the associated HttpSession object."),
-
-   JSR168_117(117, "The attribute names must be the same if APPLICATION_SCOPE scope is" +
-      " used."),
-
-   JSR168_118(118, "The attribute name has to conform with the specified prefixing if" +
-      " PORTLET_SCOPE is used"),
-
-   JSR168_119(119, "The variant of these methods that does not receive a scope must be" +
-      " treated as PORTLET_SCOPE."),
-
-   JSR168_120(120, "", Status.jbossUntestable("why?")),
-
-   JSR168_121(121, "The getRequestDispatcher method takes a String argument describing a" +
-      " path within the scope of the PortletContext of a portlet application. This path must begin with a ‘/’ and it is" +
-      " relative to the PortletContext root."),
-
-   JSR168_122(122, "The getNamedDispatcher method takes a String argument indicating the" +
-      " name of a servlet known to the PortletContext of the portlet application. If no resource can be resolved based on" +
-      " the given path or name the methods must return null"),
-
-   JSR168_123(123, "The parameters associated with a PortletRequestDispatcher are scoped to" +
-      " apply only for the duration of the include call."),
-
-   JSR168_124(124, "To include a servlet or a JSP, a portlet calls the include method of the" +
-      " PortletRequestDispatcher interface. The parameters to these methods must be the request and response arguments" +
-      " that were passed in via the render method of the Portlet interface."),
-
-   JSR168_125(125, "The portlet container must ensure that the servlet or JSP called through" +
-      " a PortletRequestDispatcher is called in the same thread as the PortletRequestDispatcher include invocation."),
-
-   JSR168_126(126, "Servlets and JSPs included from portlets must be handled as HTTP GET requests."),
-
-   JSR168_127(127, "Except for servlets obtained by using the getNamedDispatcher method, a" +
-      " servlet or JSP being used from within an include call has access to the path used to obtain the" +
-      " PortletRequestDispatcher. The following request attributes must be set: javax.servlet.include.request_uri," +
-      " javax.servlet.include.context_path javax.servlet.include.servlet_path, javax.servlet.include.path_info," +
-      " javax.servlet.include.query_string"),
-
-   JSR168_128(128, "javax.portlet.config, javax.portlet.request, javax.portlet.response." +
-      " These attributes must be the same Portlet API objects accessible to the portlet doing the include call."),
-
-   JSR168_129(129, "The following methods of the HttpServletRequest must return null:" +
-      " getProtocol, getRemoteAddr, getRemoteHost, getRealPath, and getRequestURL."),
-
-   JSR168_130(130, "The following methods of the HttpServletRequest must return the path and"+
-      " query string information used to obtain the PortletRequestDispatcher object: getPathInfo, getPathTranslated,"+
-      " getQueryString, getRequestURI and getServletPath"),
-
-   JSR168_131(131, "The following methods of the HttpServletRequest must be equivalent to" +
-      " the methods of the PortletRequest of similar name: getScheme, getServerName,getServerPort, getAttribute," +
-      " getAttributeNames, setAttribute,removeAttribute, getLocale, getLocales, isSecure, getAuthType, getContextPath," +
-      " getRemoteUser, getUserPrincipal, getRequestedSessionId, isRequestedSessionIdValid"),
-
-   JSR168_132(132, "The following methods of the HttpServletRequest must be equivalent to" +
-      " the methods of the PortletRequest of similar name with the provision defined in PLT.16.1.1 Query Strings in" +
-      " Request Dispatcher Paths Section: getParameter, getParameterNames, getParameterValues and getParameterMap."),
-
-   JSR168_133(133, "The following methods of the HttpServletRequest must do no operations" +
-      " and return null: getCharacterEncoding, setCharacterEncoding, getContentType, getInputStream and getReader."),
-
-   JSR168_134(134, "The getContentLength method of the HttpServletRequest must return 0."),
-
-
-   JSR168_137(137, "The getMethod method of the HttpServletRequest must always return 'GET'"),
-
-   JSR168_138(138, "The following methods of the HttpServletResponse must return" +
-      " null:encodeRedirectURL and encodeRedirectUrl"),
-
-   JSR168_141(141, "The getLocale method of the HttpServletResponse must be based on the" +
-      " getLocale method of the RenderResponse."),
-
-   JSR168_142(142, "If the servlet or JSP that is the target of a request dispatcher throws" +
-      " a runtime exception or a checked exception of type IOException, it must be propagated to the calling portlet."),
-
-   JSR168_143(143, "All other exceptions, including a ServletException, must be wrapped with" +
-      " a PortletException. The root cause of the exception must be set to the original exception before being" +
-      " propagated."),
-
-   ;
-
-   public abstract static class Status
-   {
-      protected Status()
-      {
-      }
-
-      private static Inactive disabled(String cause)
-      {
-         return new Inactive(Inactive.Type.DISABLED, cause);
-      }
-
-      private static Inactive todo(String cause)
-      {
-         return new Inactive(Inactive.Type.TODO, cause);
-      }
-
-      private static Inactive postponed(String cause)
-      {
-         return new Inactive(Inactive.Type.POSTPONED, cause);
-      }
-
-      private static Inactive specUntestable(String cause)
-      {
-         return new Untestable(Untestable.Kind.SPEC, cause);
-      }
-
-      private static Inactive jbossUntestable(String cause)
-      {
-         return new Untestable(Untestable.Kind.JBOSS, cause);
-      }
-
-      private static Duplicate duplicate(TCKAssertion target, String description)
-      {
-         return new Duplicate(target, description);
-      }
-   }
-
-   public static class Active extends Status
-   {
-
-   }
-
-   public static class Inactive extends Status
-   {
-
-      /** . */
-      private final Type type;
-
-      /** . */
-      private final String msg;
-
-      public enum Type
-      {
-         POSTPONED, TODO, DISABLED, UNTESTABLE
-      }
-
-      public Inactive(Type type, String msg)
-      {
-         this.type = type;
-         this.msg = msg;
-      }
-
-      public Type getType()
-      {
-         return type;
-      }
-
-      public String getMessage()
-      {
-         return msg;
-      }
-   }
-
-   public static class Untestable extends Inactive
-   {
-
-      public enum Kind
-      {
-         JBOSS, SPEC
-      }
-
-      /** . */
-      private final Kind kind;
-
-      public Untestable(Kind kind, String msg)
-      {
-         super(Inactive.Type.UNTESTABLE, msg);
-
-         //
-         this.kind = kind;
-      }
-
-      public Kind getKind()
-      {
-         return kind;
-      }
-   }
-
-   public static class Duplicate extends Active
-   {
-
-      /** . */
-      private final TCKAssertion target;
-
-      /** . */
-      private final String description;
-
-      private Duplicate(TCKAssertion target, String description)
-      {
-         this.target = target;
-         this.description = description;
-      }
-
-      public TCKAssertion getTarget()
-      {
-         return target;
-      }
-
-      public String getDescription()
-      {
-         return description;
-      }
-   }
-
-   /** . */
-   private final int id;
-
-   /** . */
-   private final String description;
-
-   /** . */
-   private Status status;
-
-   TCKAssertion(int id, String description)
-   {
-      this(id, description, new Active());
-   }
-
-   TCKAssertion(int id, String description, Status status)
-   {
-      this.id = id;
-      this.description = description;
-      this.status = status;
-   }
-
-   public int getId()
-   {
-      return id;
-   }
-
-   public String getDescription()
-   {
-      return description;
-   }
-
-   public Status getStatus()
-   {
-      return status;
-   }
-}

Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TCK.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TCK.java	2007-11-07 14:52:33 UTC (rev 8836)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TCK.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -1,43 +0,0 @@
-/******************************************************************************
- * 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.unit.annotations;
-
-import org.jboss.portal.unit.TCKAssertion;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-/**
- * Annotates a portlet test for documenting its purpose with respect to the Java Portlet TCK. 
- *
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
- at Retention(RetentionPolicy.RUNTIME)
- at Target(ElementType.TYPE)
-public @interface TCK
-{
-   TCKAssertion[] value();
-}

Copied: modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TestCase.java (from rev 8834, modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TCK.java)
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TestCase.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/unit/annotations/TestCase.java	2007-11-07 15:15:08 UTC (rev 8837)
@@ -0,0 +1,46 @@
+/******************************************************************************
+ * 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.unit.annotations;
+
+import org.jboss.portal.unit.Assertion;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+/**
+ * Annotates a portlet test for documenting its purpose.. 
+ *
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target(ElementType.TYPE)
+public @interface TestCase
+{
+   /**
+    * The different assertions covered by this test case.
+    */
+   Assertion[] value();
+}




More information about the portal-commits mailing list