portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [30/30] git commit: completed implemetation of test module V2URLTests
Date Wed, 08 Oct 2014 11:02:53 GMT
completed implemetation of test module V2URLTests


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/dc496844
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/dc496844
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/dc496844

Branch: refs/heads/master
Commit: dc49684428e8c7dab00fdfe878a3c5bef3826004
Parents: 2239b20
Author: Scott Nicklous <msnicklous@apache.org>
Authored: Wed Oct 8 11:39:24 2014 +0200
Committer: Scott Nicklous <msnicklous@apache.org>
Committed: Wed Oct 8 11:39:24 2014 +0200

----------------------------------------------------------------------
 .../TestPortletURLGenerationListener.java       |  18 +-
 .../URLTests_BaseURL_ApiRenderActurl.java       | 153 ++--
 .../URLTests_BaseURL_ApiRenderRenurl.java       | 129 ++--
 .../URLTests_BaseURL_ApiRenderResurl.java       | 155 ++--
 ..._PortletURLGenerationListener_ApiRender.java | 730 -------------------
 ...etURLGenerationListener_ApiRenderActurl.java | 380 ++++++++++
 ...etURLGenerationListener_ApiRenderRenurl.java | 251 +++++++
 ...etURLGenerationListener_ApiRenderResurl.java | 322 ++++++++
 .../URLTests_ResourceURL_ApiRenderResurl.java   |   3 +-
 .../resources/xml-resources/additionalTCs.xml   |  37 +-
 .../src/main/webapp/WEB-INF/portlet.xml         |  38 +-
 .../tck/beans/JSR286ApiTestCaseDetails.java     |  68 +-
 .../javax/portlet/tck/beans/ResourceLink.java   |  30 +-
 13 files changed, 1270 insertions(+), 1044 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/dc496844/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/listeners/TestPortletURLGenerationListener.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/listeners/TestPortletURLGenerationListener.java b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/listeners/TestPortletURLGenerationListener.java
index 29186b7..e15a2d0 100644
--- a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/listeners/TestPortletURLGenerationListener.java
+++ b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/listeners/TestPortletURLGenerationListener.java
@@ -34,7 +34,7 @@ import static javax.portlet.ResourceURL.*;
 
 /**
  *Test PortletURLGenerationListener
- * Used by portlet: URLTests_PortletURLGenerationListener_ApiRender
+ * Used by portlet: URLTests_PortletURLGenerationListener_ApiRenderResurl
  *
  * @author nick
  *
@@ -47,15 +47,25 @@ public class TestPortletURLGenerationListener implements PortletURLGenerationLis
       // set parameters on URLs to indicate test success
 
    public void filterActionURL(PortletURL url) {
-      url.setParameter("PUGL", "Action");
+      if (isURLGenTc(url)) url.setParameter("PUGL", "Action");
    }
 
    public void filterRenderURL(PortletURL url) {
-      url.setParameter("PUGL", "Render");
+      if (isURLGenTc(url)) url.setParameter("PUGL", "Render");
    }
 
    public void filterResourceURL(ResourceURL url) {
-      url.setParameter("PUGL", "Resource");
+      if (isURLGenTc(url)) url.setParameter("PUGL", "Resource");
+   }
+
+   // only set parm for PortletURLGenerationListener test cases
+   private boolean isURLGenTc(BaseURL url) {
+      boolean ok = false;
+      String[] vals = (String[]) url.getParameterMap().get("tc");
+      if ((vals != null) && (vals.length > 0) && vals[0].contains("PortletURLGenerationListener")) {
+         ok = true;
+      }
+      return ok;
    }
 
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/dc496844/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderActurl.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderActurl.java b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderActurl.java
index 707ffed..88d948f 100644
--- a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderActurl.java
+++ b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderActurl.java
@@ -268,54 +268,57 @@ public class URLTests_BaseURL_ApiRenderActurl implements Portlet, ResourceServin
       // evaluate results for test case V2URLTests_BaseURL_ApiRenderActurl_setSecure2
       {
          JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-         TestResult tr19 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_SETSECURE2);
+         TestResult tr18 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_SETSECURE2);
          String tcval = portletReq.getParameter("tc");
          if (tcval.equals("V2URLTests_BaseURL_ApiRenderActurl_setSecure2")) {
-            String val = portletReq.getParameter("ok");
+            String val = portletReq.getParameter("setSecure");
             boolean ok = (val != null);
+            if (ok) {
+               tr18.appendTcDetail("setSecure is not supported.");
+            }
             ok = ok || portletReq.isSecure();
-            tr19.setTcSuccess(ok);
+            tr18.setTcSuccess(ok);
             PortletSession ps = portletReq.getPortletSession();
-            ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_setSecure2", tr19);
+            ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_setSecure2", tr18);
          }
       }
 
       // evaluate results for test case V2URLTests_BaseURL_ApiRenderActurl_toString
       {
          JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-         TestResult tr20 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_TOSTRING);
+         TestResult tr19 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_TOSTRING);
          String tcval = portletReq.getParameter("tc");
          if (tcval.equals("V2URLTests_BaseURL_ApiRenderActurl_toString")) {
             // If execution makes it to here, the test was successful
-            tr20.setTcSuccess(true);
+            tr19.setTcSuccess(true);
             PortletSession ps = portletReq.getPortletSession();
-            ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_toString", tr20);
+            ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_toString", tr19);
          }
       }
 
       // evaluate results for test case V2URLTests_BaseURL_ApiRenderActurl_writeA1
       {
          JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-         TestResult tr24 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_WRITEA1);
+         TestResult tr23 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_WRITEA1);
          String tcval = portletReq.getParameter("tc");
          if (tcval.equals("V2URLTests_BaseURL_ApiRenderActurl_writeA1")) {
             // If execution makes it to here, the test was successful
-            tr24.setTcSuccess(true);
+            tr23.setTcSuccess(true);
             PortletSession ps = portletReq.getPortletSession();
-            ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_writeA1", tr24);
+            ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_writeA1", tr23);
          }
       }
 
       // evaluate results for test case V2URLTests_BaseURL_ApiRenderActurl_writeB1
       {
          JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-         TestResult tr25 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_WRITEB1);
+         TestResult tr24 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_WRITEB1);
          String tcval = portletReq.getParameter("tc");
          if (tcval.equals("V2URLTests_BaseURL_ApiRenderActurl_writeB1")) {
             // If execution makes it to here, the test was successful
-            tr25.setTcSuccess(true);
+            tr24.setTcSuccess(true);
             PortletSession ps = portletReq.getPortletSession();
-            ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_writeB1", tr25);
+            ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_writeB1", tr24);
          }
       }
 
@@ -826,38 +829,18 @@ public class URLTests_BaseURL_ApiRenderActurl implements Portlet, ResourceServin
       } catch(Exception e) {tr17.appendTcDetail(e.toString());}
       tr17.writeTo(writer);
 
-      /* TestCase: V2URLTests_BaseURL_ApiRenderActurl_setParameters13         */
-      /* Details: "Method setParameters(java.util.Map): Throws                */
-      /* IllegalArgumentException if any element in the values array is       */
-      /* null "                                                               */
-      TestResult tr18 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_SETPARAMETERS13);
-      try {
-         try {
-            PortletURL turl = portletResp.createActionURL();
-            Map<String, String[]> parms = new HashMap<String, String[]>();
-            parms.put("parm1", new String[]{null, "val1-2"});
-            parms.put("parm2", new String[]{"val2-1", "val2-2"});
-            turl.setParameters(parms);
-            tr18.appendTcDetail("Method did not throw an exception.");
-         } catch (IllegalArgumentException iae) {
-            tr18.setTcSuccess(true);
-         } catch (Exception e) {
-            tr18.appendTcDetail(e.toString());
-         }
-      } catch(Exception e) {tr18.appendTcDetail(e.toString());}
-      tr18.writeTo(writer);
-
       /* TestCase: V2URLTests_BaseURL_ApiRenderActurl_setSecure2              */
       /* Details: "Method setSecure(boolean): If the input parameter is       */
       /* true, the resulting URL uses a secure connection (HTTPS)"            */
