You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2014/09/01 15:29:54 UTC

[46/63] [abbrv] Moved filter test cases to proper filter method. Added keyword "Api" to test case names whose definitions were derived from the API documentation to allow targeted test runs for that group of tests.

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_CacheControl_ApiResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_CacheControl_ApiResource.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_CacheControl_ApiResource.java
new file mode 100644
index 0000000..5314bd4
--- /dev/null
+++ b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_CacheControl_ApiResource.java
@@ -0,0 +1,303 @@
+/*  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package javax.portlet.tck.portlets;
+
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+import static java.util.logging.Logger.*;
+import javax.xml.namespace.QName;
+import javax.portlet.*;
+import javax.portlet.filter.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.portlet.tck.beans.*;
+import javax.portlet.tck.constants.*;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.*;
+import static javax.portlet.tck.constants.Constants.*;
+import static javax.portlet.PortletSession.*;
+import static javax.portlet.ResourceURL.*;
+
+/**
+ * This portlet implements several test cases for the JSR 362 TCK. The test case names
+ * are defined in the /src/main/resources/xml-resources/additionalTCs.xml
+ * file. The build process will integrate the test case names defined in the 
+ * additionalTCs.xml file into the complete list of test case names for execution by the driver.
+ *
+ * This is the main portlet for the test cases. If the test cases call for events, this portlet
+ * will initiate the events, but not process them. The processing is done in the companion 
+ * portlet EnvironmentTests_CacheControl_ApiResource_event
+ *
+ */
+public class EnvironmentTests_CacheControl_ApiResource implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         EnvironmentTests_CacheControl_ApiResource.class.getName();
+   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+   
+   private PortletConfig portletConfig = null;
+
+   @Override
+   public void init(PortletConfig config) throws PortletException {
+      this.portletConfig = config;
+   }
+
+   @Override
+   public void destroy() {
+   }
+
+   @Override
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
+      portletResp.setRenderParameters(portletReq.getParameterMap());
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      PrintWriter writer = portletResp.getWriter();
+
+      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_getExpirationTime1 */
+      /* Details: "Method getExpirationTime(): Returns the expiration time    */
+      /* set through setExpirationTime"                                       */
+      TestResult tr0 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_GETEXPIRATIONTIME1);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_getExpirationTime2 */
+      /* Details: "Method getExpirationTime(): Returns the default            */
+      /* expiration time from the deployment descriptor if the expiration     */
+      /* time has not been set"                                               */
+      TestResult tr1 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_GETEXPIRATIONTIME2);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_getExpirationTime3 */
+      /* Details: "Method getExpirationTime(): Returns 0 if the expiration    */
+      /* time has not been set and no default is set in the deployment        */
+      /* descriptor"                                                          */
+      TestResult tr2 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_GETEXPIRATIONTIME3);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_setExpirationTime1 */
+      /* Details: "Method setExpirationTime(int): Sets the expiration time    */
+      /* for the current response to the specified value"                     */
+      TestResult tr3 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_SETEXPIRATIONTIME1);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_setExpirationTime2 */
+      /* Details: "Method setExpirationTime(int): If the expiration value     */
+      /* is set to 0, caching is disabled"                                    */
+      TestResult tr4 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_SETEXPIRATIONTIME2);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_setExpirationTime3 */
+      /* Details: "Method setExpirationTime(int): If the expiration value     */
+      /* is set to -1, the cache does not expire"                             */
+      TestResult tr5 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_SETEXPIRATIONTIME3);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_isPublicScope1 */
+      /* Details: "Method isPublicScope(): Returns true if the caching        */
+      /* scope has been set to public through the setPublicScope method"      */
+      TestResult tr6 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_ISPUBLICSCOPE1);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_isPublicScope2 */
+      /* Details: "Method isPublicScope(): Returns true if the caching        */
+      /* scope default has not been set with the setPublicScope method, but   */
+      /* has been set to public in the deployment descriptor "                */
+      TestResult tr7 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_ISPUBLICSCOPE2);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_isPublicScope3 */
+      /* Details: "Method isPublicScope(): Returns false if the caching       */
+      /* scope has not been set with the setPublicScope method, but has       */
+      /* been set to private through the setPublicScope method "              */
+      TestResult tr8 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_ISPUBLICSCOPE3);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_isPublicScope5 */
+      /* Details: "Method isPublicScope(): Returns false if the caching       */
+      /* scope has not been set with the setPublicScope method and has not    */
+      /* been set in the deployment descriptor"                               */
+      TestResult tr9 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_ISPUBLICSCOPE5);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_setPublicScope1 */
+      /* Details: "Method setPublicScope(boolean): If the input parameter     */
+      /* is true, the cache scope is set to public"                           */
+      TestResult tr10 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_SETPUBLICSCOPE1);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_setPublicScope2 */
+      /* Details: "Method setPublicScope(boolean): If the input parameter     */
+      /* is false, the cache scope is set to non-public"                      */
+      TestResult tr11 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_SETPUBLICSCOPE2);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_getETag1       */
+      /* Details: "Method getETag(): Returns a String containing the ETag     */
+      /* for the current response"                                            */
+      TestResult tr12 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_GETETAG1);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_getETag2       */
+      /* Details: "Method getETag(): Returns null if no ETag is set on the    */
+      /* response"                                                            */
+      TestResult tr13 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_GETETAG2);
+      /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_setETag1       */
+      /* Details: "Method setETag(String): Sets an ETag for the current       */
+      /* response"                                                            */
+      TestResult tr14 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_SETETAG1);
+      /* TODO: implement test */
+      tr14.appendTcDetail("Not implemented.");
+      tr14.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_setETag2       */
+      /* Details: "Method setETag(String): A previously-set ETag is           */
+      /* overwritten"                                                         */
+      TestResult tr15 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_SETETAG2);
+      /* TODO: implement test */
+      tr15.appendTcDetail("Not implemented.");
+      tr15.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_setETag3       */
+      /* Details: "Method setETag(String): Removes the ETag if the input      */
+      /* parameter is null"                                                   */
+      TestResult tr16 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_SETETAG3);
+      /* TODO: implement test */
+      tr16.appendTcDetail("Not implemented.");
+      tr16.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_useCachedContent1 */
+      /* Details: "Method useCachedContent(): Returns true if cached          */
+      /* content has been set to valid through the setUseCachedContent        */
+      /* method"                                                              */
+      TestResult tr17 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_USECACHEDCONTENT1);
+      /* TODO: implement test */
+      tr17.appendTcDetail("Not implemented.");
+      tr17.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_useCachedContent2 */
+      /* Details: "Method useCachedContent(): Returns false if cached         */
+      /* content has been set to invalid through the setUseCachedContent      */
+      /* method"                                                              */
+      TestResult tr18 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_USECACHEDCONTENT2);
+      /* TODO: implement test */
+      tr18.appendTcDetail("Not implemented.");
+      tr18.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_useCachedContent3 */
+      /* Details: "Method useCachedContent(): Returns false if the use        */
+      /* cached content indcator has not been set"                            */
+      TestResult tr19 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_USECACHEDCONTENT3);
+      /* TODO: implement test */
+      tr19.appendTcDetail("Not implemented.");
+      tr19.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_setUseCachedContent1 */
+      /* Details: "Method setUseCachedContent(boolean): If set to true, the   */
+      /* cached content is valid "                                            */
+      TestResult tr20 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_SETUSECACHEDCONTENT1);
+      /* TODO: implement test */
+      tr20.appendTcDetail("Not implemented.");
+      tr20.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_CacheControl_ApiResource_setUseCachedContent2 */
+      /* Details: "Method setUseCachedContent(boolean): If set to false,      */
+      /* the cached content is invalid "                                      */
+      TestResult tr21 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_APIRESOURCE_SETUSECACHEDCONTENT2);
+      /* TODO: implement test */
+      tr21.appendTcDetail("Not implemented.");
+      tr21.writeTo(writer);
+
+   }
+
+   @Override
+   public void render(RenderRequest portletReq, RenderResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      PrintWriter writer = portletResp.getWriter();
+
+      writer.write("<div id=\"EnvironmentTests_CacheControl_ApiResource\">no resource output.</div>\n");
+      ResourceURL resurl = portletResp.createResourceURL();
+      resurl.setCacheability(PAGE);
+      writer.write("<script>\n");
+      writer.write("(function () {\n");
+      writer.write("   var xhr = new XMLHttpRequest();\n");
+      writer.write("   xhr.onreadystatechange=function() {\n");
+      writer.write("      if (xhr.readyState==4 && xhr.status==200) {\n");
+      writer.write("         document.getElementById(\"EnvironmentTests_CacheControl_ApiResource\").innerHTML=xhr.responseText;\n");
+      writer.write("      }\n");
+      writer.write("   };\n");
+      writer.write("   xhr.open(\"GET\",\"" + resurl.toString() + "\",true);\n");
+      writer.write("   xhr.send();\n");
+      writer.write("})();\n");
+      writer.write("</script>\n");
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_CacheControl_Render.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_CacheControl_Render.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_CacheControl_Render.java
deleted file mode 100644
index 5a9def7..0000000
--- a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_CacheControl_Render.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package javax.portlet.tck.portlets;
-
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
-import javax.xml.namespace.QName;
-import javax.portlet.*;
-import javax.portlet.filter.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
-
-/**
- * This portlet implements several test cases for the JSR 362 TCK. The test case names
- * are defined in the /src/main/resources/xml-resources/additionalTCs.xml
- * file. The build process will integrate the test case names defined in the 
- * additionalTCs.xml file into the complete list of test case names for execution by the driver.
- *
- * This is the main portlet for the test cases. If the test cases call for events, this portlet
- * will initiate the events, but not process them. The processing is done in the companion 
- * portlet EnvironmentTests_CacheControl_Render_event
- *
- */
-public class EnvironmentTests_CacheControl_Render implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         EnvironmentTests_CacheControl_Render.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
-   private PortletConfig portletConfig = null;
-
-   @Override
-   public void init(PortletConfig config) throws PortletException {
-      this.portletConfig = config;
-   }
-
-   @Override
-   public void destroy() {
-   }
-
-   @Override
-   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
-
-      portletResp.setRenderParameters(portletReq.getParameterMap());
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute(THREADID_ATTR, tid);
-
-      StringWriter writer = new StringWriter();
-
-   }
-
-   @Override
-   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
-
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute(THREADID_ATTR, tid);
-
-      PrintWriter writer = portletResp.getWriter();
-
-   }
-
-   @Override
-   public void render(RenderRequest portletReq, RenderResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
-
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute(THREADID_ATTR, tid);
-
-      PrintWriter writer = portletResp.getWriter();
-
-      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-
-      // Create result objects for the tests
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_getExpirationTime1  */
-      /* Details: "Method getExpirationTime(): Returns the expiration time    */
-      /* set through setExpirationTime"                                       */
-      TestResult tr0 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_GETEXPIRATIONTIME1);
-      /* TODO: implement test */
-      tr0.appendTcDetail("Not implemented.");
-      tr0.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_getExpirationTime2  */
-      /* Details: "Method getExpirationTime(): Returns the default            */
-      /* expiration time from the deployment descriptor if the expiration     */
-      /* time has not been set"                                               */
-      TestResult tr1 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_GETEXPIRATIONTIME2);
-      /* TODO: implement test */
-      tr1.appendTcDetail("Not implemented.");
-      tr1.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_getExpirationTime3  */
-      /* Details: "Method getExpirationTime(): Returns 0 if the expiration    */
-      /* time has not been set and no default is set in the deployment        */
-      /* descriptor"                                                          */
-      TestResult tr2 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_GETEXPIRATIONTIME3);
-      /* TODO: implement test */
-      tr2.appendTcDetail("Not implemented.");
-      tr2.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_setExpirationTime1  */
-      /* Details: "Method setExpirationTime(int): Sets the expiration time    */
-      /* for the current response to the specified value"                     */
-      TestResult tr3 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_SETEXPIRATIONTIME1);
-      /* TODO: implement test */
-      tr3.appendTcDetail("Not implemented.");
-      tr3.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_setExpirationTime2  */
-      /* Details: "Method setExpirationTime(int): If the expiration value     */
-      /* is set to 0, caching is disabled"                                    */
-      TestResult tr4 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_SETEXPIRATIONTIME2);
-      /* TODO: implement test */
-      tr4.appendTcDetail("Not implemented.");
-      tr4.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_setExpirationTime3  */
-      /* Details: "Method setExpirationTime(int): If the expiration value     */
-      /* is set to -1, the cache does not expire"                             */
-      TestResult tr5 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_SETEXPIRATIONTIME3);
-      /* TODO: implement test */
-      tr5.appendTcDetail("Not implemented.");
-      tr5.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_isPublicScope1      */
-      /* Details: "Method isPublicScope(): Returns true if the caching        */
-      /* scope has been set to public through the setPublicScope method"      */
-      TestResult tr6 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_ISPUBLICSCOPE1);
-      /* TODO: implement test */
-      tr6.appendTcDetail("Not implemented.");
-      tr6.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_isPublicScope2      */
-      /* Details: "Method isPublicScope(): Returns true if the caching        */
-      /* scope default has not been set with the setPublicScope method, but   */
-      /* has been set to public in the deployment descriptor "                */
-      TestResult tr7 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_ISPUBLICSCOPE2);
-      /* TODO: implement test */
-      tr7.appendTcDetail("Not implemented.");
-      tr7.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_isPublicScope3      */
-      /* Details: "Method isPublicScope(): Returns false if the caching       */
-      /* scope has not been set with the setPublicScope method, but has       */
-      /* been set to private through the setPublicScope method "              */
-      TestResult tr8 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_ISPUBLICSCOPE3);
-      /* TODO: implement test */
-      tr8.appendTcDetail("Not implemented.");
-      tr8.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_isPublicScope5      */
-      /* Details: "Method isPublicScope(): Returns false if the caching       */
-      /* scope has not been set with the setPublicScope method and has not    */
-      /* been set in the deployment descriptor"                               */
-      TestResult tr9 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_ISPUBLICSCOPE5);
-      /* TODO: implement test */
-      tr9.appendTcDetail("Not implemented.");
-      tr9.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_setPublicScope1     */
-      /* Details: "Method setPublicScope(boolean): If the input parameter     */
-      /* is true, the cache scope is set to public"                           */
-      TestResult tr10 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_SETPUBLICSCOPE1);
-      /* TODO: implement test */
-      tr10.appendTcDetail("Not implemented.");
-      tr10.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_setPublicScope2     */
-      /* Details: "Method setPublicScope(boolean): If the input parameter     */
-      /* is false, the cache scope is set to non-public"                      */
-      TestResult tr11 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_SETPUBLICSCOPE2);
-      /* TODO: implement test */
-      tr11.appendTcDetail("Not implemented.");
-      tr11.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_getETag1            */
-      /* Details: "Method getETag(): Returns a String containing the ETag     */
-      /* for the current response"                                            */
-      TestResult tr12 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_GETETAG1);
-      /* TODO: implement test */
-      tr12.appendTcDetail("Not implemented.");
-      tr12.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_getETag2            */
-      /* Details: "Method getETag(): Returns null if no ETag is set on the    */
-      /* response"                                                            */
-      TestResult tr13 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_GETETAG2);
-      /* TODO: implement test */
-      tr13.appendTcDetail("Not implemented.");
-      tr13.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_setETag1            */
-      /* Details: "Method setETag(String): Sets an ETag for the current       */
-      /* response"                                                            */
-      TestResult tr14 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_SETETAG1);
-      /* TODO: implement test */
-      tr14.appendTcDetail("Not implemented.");
-      tr14.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_setETag2            */
-      /* Details: "Method setETag(String): A previously-set ETag is           */
-      /* overwritten"                                                         */
-      TestResult tr15 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_SETETAG2);
-      /* TODO: implement test */
-      tr15.appendTcDetail("Not implemented.");
-      tr15.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_setETag3            */
-      /* Details: "Method setETag(String): Removes the ETag if the input      */
-      /* parameter is null"                                                   */
-      TestResult tr16 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_SETETAG3);
-      /* TODO: implement test */
-      tr16.appendTcDetail("Not implemented.");
-      tr16.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_useCachedContent1   */
-      /* Details: "Method useCachedContent(): Returns true if cached          */
-      /* content has been set to valid through the setUseCachedContent        */
-      /* method"                                                              */
-      TestResult tr17 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_USECACHEDCONTENT1);
-      /* TODO: implement test */
-      tr17.appendTcDetail("Not implemented.");
-      tr17.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_useCachedContent2   */
-      /* Details: "Method useCachedContent(): Returns false if cached         */
-      /* content has been set to invalid through the setUseCachedContent      */
-      /* method"                                                              */
-      TestResult tr18 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_USECACHEDCONTENT2);
-      /* TODO: implement test */
-      tr18.appendTcDetail("Not implemented.");
-      tr18.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_useCachedContent3   */
-      /* Details: "Method useCachedContent(): Returns false if the use        */
-      /* cached content indcator has not been set"                            */
-      TestResult tr19 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_USECACHEDCONTENT3);
-      /* TODO: implement test */
-      tr19.appendTcDetail("Not implemented.");
-      tr19.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_setUseCachedContent1 */
-      /* Details: "Method setUseCachedContent(boolean): If set to true, the   */
-      /* cached content is valid "                                            */
-      TestResult tr20 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_SETUSECACHEDCONTENT1);
-      /* TODO: implement test */
-      tr20.appendTcDetail("Not implemented.");
-      tr20.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Render_setUseCachedContent2 */
-      /* Details: "Method setUseCachedContent(boolean): If set to false,      */
-      /* the cached content is invalid "                                      */
-      TestResult tr21 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RENDER_SETUSECACHEDCONTENT2);
-      /* TODO: implement test */
-      tr21.appendTcDetail("Not implemented.");
-      tr21.writeTo(writer);
-
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_CacheControl_Resource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_CacheControl_Resource.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_CacheControl_Resource.java
deleted file mode 100644
index 7e10e75..0000000
--- a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_CacheControl_Resource.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package javax.portlet.tck.portlets;
-
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
-import javax.xml.namespace.QName;
-import javax.portlet.*;
-import javax.portlet.filter.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
-
-/**
- * This portlet implements several test cases for the JSR 362 TCK. The test case names
- * are defined in the /src/main/resources/xml-resources/additionalTCs.xml
- * file. The build process will integrate the test case names defined in the 
- * additionalTCs.xml file into the complete list of test case names for execution by the driver.
- *
- * This is the main portlet for the test cases. If the test cases call for events, this portlet
- * will initiate the events, but not process them. The processing is done in the companion 
- * portlet EnvironmentTests_CacheControl_Resource_event
- *
- */
-public class EnvironmentTests_CacheControl_Resource implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         EnvironmentTests_CacheControl_Resource.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
-   private PortletConfig portletConfig = null;
-
-   @Override
-   public void init(PortletConfig config) throws PortletException {
-      this.portletConfig = config;
-   }
-
-   @Override
-   public void destroy() {
-   }
-
-   @Override
-   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
-
-      portletResp.setRenderParameters(portletReq.getParameterMap());
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute(THREADID_ATTR, tid);
-
-      StringWriter writer = new StringWriter();
-
-   }
-
-   @Override
-   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
-
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute(THREADID_ATTR, tid);
-
-      PrintWriter writer = portletResp.getWriter();
-
-      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-
-      // Create result objects for the tests
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_getExpirationTime1 */
-      /* Details: "Method getExpirationTime(): Returns the expiration time    */
-      /* set through setExpirationTime"                                       */
-      TestResult tr0 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_GETEXPIRATIONTIME1);
-      /* TODO: implement test */
-      tr0.appendTcDetail("Not implemented.");
-      tr0.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_getExpirationTime2 */
-      /* Details: "Method getExpirationTime(): Returns the default            */
-      /* expiration time from the deployment descriptor if the expiration     */
-      /* time has not been set"                                               */
-      TestResult tr1 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_GETEXPIRATIONTIME2);
-      /* TODO: implement test */
-      tr1.appendTcDetail("Not implemented.");
-      tr1.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_getExpirationTime3 */
-      /* Details: "Method getExpirationTime(): Returns 0 if the expiration    */
-      /* time has not been set and no default is set in the deployment        */
-      /* descriptor"                                                          */
-      TestResult tr2 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_GETEXPIRATIONTIME3);
-      /* TODO: implement test */
-      tr2.appendTcDetail("Not implemented.");
-      tr2.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_setExpirationTime1 */
-      /* Details: "Method setExpirationTime(int): Sets the expiration time    */
-      /* for the current response to the specified value"                     */
-      TestResult tr3 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_SETEXPIRATIONTIME1);
-      /* TODO: implement test */
-      tr3.appendTcDetail("Not implemented.");
-      tr3.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_setExpirationTime2 */
-      /* Details: "Method setExpirationTime(int): If the expiration value     */
-      /* is set to 0, caching is disabled"                                    */
-      TestResult tr4 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_SETEXPIRATIONTIME2);
-      /* TODO: implement test */
-      tr4.appendTcDetail("Not implemented.");
-      tr4.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_setExpirationTime3 */
-      /* Details: "Method setExpirationTime(int): If the expiration value     */
-      /* is set to -1, the cache does not expire"                             */
-      TestResult tr5 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_SETEXPIRATIONTIME3);
-      /* TODO: implement test */
-      tr5.appendTcDetail("Not implemented.");
-      tr5.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_isPublicScope1    */
-      /* Details: "Method isPublicScope(): Returns true if the caching        */
-      /* scope has been set to public through the setPublicScope method"      */
-      TestResult tr6 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_ISPUBLICSCOPE1);
-      /* TODO: implement test */
-      tr6.appendTcDetail("Not implemented.");
-      tr6.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_isPublicScope2    */
-      /* Details: "Method isPublicScope(): Returns true if the caching        */
-      /* scope default has not been set with the setPublicScope method, but   */
-      /* has been set to public in the deployment descriptor "                */
-      TestResult tr7 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_ISPUBLICSCOPE2);
-      /* TODO: implement test */
-      tr7.appendTcDetail("Not implemented.");
-      tr7.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_isPublicScope3    */
-      /* Details: "Method isPublicScope(): Returns false if the caching       */
-      /* scope has not been set with the setPublicScope method, but has       */
-      /* been set to private through the setPublicScope method "              */
-      TestResult tr8 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_ISPUBLICSCOPE3);
-      /* TODO: implement test */
-      tr8.appendTcDetail("Not implemented.");
-      tr8.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_isPublicScope5    */
-      /* Details: "Method isPublicScope(): Returns false if the caching       */
-      /* scope has not been set with the setPublicScope method and has not    */
-      /* been set in the deployment descriptor"                               */
-      TestResult tr9 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_ISPUBLICSCOPE5);
-      /* TODO: implement test */
-      tr9.appendTcDetail("Not implemented.");
-      tr9.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_setPublicScope1   */
-      /* Details: "Method setPublicScope(boolean): If the input parameter     */
-      /* is true, the cache scope is set to public"                           */
-      TestResult tr10 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_SETPUBLICSCOPE1);
-      /* TODO: implement test */
-      tr10.appendTcDetail("Not implemented.");
-      tr10.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_setPublicScope2   */
-      /* Details: "Method setPublicScope(boolean): If the input parameter     */
-      /* is false, the cache scope is set to non-public"                      */
-      TestResult tr11 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_SETPUBLICSCOPE2);
-      /* TODO: implement test */
-      tr11.appendTcDetail("Not implemented.");
-      tr11.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_getETag1          */
-      /* Details: "Method getETag(): Returns a String containing the ETag     */
-      /* for the current response"                                            */
-      TestResult tr12 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_GETETAG1);
-      /* TODO: implement test */
-      tr12.appendTcDetail("Not implemented.");
-      tr12.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_getETag2          */
-      /* Details: "Method getETag(): Returns null if no ETag is set on the    */
-      /* response"                                                            */
-      TestResult tr13 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_GETETAG2);
-      /* TODO: implement test */
-      tr13.appendTcDetail("Not implemented.");
-      tr13.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_setETag1          */
-      /* Details: "Method setETag(String): Sets an ETag for the current       */
-      /* response"                                                            */
-      TestResult tr14 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_SETETAG1);
-      /* TODO: implement test */
-      tr14.appendTcDetail("Not implemented.");
-      tr14.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_setETag2          */
-      /* Details: "Method setETag(String): A previously-set ETag is           */
-      /* overwritten"                                                         */
-      TestResult tr15 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_SETETAG2);
-      /* TODO: implement test */
-      tr15.appendTcDetail("Not implemented.");
-      tr15.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_setETag3          */
-      /* Details: "Method setETag(String): Removes the ETag if the input      */
-      /* parameter is null"                                                   */
-      TestResult tr16 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_SETETAG3);
-      /* TODO: implement test */
-      tr16.appendTcDetail("Not implemented.");
-      tr16.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_useCachedContent1 */
-      /* Details: "Method useCachedContent(): Returns true if cached          */
-      /* content has been set to valid through the setUseCachedContent        */
-      /* method"                                                              */
-      TestResult tr17 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_USECACHEDCONTENT1);
-      /* TODO: implement test */
-      tr17.appendTcDetail("Not implemented.");
-      tr17.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_useCachedContent2 */
-      /* Details: "Method useCachedContent(): Returns false if cached         */
-      /* content has been set to invalid through the setUseCachedContent      */
-      /* method"                                                              */
-      TestResult tr18 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_USECACHEDCONTENT2);
-      /* TODO: implement test */
-      tr18.appendTcDetail("Not implemented.");
-      tr18.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_useCachedContent3 */
-      /* Details: "Method useCachedContent(): Returns false if the use        */
-      /* cached content indcator has not been set"                            */
-      TestResult tr19 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_USECACHEDCONTENT3);
-      /* TODO: implement test */
-      tr19.appendTcDetail("Not implemented.");
-      tr19.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_setUseCachedContent1 */
-      /* Details: "Method setUseCachedContent(boolean): If set to true, the   */
-      /* cached content is valid "                                            */
-      TestResult tr20 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_SETUSECACHEDCONTENT1);
-      /* TODO: implement test */
-      tr20.appendTcDetail("Not implemented.");
-      tr20.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_CacheControl_Resource_setUseCachedContent2 */
-      /* Details: "Method setUseCachedContent(boolean): If set to false,      */
-      /* the cached content is invalid "                                      */
-      TestResult tr21 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_CACHECONTROL_RESOURCE_SETUSECACHEDCONTENT2);
-      /* TODO: implement test */
-      tr21.appendTcDetail("Not implemented.");
-      tr21.writeTo(writer);
-
-   }
-
-   @Override
-   public void render(RenderRequest portletReq, RenderResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
-
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute(THREADID_ATTR, tid);
-
-      PrintWriter writer = portletResp.getWriter();
-
-      writer.write("<div id=\"EnvironmentTests_CacheControl_Resource\">no resource output.</div>\n");
-      ResourceURL resurl = portletResp.createResourceURL();
-      resurl.setCacheability(PAGE);
-      writer.write("<script>\n");
-      writer.write("(function () {\n");
-      writer.write("   var xhr = new XMLHttpRequest();\n");
-      writer.write("   xhr.onreadystatechange=function() {\n");
-      writer.write("      if (xhr.readyState==4 && xhr.status==200) {\n");
-      writer.write("         document.getElementById(\"EnvironmentTests_CacheControl_Resource\").innerHTML=xhr.responseText;\n");
-      writer.write("      }\n");
-      writer.write("   };\n");
-      writer.write("   xhr.open(\"GET\",\"" + resurl.toString() + "\",true);\n");
-      writer.write("   xhr.send();\n");
-      writer.write("})();\n");
-      writer.write("</script>\n");
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortalContext_ApiRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortalContext_ApiRender.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortalContext_ApiRender.java
new file mode 100644
index 0000000..34aa004
--- /dev/null
+++ b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortalContext_ApiRender.java
@@ -0,0 +1,261 @@
+/*  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package javax.portlet.tck.portlets;
+
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+import static java.util.logging.Logger.*;
+import javax.xml.namespace.QName;
+import javax.portlet.*;
+import javax.portlet.filter.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.portlet.tck.beans.*;
+import javax.portlet.tck.constants.*;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.*;
+import static javax.portlet.tck.constants.Constants.*;
+import static javax.portlet.PortletSession.*;
+import static javax.portlet.ResourceURL.*;
+
+/**
+ * This portlet implements several test cases for the JSR 362 TCK. The test case names
+ * are defined in the /src/main/resources/xml-resources/additionalTCs.xml
+ * file. The build process will integrate the test case names defined in the 
+ * additionalTCs.xml file into the complete list of test case names for execution by the driver.
+ *
+ * This is the main portlet for the test cases. If the test cases call for events, this portlet
+ * will initiate the events, but not process them. The processing is done in the companion 
+ * portlet EnvironmentTests_PortalContext_ApiRender_event
+ *
+ */
+public class EnvironmentTests_PortalContext_ApiRender implements Portlet, ResourceServingPortlet {
+   private static final String LOG_CLASS = 
+         EnvironmentTests_PortalContext_ApiRender.class.getName();
+   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+   
+   private PortletConfig portletConfig = null;
+
+   @Override
+   public void init(PortletConfig config) throws PortletException {
+      this.portletConfig = config;
+   }
+
+   @Override
+   public void destroy() {
+   }
+
+   @Override
+   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
+      portletResp.setRenderParameters(portletReq.getParameterMap());
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      StringWriter writer = new StringWriter();
+
+   }
+
+   @Override
+   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      PrintWriter writer = portletResp.getWriter();
+
+   }
+
+   @Override
+   public void render(RenderRequest portletReq, RenderResponse portletResp)
+         throws PortletException, IOException {
+      LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
+      long tid = Thread.currentThread().getId();
+      portletReq.setAttribute(THREADID_ATTR, tid);
+
+      PrintWriter writer = portletResp.getWriter();
+
+      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
+
+      // Create result objects for the tests
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_fieldMARKUP_HEAD_ELEMENT_SUPPORT */
+      /* Details: "Has String field MARKUP_HEAD_ELEMENT_SUPPORT with value    */
+      /* of \"javax.portlet.markup.head.element.support\" "                   */
+      TestResult tr0 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_FIELDMARKUP_HEAD_ELEMENT_SUPPORT);
+      /* TODO: implement test */
+      tr0.appendTcDetail("Not implemented.");
+      tr0.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getProperty1    */
+      /* Details: "Method getProperty(String): Returns a String containing    */
+      /* the value for the specified property "                               */
+      TestResult tr1 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETPROPERTY1);
+      /* TODO: implement test */
+      tr1.appendTcDetail("Not implemented.");
+      tr1.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getProperty2    */
+      /* Details: "Method getProperty(String): Returns null if there is no    */
+      /* property defined for the specified name"                             */
+      TestResult tr2 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETPROPERTY2);
+      /* TODO: implement test */
+      tr2.appendTcDetail("Not implemented.");
+      tr2.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getProperty3    */
+      /* Details: "Method getProperty(String): Throws                         */
+      /* IllegalArgumentException if the specified name is null "             */
+      TestResult tr3 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETPROPERTY3);
+      /* TODO: implement test */
+      tr3.appendTcDetail("Not implemented.");
+      tr3.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getPropertyNames1 */
+      /* Details: "Method getPropertyNames(): Returns an                      */
+      /* java.util.Enumeration&lt;java.lang.String&gt; containing all         */
+      /* portal property names"                                               */
+      TestResult tr4 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETPROPERTYNAMES1);
+      /* TODO: implement test */
+      tr4.appendTcDetail("Not implemented.");
+      tr4.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getPropertyNames2 */
+      /* Details: "Method getPropertyNames(): Returns an empty Enumeration    */
+      /* if there are no portal property names defined"                       */
+      TestResult tr5 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETPROPERTYNAMES2);
+      /* TODO: implement test */
+      tr5.appendTcDetail("Not implemented.");
+      tr5.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getSupportedPortletModes1 */
+      /* Details: "Method getSupportedPortletModes(): Returns an              */
+      /* java.util.Enumeration&lt;PortletMode&gt; containing all supported    */
+      /* portlet modes"                                                       */
+      TestResult tr6 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETSUPPORTEDPORTLETMODES1);
+      /* TODO: implement test */
+      tr6.appendTcDetail("Not implemented.");
+      tr6.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getSupportedPortletModes2 */
+      /* Details: "Method getSupportedPortletModes(): The Enumeration         */
+      /* returned must contain the view mode"                                 */
+      TestResult tr7 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETSUPPORTEDPORTLETMODES2);
+      /* TODO: implement test */
+      tr7.appendTcDetail("Not implemented.");
+      tr7.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getSupportedPortletModes3 */
+      /* Details: "Method getSupportedPortletModes(): The Enumeration         */
+      /* returned must contain the edit mode"                                 */
+      TestResult tr8 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETSUPPORTEDPORTLETMODES3);
+      /* TODO: implement test */
+      tr8.appendTcDetail("Not implemented.");
+      tr8.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getSupportedPortletModes4 */
+      /* Details: "Method getSupportedPortletModes(): The Enumeration         */
+      /* returned must contain the help mode"                                 */
+      TestResult tr9 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETSUPPORTEDPORTLETMODES4);
+      /* TODO: implement test */
+      tr9.appendTcDetail("Not implemented.");
+      tr9.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getSupportedWindowStates1 */
+      /* Details: "Method getSupportedWindowStates(): Returns an              */
+      /* java.util.Enumeration&lt;WindowState&gt; containing all supported    */
+      /* window states"                                                       */
+      TestResult tr10 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETSUPPORTEDWINDOWSTATES1);
+      /* TODO: implement test */
+      tr10.appendTcDetail("Not implemented.");
+      tr10.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getSupportedWindowStates2 */
+      /* Details: "Method getSupportedWindowStates(): The Enumeration         */
+      /* returned must contain the maximized state"                           */
+      TestResult tr11 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETSUPPORTEDWINDOWSTATES2);
+      /* TODO: implement test */
+      tr11.appendTcDetail("Not implemented.");
+      tr11.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getSupportedWindowStates3 */
+      /* Details: "Method getSupportedWindowStates(): The Enumeration         */
+      /* returned must contain the minimized state"                           */
+      TestResult tr12 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETSUPPORTEDWINDOWSTATES3);
+      /* TODO: implement test */
+      tr12.appendTcDetail("Not implemented.");
+      tr12.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getSupportedWindowStates4 */
+      /* Details: "Method getSupportedWindowStates(): The Enumeration         */
+      /* returned must contain the normal state"                              */
+      TestResult tr13 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETSUPPORTEDWINDOWSTATES4);
+      /* TODO: implement test */
+      tr13.appendTcDetail("Not implemented.");
+      tr13.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getPortalInfo1  */
+      /* Details: "Method getPortalInfo(): Returns a String containing        */
+      /* information about the portal"                                        */
+      TestResult tr14 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETPORTALINFO1);
+      /* TODO: implement test */
+      tr14.appendTcDetail("Not implemented.");
+      tr14.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getPortalInfo2  */
+      /* Details: "Method getPortalInfo(): The returned string is of the      */
+      /* form \"([^ ]+)/([^ ]+) *(.*)\", where $1 is the portal name, $2 is   */
+      /* the version, and $3 is optional additional information"              */
+      TestResult tr15 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETPORTALINFO2);
+      /* TODO: implement test */
+      tr15.appendTcDetail("Not implemented.");
+      tr15.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getPortalInfo3  */
+      /* Details: "Method getPortalInfo(): The returned string contains the   */
+      /* portal name"                                                         */
+      TestResult tr16 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETPORTALINFO3);
+      /* TODO: implement test */
+      tr16.appendTcDetail("Not implemented.");
+      tr16.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getPortalInfo4  */
+      /* Details: "Method getPortalInfo(): The returned string contains the   */
+      /* portal version"                                                      */
+      TestResult tr17 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETPORTALINFO4);
+      /* TODO: implement test */
+      tr17.appendTcDetail("Not implemented.");
+      tr17.writeTo(writer);
+
+      /* TestCase: V2EnvironmentTests_PortalContext_ApiRender_getPortalInfo5  */
+      /* Details: "Method getPortalInfo(): The returned string may not be     */
+      /* null"                                                                */
+      TestResult tr18 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_APIRENDER_GETPORTALINFO5);
+      /* TODO: implement test */
+      tr18.appendTcDetail("Not implemented.");
+      tr18.writeTo(writer);
+
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/db1071e7/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortalContext_Render.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortalContext_Render.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortalContext_Render.java
deleted file mode 100644
index 86b5c71..0000000
--- a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortalContext_Render.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package javax.portlet.tck.portlets;
-
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import static java.util.logging.Logger.*;
-import javax.xml.namespace.QName;
-import javax.portlet.*;
-import javax.portlet.filter.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.portlet.tck.beans.*;
-import javax.portlet.tck.constants.*;
-import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
-
-/**
- * This portlet implements several test cases for the JSR 362 TCK. The test case names
- * are defined in the /src/main/resources/xml-resources/additionalTCs.xml
- * file. The build process will integrate the test case names defined in the 
- * additionalTCs.xml file into the complete list of test case names for execution by the driver.
- *
- * This is the main portlet for the test cases. If the test cases call for events, this portlet
- * will initiate the events, but not process them. The processing is done in the companion 
- * portlet EnvironmentTests_PortalContext_Render_event
- *
- */
-public class EnvironmentTests_PortalContext_Render implements Portlet, ResourceServingPortlet {
-   private static final String LOG_CLASS = 
-         EnvironmentTests_PortalContext_Render.class.getName();
-   private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
-   private PortletConfig portletConfig = null;
-
-   @Override
-   public void init(PortletConfig config) throws PortletException {
-      this.portletConfig = config;
-   }
-
-   @Override
-   public void destroy() {
-   }
-
-   @Override
-   public void processAction(ActionRequest portletReq, ActionResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
-
-      portletResp.setRenderParameters(portletReq.getParameterMap());
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute(THREADID_ATTR, tid);
-
-      StringWriter writer = new StringWriter();
-
-   }
-
-   @Override
-   public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
-
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute(THREADID_ATTR, tid);
-
-      PrintWriter writer = portletResp.getWriter();
-
-   }
-
-   @Override
-   public void render(RenderRequest portletReq, RenderResponse portletResp)
-         throws PortletException, IOException {
-      LOGGER.entering(LOG_CLASS, "main portlet render entry");
-
-      long tid = Thread.currentThread().getId();
-      portletReq.setAttribute(THREADID_ATTR, tid);
-
-      PrintWriter writer = portletResp.getWriter();
-
-      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-
-      // Create result objects for the tests
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_fieldMARKUP_HEAD_ELEMENT_SUPPORT */
-      /* Details: "Has String field MARKUP_HEAD_ELEMENT_SUPPORT with value    */
-      /* of \"javax.portlet.markup.head.element.support\" "                   */
-      TestResult tr0 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_FIELDMARKUP_HEAD_ELEMENT_SUPPORT);
-      /* TODO: implement test */
-      tr0.appendTcDetail("Not implemented.");
-      tr0.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getProperty1       */
-      /* Details: "Method getProperty(String): Returns a String containing    */
-      /* the value for the specified property "                               */
-      TestResult tr1 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETPROPERTY1);
-      /* TODO: implement test */
-      tr1.appendTcDetail("Not implemented.");
-      tr1.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getProperty2       */
-      /* Details: "Method getProperty(String): Returns null if there is no    */
-      /* property defined for the specified name"                             */
-      TestResult tr2 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETPROPERTY2);
-      /* TODO: implement test */
-      tr2.appendTcDetail("Not implemented.");
-      tr2.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getProperty3       */
-      /* Details: "Method getProperty(String): Throws                         */
-      /* IllegalArgumentException if the specified name is null "             */
-      TestResult tr3 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETPROPERTY3);
-      /* TODO: implement test */
-      tr3.appendTcDetail("Not implemented.");
-      tr3.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getPropertyNames1  */
-      /* Details: "Method getPropertyNames(): Returns an                      */
-      /* java.util.Enumeration&lt;java.lang.String&gt; containing all         */
-      /* portal property names"                                               */
-      TestResult tr4 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETPROPERTYNAMES1);
-      /* TODO: implement test */
-      tr4.appendTcDetail("Not implemented.");
-      tr4.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getPropertyNames2  */
-      /* Details: "Method getPropertyNames(): Returns an empty Enumeration    */
-      /* if there are no portal property names defined"                       */
-      TestResult tr5 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETPROPERTYNAMES2);
-      /* TODO: implement test */
-      tr5.appendTcDetail("Not implemented.");
-      tr5.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getSupportedPortletModes1 */
-      /* Details: "Method getSupportedPortletModes(): Returns an              */
-      /* java.util.Enumeration&lt;PortletMode&gt; containing all supported    */
-      /* portlet modes"                                                       */
-      TestResult tr6 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETSUPPORTEDPORTLETMODES1);
-      /* TODO: implement test */
-      tr6.appendTcDetail("Not implemented.");
-      tr6.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getSupportedPortletModes2 */
-      /* Details: "Method getSupportedPortletModes(): The Enumeration         */
-      /* returned must contain the view mode"                                 */
-      TestResult tr7 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETSUPPORTEDPORTLETMODES2);
-      /* TODO: implement test */
-      tr7.appendTcDetail("Not implemented.");
-      tr7.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getSupportedPortletModes3 */
-      /* Details: "Method getSupportedPortletModes(): The Enumeration         */
-      /* returned must contain the edit mode"                                 */
-      TestResult tr8 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETSUPPORTEDPORTLETMODES3);
-      /* TODO: implement test */
-      tr8.appendTcDetail("Not implemented.");
-      tr8.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getSupportedPortletModes4 */
-      /* Details: "Method getSupportedPortletModes(): The Enumeration         */
-      /* returned must contain the help mode"                                 */
-      TestResult tr9 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETSUPPORTEDPORTLETMODES4);
-      /* TODO: implement test */
-      tr9.appendTcDetail("Not implemented.");
-      tr9.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getSupportedWindowStates1 */
-      /* Details: "Method getSupportedWindowStates(): Returns an              */
-      /* java.util.Enumeration&lt;WindowState&gt; containing all supported    */
-      /* window states"                                                       */
-      TestResult tr10 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETSUPPORTEDWINDOWSTATES1);
-      /* TODO: implement test */
-      tr10.appendTcDetail("Not implemented.");
-      tr10.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getSupportedWindowStates2 */
-      /* Details: "Method getSupportedWindowStates(): The Enumeration         */
-      /* returned must contain the maximized state"                           */
-      TestResult tr11 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETSUPPORTEDWINDOWSTATES2);
-      /* TODO: implement test */
-      tr11.appendTcDetail("Not implemented.");
-      tr11.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getSupportedWindowStates3 */
-      /* Details: "Method getSupportedWindowStates(): The Enumeration         */
-      /* returned must contain the minimized state"                           */
-      TestResult tr12 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETSUPPORTEDWINDOWSTATES3);
-      /* TODO: implement test */
-      tr12.appendTcDetail("Not implemented.");
-      tr12.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getSupportedWindowStates4 */
-      /* Details: "Method getSupportedWindowStates(): The Enumeration         */
-      /* returned must contain the normal state"                              */
-      TestResult tr13 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETSUPPORTEDWINDOWSTATES4);
-      /* TODO: implement test */
-      tr13.appendTcDetail("Not implemented.");
-      tr13.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getPortalInfo1     */
-      /* Details: "Method getPortalInfo(): Returns a String containing        */
-      /* information about the portal"                                        */
-      TestResult tr14 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETPORTALINFO1);
-      /* TODO: implement test */
-      tr14.appendTcDetail("Not implemented.");
-      tr14.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getPortalInfo2     */
-      /* Details: "Method getPortalInfo(): The returned string is of the      */
-      /* form \"([^ ]+)/([^ ]+) *(.*)\", where $1 is the portal name, $2 is   */
-      /* the version, and $3 is optional additional information"              */
-      TestResult tr15 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETPORTALINFO2);
-      /* TODO: implement test */
-      tr15.appendTcDetail("Not implemented.");
-      tr15.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getPortalInfo3     */
-      /* Details: "Method getPortalInfo(): The returned string contains the   */
-      /* portal name"                                                         */
-      TestResult tr16 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETPORTALINFO3);
-      /* TODO: implement test */
-      tr16.appendTcDetail("Not implemented.");
-      tr16.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getPortalInfo4     */
-      /* Details: "Method getPortalInfo(): The returned string contains the   */
-      /* portal version"                                                      */
-      TestResult tr17 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETPORTALINFO4);
-      /* TODO: implement test */
-      tr17.appendTcDetail("Not implemented.");
-      tr17.writeTo(writer);
-
-      /* TestCase: V2EnvironmentTests_PortalContext_Render_getPortalInfo5     */
-      /* Details: "Method getPortalInfo(): The returned string may not be     */
-      /* null"                                                                */
-      TestResult tr18 = tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTALCONTEXT_RENDER_GETPORTALINFO5);
-      /* TODO: implement test */
-      tr18.appendTcDetail("Not implemented.");
-      tr18.writeTo(writer);
-
-   }
-
-}