-      TestResult tr19 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_SETSECURE2);
+      TestResult tr18 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_SETSECURE2);
       try {
          PortletURL turl = portletResp.createActionURL();
          turl.setParameter("tc", "V2URLTests_BaseURL_ApiRenderActurl_setSecure2");
          try {
             turl.setSecure(true);
          } catch(PortletSecurityException e) {
-            // handle as successful completion, since runtime does not support setting            turl.setParameter("ok", "true");
+            // handle as successful completion, since runtime does not support setting
+            turl.setParameter("setSecure", "not supported");
          }
          
          // add the execution button for an action request
@@ -870,17 +853,17 @@ public class URLTests_BaseURL_ApiRenderActurl implements Portlet, ResourceServin
             PortletSession ps = portletReq.getPortletSession();
             TestResult tmp = (TestResult)ps.getAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_setSecure2");
             if (tmp != null) {
-               tr19 = tmp;
+               tr18 = tmp;
                ps.removeAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_setSecure2");
             }
          }
-      } catch(Exception e) {tr19.appendTcDetail(e.toString());}
-      tr19.writeTo(writer);
+      } catch(Exception e) {tr18.appendTcDetail(e.toString());}
+      tr18.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderActurl_toString                */
       /* Details: "Method toString(): Returns a String containing the         */
       /* portlet URL representation to be included in the markup"             */
-      TestResult tr20 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_TOSTRING);
+      TestResult tr19 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_TOSTRING);
       try {
          PortletURL turl = portletResp.createActionURL();
          turl.setParameter("tc", "V2URLTests_BaseURL_ApiRenderActurl_toString");
@@ -896,33 +879,33 @@ public class URLTests_BaseURL_ApiRenderActurl implements Portlet, ResourceServin
             PortletSession ps = portletReq.getPortletSession();
             TestResult tmp = (TestResult)ps.getAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_toString");
             if (tmp != null) {
-               tr20 = tmp;
+               tr19 = tmp;
                ps.removeAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_toString");
             }
          }
-      } catch(Exception e) {tr20.appendTcDetail(e.toString());}
-      tr20.writeTo(writer);
+      } catch(Exception e) {tr19.appendTcDetail(e.toString());}
+      tr19.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderActurl_getParameterMap1        */
       /* Details: "Method getParameterMap(): Returns an                       */
       /* java.util.Map&lt;java.lang.String,java.lang.String[]&gt; object      */
       /* for the parameter names and values if parameters are available"      */
-      TestResult tr21 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_GETPARAMETERMAP1);
+      TestResult tr20 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_GETPARAMETERMAP1);
       try {
          PortletURL turl = portletResp.createActionURL();
          Map<String, String[]> parms = turl.getParameterMap();
          if (parms == null) {
-            tr21.appendTcDetail("Returned map is null."); 
+            tr20.appendTcDetail("Returned map is null."); 
          } else {
-            tr21.setTcSuccess(true);
+            tr20.setTcSuccess(true);
          }
-      } catch(Exception e) {tr21.appendTcDetail(e.toString());}
-      tr21.writeTo(writer);
+      } catch(Exception e) {tr20.appendTcDetail(e.toString());}
+      tr20.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderActurl_getParameterMap3        */
       /* Details: "Method getParameterMap(): For an action URL, the           */
       /* returned map contains all action parameters for the request"         */
-      TestResult tr22 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_GETPARAMETERMAP3);
+      TestResult tr21 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_GETPARAMETERMAP3);
       try {
          PortletURL turl = portletResp.createActionURL();
          Map<String, String[]> testparms = new HashMap<String, String[]>();
@@ -931,29 +914,29 @@ public class URLTests_BaseURL_ApiRenderActurl implements Portlet, ResourceServin
          turl.setParameter("tckPRP1", "PRPval1");
          testparms.put("tckPRP1", new String[]{"PRPval1"});
          Map<String, String[]> parms = turl.getParameterMap();
-         CompareUtils.mapsEqual("Test parameters", testparms, "Parameters from URL", parms, tr22);
-      } catch(Exception e) {tr22.appendTcDetail(e.toString());}
-      tr22.writeTo(writer);
+         CompareUtils.mapsEqual("Test parameters", testparms, "Parameters from URL", parms, tr21);
+      } catch(Exception e) {tr21.appendTcDetail(e.toString());}
+      tr21.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderActurl_getParameterMap6        */
       /* Details: "Method getParameterMap(): Returns an empty map if no       */
       /* parameters exist"                                                    */
-      TestResult tr23 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_GETPARAMETERMAP6);
+      TestResult tr22 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_GETPARAMETERMAP6);
       try {
          PortletURL turl = portletResp.createActionURL();
          Map<String, String[]> parms = turl.getParameterMap();
          if (parms == null) {
-            tr23.appendTcDetail("Returned map is null."); 
+            tr22.appendTcDetail("Returned map is null."); 
          } else {
-            tr23.setTcSuccess(parms.isEmpty());
+            tr22.setTcSuccess(parms.isEmpty());
          }
-      } catch(Exception e) {tr23.appendTcDetail(e.toString());}
-      tr23.writeTo(writer);
+      } catch(Exception e) {tr22.appendTcDetail(e.toString());}
+      tr22.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderActurl_writeA1                 */
       /* Details: "Method write(Writer out): Writes the URL to the output     */
       /* stream through the provided Writer"                                  */
-      TestResult tr24 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_WRITEA1);
+      TestResult tr23 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_WRITEA1);
       try {
          PortletURL turl = portletResp.createActionURL();
          turl.setParameter("tc", "V2URLTests_BaseURL_ApiRenderActurl_writeA1");
@@ -971,17 +954,17 @@ public class URLTests_BaseURL_ApiRenderActurl implements Portlet, ResourceServin
             PortletSession ps = portletReq.getPortletSession();
             TestResult tmp = (TestResult)ps.getAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_writeA1");
             if (tmp != null) {
-               tr24 = tmp;
+               tr23 = tmp;
                ps.removeAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_writeA1");
             }
          }
-      } catch(Exception e) {tr24.appendTcDetail(e.toString());}
-      tr24.writeTo(writer);
+      } catch(Exception e) {tr23.appendTcDetail(e.toString());}
+      tr23.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderActurl_writeB1                 */
       /* Details: "Method write(Writer out, boolean escapeXML): Writes the    */
       /* URL to the output stream through the provided Writer"                */
-      TestResult tr25 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_WRITEB1);
+      TestResult tr24 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_WRITEB1);
       try {
          PortletURL turl = portletResp.createActionURL();
          turl.setParameter("tc", "V2URLTests_BaseURL_ApiRenderActurl_writeB1");
@@ -999,70 +982,70 @@ public class URLTests_BaseURL_ApiRenderActurl implements Portlet, ResourceServin
             PortletSession ps = portletReq.getPortletSession();
             TestResult tmp = (TestResult)ps.getAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_writeB1");
             if (tmp != null) {
-               tr25 = tmp;
+               tr24 = tmp;
                ps.removeAttribute(RESULT_ATTR_PREFIX + "V2URLTests_BaseURL_ApiRenderActurl_writeB1");
             }
          }
-      } catch(Exception e) {tr25.appendTcDetail(e.toString());}
-      tr25.writeTo(writer);
+      } catch(Exception e) {tr24.appendTcDetail(e.toString());}
+      tr24.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderActurl_addProperty1            */
       /* Details: "Method addProperty(String, String): A property can be      */
       /* added"                                                               */
-      TestResult tr26 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_ADDPROPERTY1);
+      TestResult tr25 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_ADDPROPERTY1);
       try {
          // Test if method can be called. Not possible to check resulting property values.
          PortletURL turl = portletResp.createActionURL();
          turl.addProperty("prop1", "val1");
-         tr26.setTcSuccess(true);
-      } catch(Exception e) {tr26.appendTcDetail(e.toString());}
-      tr26.writeTo(writer);
+         tr25.setTcSuccess(true);
+      } catch(Exception e) {tr25.appendTcDetail(e.toString());}
+      tr25.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderActurl_addProperty3            */
       /* Details: "Method addProperty(String, String): Throws                 */
       /* IllegalArgumentException if the specified key is null"               */
-      TestResult tr27 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_ADDPROPERTY3);
+      TestResult tr26 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_ADDPROPERTY3);
       try {
          try {
             PortletURL turl = portletResp.createActionURL();
             turl.addProperty(null, "value");
-            tr27.appendTcDetail("Method did not throw an exception.");
+            tr26.appendTcDetail("Method did not throw an exception.");
          } catch (IllegalArgumentException iae) {
-            tr27.setTcSuccess(true);
+            tr26.setTcSuccess(true);
          } catch (Exception e) {
-            tr27.appendTcDetail(e.toString());
+            tr26.appendTcDetail(e.toString());
          }
-      } catch(Exception e) {tr27.appendTcDetail(e.toString());}
-      tr27.writeTo(writer);
+      } catch(Exception e) {tr26.appendTcDetail(e.toString());}
+      tr26.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderActurl_setProperty1            */
       /* Details: "Method setProperty(String, String): Sets a property        */
       /* value for the specified key"                                         */
-      TestResult tr28 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_SETPROPERTY1);
+      TestResult tr27 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_SETPROPERTY1);
       try {
          // Test if method can be called. Not possible to check resulting property values.
          PortletURL turl = portletResp.createActionURL();
          turl.setProperty("prop1", "val1");
-         tr28.setTcSuccess(true);
-      } catch(Exception e) {tr28.appendTcDetail(e.toString());}
-      tr28.writeTo(writer);
+         tr27.setTcSuccess(true);
+      } catch(Exception e) {tr27.appendTcDetail(e.toString());}
+      tr27.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderActurl_setProperty3            */
       /* Details: "Method setProperty(String, String): Throws                 */
       /* IllegalArgumentException if the specified key is null"               */
-      TestResult tr29 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_SETPROPERTY3);
+      TestResult tr28 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERACTURL_SETPROPERTY3);
       try {
          try {
             PortletURL turl = portletResp.createActionURL();
             turl.setProperty(null, "value");
-            tr29.appendTcDetail("Method did not throw an exception.");
+            tr28.appendTcDetail("Method did not throw an exception.");
          } catch (IllegalArgumentException iae) {
-            tr29.setTcSuccess(true);
+            tr28.setTcSuccess(true);
          } catch (Exception e) {
-            tr29.appendTcDetail(e.toString());
+            tr28.appendTcDetail(e.toString());
          }
-      } catch(Exception e) {tr29.appendTcDetail(e.toString());}
-      tr29.writeTo(writer);
+      } catch(Exception e) {tr28.appendTcDetail(e.toString());}
+      tr28.writeTo(writer);
 
    }
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/dc496844/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderRenurl.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderRenurl.java b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderRenurl.java
index b28d785..9cf0883 100644
--- a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderRenurl.java
+++ b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderRenurl.java
@@ -625,38 +625,18 @@ public class URLTests_BaseURL_ApiRenderRenurl implements Portlet, ResourceServin
       } catch(Exception e) {tr20.appendTcDetail(e.toString());}
       tr20.writeTo(writer);
 
-      /* TestCase: V2URLTests_BaseURL_ApiRenderRenurl_setParameters13         */
-      /* Details: "Method setParameters(java.util.Map): Throws                */
-      /* IllegalArgumentException if any element in the values array is       */
-      /* null "                                                               */
-      TestResult tr21 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_SETPARAMETERS13);
-      try {
-         try {
-            PortletURL turl = portletResp.createRenderURL();
-            Map<String, String[]> parms = new HashMap<String, String[]>();
-            parms.put("parm1", new String[]{null, "val1-2"});
-            parms.put("parm2", new String[]{"val2-1", "val2-2"});
-            turl.setParameters(parms);
-            tr21.appendTcDetail("Method did not throw an exception.");
-         } catch (IllegalArgumentException iae) {
-            tr21.setTcSuccess(true);
-         } catch (Exception e) {
-            tr21.appendTcDetail(e.toString());
-         }
-      } catch(Exception e) {tr21.appendTcDetail(e.toString());}
-      tr21.writeTo(writer);
-
       /* TestCase: V2URLTests_BaseURL_ApiRenderRenurl_setSecure2              */
       /* Details: "Method setSecure(boolean): If the input parameter is       */
       /* true, the resulting URL uses a secure connection (HTTPS)"            */
-      TestResult tr22 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_SETSECURE2);
+      TestResult tr21 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_SETSECURE2);
       try {
          PortletURL turl = portletResp.createRenderURL();
          turl.setParameter("tc", "V2URLTests_BaseURL_ApiRenderRenurl_setSecure2");
          try {
             turl.setSecure(true);
          } catch(PortletSecurityException e) {
-            // handle as successful completion, since runtime does not support setting            turl.setParameter("ok", "true");
+            // handle as successful completion, since runtime does not support setting
+            turl.setParameter("setSecure", "not supported");
          }
          
          // add the execution link
@@ -666,18 +646,21 @@ public class URLTests_BaseURL_ApiRenderRenurl implements Portlet, ResourceServin
          // evaluate results
          String tcval = portletReq.getParameter("tc");
          if (tcval.equals("V2URLTests_BaseURL_ApiRenderRenurl_setSecure2")) {
-            String val = portletReq.getParameter("ok");
+            String val = portletReq.getParameter("setSecure");
             boolean ok = (val != null);
+            if (ok) {
+               tr21.appendTcDetail("setSecure is not supported.");
+            }
             ok = ok || portletReq.isSecure();
-            tr22.setTcSuccess(ok);
+            tr21.setTcSuccess(ok);
          }
-      } catch(Exception e) {tr22.appendTcDetail(e.toString());}
-      tr22.writeTo(writer);
+      } catch(Exception e) {tr21.appendTcDetail(e.toString());}
+      tr21.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderRenurl_toString                */
       /* Details: "Method toString(): Returns a String containing the         */
       /* portlet URL representation to be included in the markup"             */
-      TestResult tr23 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_TOSTRING);
+      TestResult tr22 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_TOSTRING);
       try {
          PortletURL turl = portletResp.createRenderURL();
          turl.setParameter("tc", "V2URLTests_BaseURL_ApiRenderRenurl_toString");
@@ -691,31 +674,31 @@ public class URLTests_BaseURL_ApiRenderRenurl implements Portlet, ResourceServin
          String tcval = portletReq.getParameter("tc");
          if (tcval.equals("V2URLTests_BaseURL_ApiRenderRenurl_toString")) {
             // If execution makes it to here, the test was successful
-            tr23.setTcSuccess(true);
+            tr22.setTcSuccess(true);
          }
-      } catch(Exception e) {tr23.appendTcDetail(e.toString());}
-      tr23.writeTo(writer);
+      } catch(Exception e) {tr22.appendTcDetail(e.toString());}
+      tr22.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderRenurl_getParameterMap1        */
       /* Details: "Method getParameterMap(): Returns an                       */
       /* java.util.Map&lt;java.lang.String,java.lang.String[]&gt; object      */
       /* for the parameter names and values if parameters are available"      */
-      TestResult tr24 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_GETPARAMETERMAP1);
+      TestResult tr23 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_GETPARAMETERMAP1);
       try {
          PortletURL turl = portletResp.createRenderURL();
          Map<String, String[]> parms = turl.getParameterMap();
          if (parms == null) {
-            tr24.appendTcDetail("Returned map is null."); 
+            tr23.appendTcDetail("Returned map is null."); 
          } else {
-            tr24.setTcSuccess(true);
+            tr23.setTcSuccess(true);
          }
-      } catch(Exception e) {tr24.appendTcDetail(e.toString());}
-      tr24.writeTo(writer);
+      } catch(Exception e) {tr23.appendTcDetail(e.toString());}
+      tr23.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderRenurl_getParameterMap2        */
       /* Details: "Method getParameterMap(): The returned map contains all    */
       /* public and private parameters for the request"                       */
-      TestResult tr25 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_GETPARAMETERMAP2);
+      TestResult tr24 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_GETPARAMETERMAP2);
       try {
          PortletURL turl = portletResp.createRenderURL();
          Map<String, String[]> testparms = new HashMap<String, String[]>();
@@ -724,29 +707,29 @@ public class URLTests_BaseURL_ApiRenderRenurl implements Portlet, ResourceServin
          turl.setParameter("tckPRP1", "PRPval1");
          testparms.put("tckPRP1", new String[]{"PRPval1"});
          Map<String, String[]> parms = turl.getParameterMap();
-         CompareUtils.mapsEqual("Test parameters", testparms, "Parameters from URL", parms, tr25);
-      } catch(Exception e) {tr25.appendTcDetail(e.toString());}
-      tr25.writeTo(writer);
+         CompareUtils.mapsEqual("Test parameters", testparms, "Parameters from URL", parms, tr24);
+      } catch(Exception e) {tr24.appendTcDetail(e.toString());}
+      tr24.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderRenurl_getParameterMap6        */
       /* Details: "Method getParameterMap(): Returns an empty map if no       */
       /* parameters exist"                                                    */
-      TestResult tr26 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_GETPARAMETERMAP6);
+      TestResult tr25 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_GETPARAMETERMAP6);
       try {
          PortletURL turl = portletResp.createRenderURL();
          Map<String, String[]> parms = turl.getParameterMap();
          if (parms == null) {
-            tr26.appendTcDetail("Returned map is null."); 
+            tr25.appendTcDetail("Returned map is null."); 
          } else {
-            tr26.setTcSuccess(parms.isEmpty());
+            tr25.setTcSuccess(parms.isEmpty());
          }
-      } catch(Exception e) {tr26.appendTcDetail(e.toString());}
-      tr26.writeTo(writer);
+      } catch(Exception e) {tr25.appendTcDetail(e.toString());}
+      tr25.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderRenurl_writeA1                 */
       /* Details: "Method write(Writer out): Writes the URL to the output     */
       /* stream through the provided Writer"                                  */
-      TestResult tr27 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_WRITEA1);
+      TestResult tr26 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_WRITEA1);
       try {
          PortletURL turl = portletResp.createRenderURL();
          turl.setParameter("tc", "V2URLTests_BaseURL_ApiRenderRenurl_writeA1");
@@ -762,15 +745,15 @@ public class URLTests_BaseURL_ApiRenderRenurl implements Portlet, ResourceServin
          String tcval = portletReq.getParameter("tc");
          if (tcval.equals("V2URLTests_BaseURL_ApiRenderRenurl_writeA1")) {
             // If execution makes it to here, the test was successful
-            tr27.setTcSuccess(true);
+            tr26.setTcSuccess(true);
          }
-      } catch(Exception e) {tr27.appendTcDetail(e.toString());}
-      tr27.writeTo(writer);
+      } catch(Exception e) {tr26.appendTcDetail(e.toString());}
+      tr26.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderRenurl_writeB1                 */
       /* Details: "Method write(Writer out, boolean escapeXML): Writes the    */
       /* URL to the output stream through the provided Writer"                */
-      TestResult tr28 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_WRITEB1);
+      TestResult tr27 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_WRITEB1);
       try {
          PortletURL turl = portletResp.createRenderURL();
          turl.setParameter("tc", "V2URLTests_BaseURL_ApiRenderRenurl_writeB1");
@@ -786,68 +769,68 @@ public class URLTests_BaseURL_ApiRenderRenurl implements Portlet, ResourceServin
          String tcval = portletReq.getParameter("tc");
          if (tcval.equals("V2URLTests_BaseURL_ApiRenderRenurl_writeB1")) {
             // If execution makes it to here, the test was successful
-            tr28.setTcSuccess(true);
+            tr27.setTcSuccess(true);
          }
-      } catch(Exception e) {tr28.appendTcDetail(e.toString());}
-      tr28.writeTo(writer);
+      } catch(Exception e) {tr27.appendTcDetail(e.toString());}
+      tr27.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderRenurl_addProperty1            */
       /* Details: "Method addProperty(String, String): A property can be      */
       /* added"                                                               */
-      TestResult tr29 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_ADDPROPERTY1);
+      TestResult tr28 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_ADDPROPERTY1);
       try {
          // Test if method can be called. Not possible to check resulting property values.
          PortletURL turl = portletResp.createRenderURL();
          turl.addProperty("prop1", "val1");
-         tr29.setTcSuccess(true);
-      } catch(Exception e) {tr29.appendTcDetail(e.toString());}
-      tr29.writeTo(writer);
+         tr28.setTcSuccess(true);
+      } catch(Exception e) {tr28.appendTcDetail(e.toString());}
+      tr28.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderRenurl_addProperty3            */
       /* Details: "Method addProperty(String, String): Throws                 */
       /* IllegalArgumentException if the specified key is null"               */
-      TestResult tr30 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_ADDPROPERTY3);
+      TestResult tr29 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_ADDPROPERTY3);
       try {
          try {
             PortletURL turl = portletResp.createRenderURL();
             turl.addProperty(null, "value");
-            tr30.appendTcDetail("Method did not throw an exception.");
+            tr29.appendTcDetail("Method did not throw an exception.");
          } catch (IllegalArgumentException iae) {
-            tr30.setTcSuccess(true);
+            tr29.setTcSuccess(true);
          } catch (Exception e) {
-            tr30.appendTcDetail(e.toString());
+            tr29.appendTcDetail(e.toString());
          }
-      } catch(Exception e) {tr30.appendTcDetail(e.toString());}
-      tr30.writeTo(writer);
+      } catch(Exception e) {tr29.appendTcDetail(e.toString());}
+      tr29.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderRenurl_setProperty1            */
       /* Details: "Method setProperty(String, String): Sets a property        */
       /* value for the specified key"                                         */
-      TestResult tr31 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_SETPROPERTY1);
+      TestResult tr30 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_SETPROPERTY1);
       try {
          // Test if method can be called. Not possible to check resulting property values.
          PortletURL turl = portletResp.createRenderURL();
          turl.setProperty("prop1", "val1");
-         tr31.setTcSuccess(true);
-      } catch(Exception e) {tr31.appendTcDetail(e.toString());}
-      tr31.writeTo(writer);
+         tr30.setTcSuccess(true);
+      } catch(Exception e) {tr30.appendTcDetail(e.toString());}
+      tr30.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderRenurl_setProperty3            */
       /* Details: "Method setProperty(String, String): Throws                 */
       /* IllegalArgumentException if the specified key is null"               */
-      TestResult tr32 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_SETPROPERTY3);
+      TestResult tr31 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRENURL_SETPROPERTY3);
       try {
          try {
             PortletURL turl = portletResp.createRenderURL();
             turl.setProperty(null, "value");
-            tr32.appendTcDetail("Method did not throw an exception.");
+            tr31.appendTcDetail("Method did not throw an exception.");
          } catch (IllegalArgumentException iae) {
-            tr32.setTcSuccess(true);
+            tr31.setTcSuccess(true);
          } catch (Exception e) {
-            tr32.appendTcDetail(e.toString());
+            tr31.appendTcDetail(e.toString());
          }
-      } catch(Exception e) {tr32.appendTcDetail(e.toString());}
-      tr32.writeTo(writer);
+      } catch(Exception e) {tr31.appendTcDetail(e.toString());}
+      tr31.writeTo(writer);
 
    }
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/dc496844/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderResurl.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderResurl.java b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderResurl.java
index 671852b..30bbea3 100644
--- a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderResurl.java
+++ b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_BaseURL_ApiRenderResurl.java
@@ -267,50 +267,53 @@ public class URLTests_BaseURL_ApiRenderResurl implements Portlet, ResourceServin
       // evaluate results for test case V2URLTests_BaseURL_ApiRenderResurl_setSecure2
       {
          JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-         TestResult tr19 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_SETSECURE2);
+         TestResult tr18 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_SETSECURE2);
          String tcval = portletReq.getParameter("tc");
          if (tcval.equals("V2URLTests_BaseURL_ApiRenderResurl_setSecure2")) {
-            String val = portletReq.getParameter("ok");
+            String val = portletReq.getParameter("setSecure");
             boolean ok = (val != null);
+            if (ok) {
+               tr18.appendTcDetail("setSecure is not supported.");
+            }
             ok = ok || portletReq.isSecure();
-            tr19.setTcSuccess(ok);
-            tr19.writeTo(writer);
+            tr18.setTcSuccess(ok);
+            tr18.writeTo(writer);
          }
       }
 
       // evaluate results for test case V2URLTests_BaseURL_ApiRenderResurl_toString
       {
          JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-         TestResult tr20 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_TOSTRING);
+         TestResult tr19 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_TOSTRING);
          String tcval = portletReq.getParameter("tc");
          if (tcval.equals("V2URLTests_BaseURL_ApiRenderResurl_toString")) {
             // If execution makes it to here, the test was successful
-            tr20.setTcSuccess(true);
-            tr20.writeTo(writer);
+            tr19.setTcSuccess(true);
+            tr19.writeTo(writer);
          }
       }
 
       // evaluate results for test case V2URLTests_BaseURL_ApiRenderResurl_writeA1
       {
          JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-         TestResult tr25 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_WRITEA1);
+         TestResult tr24 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_WRITEA1);
          String tcval = portletReq.getParameter("tc");
          if (tcval.equals("V2URLTests_BaseURL_ApiRenderResurl_writeA1")) {
             // If execution makes it to here, the test was successful
-            tr25.setTcSuccess(true);
-            tr25.writeTo(writer);
+            tr24.setTcSuccess(true);
+            tr24.writeTo(writer);
          }
       }
 
       // evaluate results for test case V2URLTests_BaseURL_ApiRenderResurl_writeB1
       {
          JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-         TestResult tr26 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_WRITEB1);
+         TestResult tr25 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_WRITEB1);
          String tcval = portletReq.getParameter("tc");
          if (tcval.equals("V2URLTests_BaseURL_ApiRenderResurl_writeB1")) {
             // If execution makes it to here, the test was successful
-            tr26.setTcSuccess(true);
-            tr26.writeTo(writer);
+            tr25.setTcSuccess(true);
+            tr25.writeTo(writer);
          }
       }
 
@@ -692,52 +695,32 @@ public class URLTests_BaseURL_ApiRenderResurl implements Portlet, ResourceServin
       } catch(Exception e) {tr17.appendTcDetail(e.toString());}
       tr17.writeTo(writer);
 
-      /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_setParameters13         */
-      /* Details: "Method setParameters(java.util.Map): Throws                */
-      /* IllegalArgumentException if any element in the values array is       */
-      /* null "                                                               */
-      TestResult tr18 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_SETPARAMETERS13);
-      try {
-         try {
-            ResourceURL turl = portletResp.createResourceURL();
-            Map<String, String[]> parms = new HashMap<String, String[]>();
-            parms.put("parm1", new String[]{null, "val1-2"});
-            parms.put("parm2", new String[]{"val2-1", "val2-2"});
-            turl.setParameters(parms);
-            tr18.appendTcDetail("Method did not throw an exception.");
-         } catch (IllegalArgumentException iae) {
-            tr18.setTcSuccess(true);
-         } catch (Exception e) {
-            tr18.appendTcDetail(e.toString());
-         }
-      } catch(Exception e) {tr18.appendTcDetail(e.toString());}
-      tr18.writeTo(writer);
-
       /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_setSecure2              */
       /* Details: "Method setSecure(boolean): If the input parameter is       */
       /* true, the resulting URL uses a secure connection (HTTPS)"            */
-      TestResult tr19 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_SETSECURE2);
+      TestResult tr18 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_SETSECURE2);
       try {
          ResourceURL turl = portletResp.createResourceURL();
          turl.setParameter("tc", "V2URLTests_BaseURL_ApiRenderResurl_setSecure2");
          try {
             turl.setSecure(true);
          } catch(PortletSecurityException e) {
-            // handle as successful completion, since runtime does not support setting            turl.setParameter("ok", "true");
+            // handle as successful completion, since runtime does not support setting
+            turl.setParameter("setSecure", "not supported");
          }
          
          // add the resource results fetcher to the output stream
          ResourceLink rl = new ResourceLink("V2URLTests_BaseURL_ApiRenderResurl_setSecure2", turl);
          rl.writeResourceFetcher(writer);
       } catch(Exception e) {
-         tr19.appendTcDetail(e.toString());
-         tr19.writeTo(writer);
+         tr18.appendTcDetail(e.toString());
+         tr18.writeTo(writer);
       }
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_toString                */
       /* Details: "Method toString(): Returns a String containing the         */
       /* portlet URL representation to be included in the markup"             */
-      TestResult tr20 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_TOSTRING);
+      TestResult tr19 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_TOSTRING);
       try {
          ResourceURL turl = portletResp.createResourceURL();
          turl.setParameter("tc", "V2URLTests_BaseURL_ApiRenderResurl_toString");
@@ -747,30 +730,30 @@ public class URLTests_BaseURL_ApiRenderResurl implements Portlet, ResourceServin
          ResourceLink rl = new ResourceLink("V2URLTests_BaseURL_ApiRenderResurl_toString", urlstr);
          rl.writeResourceFetcher(writer);
       } catch(Exception e) {
-         tr20.appendTcDetail(e.toString());
-         tr20.writeTo(writer);
+         tr19.appendTcDetail(e.toString());
+         tr19.writeTo(writer);
       }
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_getParameterMap1        */
       /* Details: "Method getParameterMap(): Returns an                       */
       /* java.util.Map&lt;java.lang.String,java.lang.String[]&gt; object      */
       /* for the parameter names and values if parameters are available"      */
-      TestResult tr21 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_GETPARAMETERMAP1);
+      TestResult tr20 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_GETPARAMETERMAP1);
       try {
          ResourceURL turl = portletResp.createResourceURL();
          Map<String, String[]> parms = turl.getParameterMap();
          if (parms == null) {
-            tr21.appendTcDetail("Returned map is null."); 
+            tr20.appendTcDetail("Returned map is null."); 
          } else {
-            tr21.setTcSuccess(true);
+            tr20.setTcSuccess(true);
          }
-      } catch(Exception e) {tr21.appendTcDetail(e.toString());}
-      tr21.writeTo(writer);
+      } catch(Exception e) {tr20.appendTcDetail(e.toString());}
+      tr20.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_getParameterMap4        */
       /* Details: "Method getParameterMap(): The returned map contains all    */
       /* resource parameters for the request"                                 */
-      TestResult tr22 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_GETPARAMETERMAP4);
+      TestResult tr21 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_GETPARAMETERMAP4);
       try {
          ResourceURL turl = portletResp.createResourceURL();
          Map<String, String[]> testparms = new HashMap<String, String[]>();
@@ -779,14 +762,14 @@ public class URLTests_BaseURL_ApiRenderResurl implements Portlet, ResourceServin
          turl.setParameter("tckPRP1", "PRPval1");
          testparms.put("tckPRP1", new String[]{"PRPval1"});
          Map<String, String[]> parms = turl.getParameterMap();
-         CompareUtils.mapsEqual("Test parameters", testparms, "Parameters from URL", parms, tr22);
-      } catch(Exception e) {tr22.appendTcDetail(e.toString());}
-      tr22.writeTo(writer);
+         CompareUtils.mapsEqual("Test parameters", testparms, "Parameters from URL", parms, tr21);
+      } catch(Exception e) {tr21.appendTcDetail(e.toString());}
+      tr21.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_getParameterMap5        */
       /* Details: "Method getParameterMap(): The returned map does not        */
       /* contain any render parameters for the request"                       */
-      TestResult tr23 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_GETPARAMETERMAP5);
+      TestResult tr22 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_GETPARAMETERMAP5);
       try {
          // set render parameter for test. The driver will click the link before collecting results.
          PortletURL rurl = portletResp.createRenderURL();
@@ -798,32 +781,32 @@ public class URLTests_BaseURL_ApiRenderResurl implements Portlet, ResourceServin
          ResourceURL turl = portletResp.createResourceURL();
          Map<String, String[]> parms = turl.getParameterMap();
          if (parms == null) {
-            tr23.appendTcDetail("Returned map is null."); 
+            tr22.appendTcDetail("Returned map is null."); 
          } else {
-            tr23.setTcSuccess(parms.isEmpty());
+            tr22.setTcSuccess(parms.isEmpty());
          }
-      } catch(Exception e) {tr23.appendTcDetail(e.toString());}
-      tr23.writeTo(writer);
+      } catch(Exception e) {tr22.appendTcDetail(e.toString());}
+      tr22.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_getParameterMap6        */
       /* Details: "Method getParameterMap(): Returns an empty map if no       */
       /* parameters exist"                                                    */
-      TestResult tr24 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_GETPARAMETERMAP6);
+      TestResult tr23 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_GETPARAMETERMAP6);
       try {
          ResourceURL turl = portletResp.createResourceURL();
          Map<String, String[]> parms = turl.getParameterMap();
          if (parms == null) {
-            tr24.appendTcDetail("Returned map is null."); 
+            tr23.appendTcDetail("Returned map is null."); 
          } else {
-            tr24.setTcSuccess(parms.isEmpty());
+            tr23.setTcSuccess(parms.isEmpty());
          }
-      } catch(Exception e) {tr24.appendTcDetail(e.toString());}
-      tr24.writeTo(writer);
+      } catch(Exception e) {tr23.appendTcDetail(e.toString());}
+      tr23.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_writeA1                 */
       /* Details: "Method write(Writer out): Writes the URL to the output     */
       /* stream through the provided Writer"                                  */
-      TestResult tr25 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_WRITEA1);
+      TestResult tr24 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_WRITEA1);
       try {
          ResourceURL turl = portletResp.createResourceURL();
          turl.setParameter("tc", "V2URLTests_BaseURL_ApiRenderResurl_writeA1");
@@ -835,14 +818,14 @@ public class URLTests_BaseURL_ApiRenderResurl implements Portlet, ResourceServin
          ResourceLink rl = new ResourceLink("V2URLTests_BaseURL_ApiRenderResurl_writeA1", urlstr);
          rl.writeResourceFetcher(writer);
       } catch(Exception e) {
-         tr25.appendTcDetail(e.toString());
-         tr25.writeTo(writer);
+         tr24.appendTcDetail(e.toString());
+         tr24.writeTo(writer);
       }
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_writeB1                 */
       /* Details: "Method write(Writer out, boolean escapeXML): Writes the    */
       /* URL to the output stream through the provided Writer"                */
-      TestResult tr26 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_WRITEB1);
+      TestResult tr25 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_WRITEB1);
       try {
          ResourceURL turl = portletResp.createResourceURL();
          turl.setParameter("tc", "V2URLTests_BaseURL_ApiRenderResurl_writeB1");
@@ -854,67 +837,67 @@ public class URLTests_BaseURL_ApiRenderResurl implements Portlet, ResourceServin
          ResourceLink rl = new ResourceLink("V2URLTests_BaseURL_ApiRenderResurl_writeB1", urlstr);
          rl.writeResourceFetcher(writer);
       } catch(Exception e) {
-         tr26.appendTcDetail(e.toString());
-         tr26.writeTo(writer);
+         tr25.appendTcDetail(e.toString());
+         tr25.writeTo(writer);
       }
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_addProperty1            */
       /* Details: "Method addProperty(String, String): A property can be      */
       /* added"                                                               */
-      TestResult tr27 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_ADDPROPERTY1);
+      TestResult tr26 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_ADDPROPERTY1);
       try {
          // Test if method can be called. Not possible to check resulting property values.
          ResourceURL turl = portletResp.createResourceURL();
          turl.addProperty("prop1", "val1");
-         tr27.setTcSuccess(true);
-      } catch(Exception e) {tr27.appendTcDetail(e.toString());}
-      tr27.writeTo(writer);
+         tr26.setTcSuccess(true);
+      } catch(Exception e) {tr26.appendTcDetail(e.toString());}
+      tr26.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_addProperty3            */
       /* Details: "Method addProperty(String, String): Throws                 */
       /* IllegalArgumentException if the specified key is null"               */
-      TestResult tr28 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_ADDPROPERTY3);
+      TestResult tr27 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_ADDPROPERTY3);
       try {
          try {
             ResourceURL turl = portletResp.createResourceURL();
             turl.addProperty(null, "value");
-            tr28.appendTcDetail("Method did not throw an exception.");
+            tr27.appendTcDetail("Method did not throw an exception.");
          } catch (IllegalArgumentException iae) {
-            tr28.setTcSuccess(true);
+            tr27.setTcSuccess(true);
          } catch (Exception e) {
-            tr28.appendTcDetail(e.toString());
+            tr27.appendTcDetail(e.toString());
          }
-      } catch(Exception e) {tr28.appendTcDetail(e.toString());}
-      tr28.writeTo(writer);
+      } catch(Exception e) {tr27.appendTcDetail(e.toString());}
+      tr27.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_setProperty1            */
       /* Details: "Method setProperty(String, String): Sets a property        */
       /* value for the specified key"                                         */
-      TestResult tr29 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_SETPROPERTY1);
+      TestResult tr28 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_SETPROPERTY1);
       try {
          // Test if method can be called. Not possible to check resulting property values.
          ResourceURL turl = portletResp.createResourceURL();
          turl.setProperty("prop1", "val1");
-         tr29.setTcSuccess(true);
-      } catch(Exception e) {tr29.appendTcDetail(e.toString());}
-      tr29.writeTo(writer);
+         tr28.setTcSuccess(true);
+      } catch(Exception e) {tr28.appendTcDetail(e.toString());}
+      tr28.writeTo(writer);
 
       /* TestCase: V2URLTests_BaseURL_ApiRenderResurl_setProperty3            */
       /* Details: "Method setProperty(String, String): Throws                 */
       /* IllegalArgumentException if the specified key is null"               */
-      TestResult tr30 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_SETPROPERTY3);
+      TestResult tr29 = tcd.getTestResultFailed(V2URLTESTS_BASEURL_APIRENDERRESURL_SETPROPERTY3);
       try {
          try {
             ResourceURL turl = portletResp.createResourceURL();
             turl.setProperty(null, "value");
-            tr30.appendTcDetail("Method did not throw an exception.");
+            tr29.appendTcDetail("Method did not throw an exception.");
          } catch (IllegalArgumentException iae) {
-            tr30.setTcSuccess(true);
+            tr29.setTcSuccess(true);
          } catch (Exception e) {
-            tr30.appendTcDetail(e.toString());
+            tr29.appendTcDetail(e.toString());
          }
-      } catch(Exception e) {tr30.appendTcDetail(e.toString());}
-      tr30.writeTo(writer);
+      } catch(Exception e) {tr29.appendTcDetail(e.toString());}
+      tr29.writeTo(writer);
 
    }
 


Mime
View raw message