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/10/09 10:37:11 UTC
[2/5] git commit: In the module V2URLTests,
implemented those tests from V2AddlURLTests that were not already
implemented. Removed all tests from V2AddlURLTests, as they were redundant.
In the module V2URLTests, implemented those tests from V2AddlURLTests that
were not already implemented. Removed all tests from V2AddlURLTests, as
they were redundant.
The module V2AddlURLTests is now empty and may be removed in the future if
not needed. The module V2URLTests contains all JSR 286 URL-specific
testing.
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/c95907b1
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/c95907b1
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/c95907b1
Branch: refs/heads/master
Commit: c95907b1c90fbbfe3984f04184ea5fbe4cd7ee02
Parents: dc49684
Author: Scott Nicklous <ms...@apache.org>
Authored: Wed Oct 8 20:34:36 2014 +0200
Committer: Scott Nicklous <ms...@apache.org>
Committed: Wed Oct 8 20:34:36 2014 +0200
----------------------------------------------------------------------
.../AddlUrlTests_SPEC2_7_UrlAction.java | 267 -------------------
.../AddlUrlTests_SPEC2_7_UrlListener.java | 114 --------
.../AddlUrlTests_SPEC2_7_UrlRender.java | 264 ------------------
.../AddlUrlTests_SPEC2_7_UrlResource.java | 197 --------------
.../src/main/resources/logging.properties | 13 -
.../resources/xml-resources/additionalTCs.xml | 37 ---
.../src/main/webapp/WEB-INF/portlet.xml | 65 -----
.../TestPortletURLGenerationListener2.java | 78 ++++++
...etURLGenerationListener_ApiRenderActurl.java | 125 ++++++---
.../URLTests_ResourceURL_ApiRenderResurl.java | 80 +++---
.../resources/xml-resources/additionalTCs.xml | 3 +
.../src/main/webapp/WEB-INF/portlet.xml | 3 +
.../tck/beans/JSR286ApiTestCaseDetails.java | 16 +-
13 files changed, 226 insertions(+), 1036 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c95907b1/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java
deleted file mode 100644
index 263ba48..0000000
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlAction.java
+++ /dev/null
@@ -1,267 +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.JSR286SpecTestCaseDetails.*;
-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 AddlUrlTests_SPEC2_7_UrlAction_event
- *
- */
-public class AddlUrlTests_SPEC2_7_UrlAction implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- AddlUrlTests_SPEC2_7_UrlAction.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();
-
- JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
-
- // Create result objects for the tests
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL1 */
- /* Details: "When a action URL is triggered, the processAction method */
- /* must be invoked" */
- TestResult tr0 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL1);
- /* TODO: implement test */
- tr0.appendTcDetail("Not implemented.");
- tr0.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL2 */
- /* Details: "When action parameters are set on a action URL, those */
- /* parameters must become action parameters of the request resulting */
- /* from triggering the actionURL" */
- TestResult tr1 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL2);
- /* TODO: implement test */
- tr1.appendTcDetail("Not implemented.");
- tr1.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL3 */
- /* Details: "When action parameters are set on a action URL, those */
- /* parameters must become action parameters of the request resulting */
- /* from triggering the actionURL" */
- TestResult tr2 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL3);
- /* TODO: implement test */
- tr2.appendTcDetail("Not implemented.");
- tr2.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL4 */
- /* Details: "Action parameters can be set on the action URL through */
- /* the setParameter(String, String) method" */
- TestResult tr3 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL4);
- /* TODO: implement test */
- tr3.appendTcDetail("Not implemented.");
- tr3.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL5 */
- /* Details: "Action parameters can be set on the action URL through */
- /* the setParameter(String, String[]) method" */
- TestResult tr4 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL5);
- /* TODO: implement test */
- tr4.appendTcDetail("Not implemented.");
- tr4.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL6 */
- /* Details: "Action parameters can be set on the action URL through */
- /* the setParameterMap(Map<String, String[]>) method" */
- TestResult tr5 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL6);
- /* TODO: implement test */
- tr5.appendTcDetail("Not implemented.");
- tr5.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL7 */
- /* Details: "If a parameter with an existing name is set through one */
- /* of the setParameter methods, the existing value is repalced with */
- /* the new value" */
- TestResult tr6 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL7);
- /* TODO: implement test */
- tr6.appendTcDetail("Not implemented.");
- tr6.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL8 */
- /* Details: "When an action URL is created, render parameters from */
- /* the current request are not automatically copied to the new action */
- /* URL" */
- TestResult tr7 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLACTION_ACTIONURL8);
- /* TODO: implement test */
- tr7.appendTcDetail("Not implemented.");
- tr7.writeTo(writer);
-
- portletReq.getPortletSession().setAttribute(
- Constants.RESULT_ATTR_PREFIX + "AddlUrlTests_SPEC2_7_UrlAction",
- writer.toString(), APPLICATION_SCOPE);
- }
-
- @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();
-
- PortletSession ps = portletReq.getPortletSession();
- String msg = (String) ps.getAttribute(RESULT_ATTR_PREFIX + "AddlUrlTests_SPEC2_7_UrlAction", APPLICATION_SCOPE);
- if (msg != null) {
- writer.write("<p>" + msg + "</p><br/>\n");
- ps.removeAttribute(RESULT_ATTR_PREFIX + "AddlUrlTests_SPEC2_7_UrlAction", APPLICATION_SCOPE);
- }
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL1 */
- /* Details: "When a action URL is triggered, the processAction method */
- /* must be invoked" */
- {
- PortletURL aurl = portletResp.createActionURL();
- aurl.setParameters(portletReq.getPrivateParameterMap());
- TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL1", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL2 */
- /* Details: "When action parameters are set on a action URL, those */
- /* parameters must become action parameters of the request resulting */
- /* from triggering the actionURL" */
- {
- PortletURL aurl = portletResp.createActionURL();
- aurl.setParameters(portletReq.getPrivateParameterMap());
- TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL2", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL3 */
- /* Details: "When action parameters are set on a action URL, those */
- /* parameters must become action parameters of the request resulting */
- /* from triggering the actionURL" */
- {
- PortletURL aurl = portletResp.createActionURL();
- aurl.setParameters(portletReq.getPrivateParameterMap());
- TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL3", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL4 */
- /* Details: "Action parameters can be set on the action URL through */
- /* the setParameter(String, String) method" */
- {
- PortletURL aurl = portletResp.createActionURL();
- aurl.setParameters(portletReq.getPrivateParameterMap());
- TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL4", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL5 */
- /* Details: "Action parameters can be set on the action URL through */
- /* the setParameter(String, String[]) method" */
- {
- PortletURL aurl = portletResp.createActionURL();
- aurl.setParameters(portletReq.getPrivateParameterMap());
- TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL5", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL6 */
- /* Details: "Action parameters can be set on the action URL through */
- /* the setParameterMap(Map<String, String[]>) method" */
- {
- PortletURL aurl = portletResp.createActionURL();
- aurl.setParameters(portletReq.getPrivateParameterMap());
- TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL6", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL7 */
- /* Details: "If a parameter with an existing name is set through one */
- /* of the setParameter methods, the existing value is repalced with */
- /* the new value" */
- {
- PortletURL aurl = portletResp.createActionURL();
- aurl.setParameters(portletReq.getPrivateParameterMap());
- TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL7", aurl);
- tb.writeTo(writer);
- }
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlAction_actionURL8 */
- /* Details: "When an action URL is created, render parameters from */
- /* the current request are not automatically copied to the new action */
- /* URL" */
- {
- PortletURL aurl = portletResp.createActionURL();
- aurl.setParameters(portletReq.getPrivateParameterMap());
- TestButton tb = new TestButton("V2AddlUrlTests_SPEC2_7_UrlAction_actionURL8", aurl);
- tb.writeTo(writer);
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c95907b1/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlListener.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlListener.java b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlListener.java
deleted file mode 100644
index 94dc019..0000000
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlListener.java
+++ /dev/null
@@ -1,114 +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.JSR286SpecTestCaseDetails.*;
-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 AddlUrlTests_SPEC2_7_UrlListener_event
- *
- */
-public class AddlUrlTests_SPEC2_7_UrlListener implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- AddlUrlTests_SPEC2_7_UrlListener.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();
-
- JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
-
- // Create result objects for the tests
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlListener_portletURLGenerationListener6 */
- /* Details: "If more than one listener is registered the portlet */
- /* container must chain the listeners in the order of how they appear */
- /* in the deployment descriptor" */
- TestResult tr0 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLLISTENER_PORTLETURLGENERATIONLISTENER6);
- /* TODO: implement test */
- tr0.appendTcDetail("Not implemented.");
- tr0.writeTo(writer);
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c95907b1/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java
deleted file mode 100644
index 744fce6..0000000
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlRender.java
+++ /dev/null
@@ -1,264 +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.JSR286SpecTestCaseDetails.*;
-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 AddlUrlTests_SPEC2_7_UrlRender_event
- *
- */
-public class AddlUrlTests_SPEC2_7_UrlRender implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- AddlUrlTests_SPEC2_7_UrlRender.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();
-
- JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
-
- // Create result objects for the tests
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL1 */
- /* Details: "When a render URL is triggered, the render method must */
- /* be invoked" */
- TestResult tr0 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL1);
- /* TODO: implement test */
- tr0.appendTcDetail("Not implemented.");
- tr0.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL2 */
- /* Details: "When render parameters are set on a render URL, those */
- /* parameters must become render parameters of the request resulting */
- /* from triggering the renderURL" */
- TestResult tr1 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL2);
- /* TODO: implement test */
- tr1.appendTcDetail("Not implemented.");
- tr1.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL3 */
- /* Details: "When render parameters are set on a render URL, those */
- /* parameters must become render parameters of the request resulting */
- /* from triggering the renderURL" */
- TestResult tr2 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL3);
- /* TODO: implement test */
- tr2.appendTcDetail("Not implemented.");
- tr2.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL4 */
- /* Details: "Private render parameters can be set on the render URL */
- /* through the setParameter(String, String) method" */
- TestResult tr3 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL4);
- /* TODO: implement test */
- tr3.appendTcDetail("Not implemented.");
- tr3.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL5 */
- /* Details: "Private render parameters can be set on the render URL */
- /* through the setParameter(String, String[]) method" */
- TestResult tr4 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL5);
- /* TODO: implement test */
- tr4.appendTcDetail("Not implemented.");
- tr4.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL6 */
- /* Details: "Private render parameters can be set on the render URL */
- /* through the setParameterMap(Map<String, String[]>) method" */
- TestResult tr5 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL6);
- /* TODO: implement test */
- tr5.appendTcDetail("Not implemented.");
- tr5.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL7 */
- /* Details: "Public render parameters can be set on the render URL */
- /* through the setParameter(String, String) method" */
- TestResult tr6 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL7);
- /* TODO: implement test */
- tr6.appendTcDetail("Not implemented.");
- tr6.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL8 */
- /* Details: "Public render parameters can be set on the render URL */
- /* through the setParameter(String, String[]) method" */
- TestResult tr7 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL8);
- /* TODO: implement test */
- tr7.appendTcDetail("Not implemented.");
- tr7.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL9 */
- /* Details: "Public render parameters can be set on the render URL */
- /* through the setParameterMap(Map<String, String[]>) method" */
- TestResult tr8 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL9);
- /* TODO: implement test */
- tr8.appendTcDetail("Not implemented.");
- tr8.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL10 */
- /* Details: "If a parameter with an existing name is set through one */
- /* of the setParameter methods, the existing value is repalced with */
- /* the new value" */
- TestResult tr9 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL10);
- /* TODO: implement test */
- tr9.appendTcDetail("Not implemented.");
- tr9.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_renderURL11 */
- /* Details: "When a render URL is created, render parameters from the */
- /* current request are not automatically copied to the new render */
- /* URL" */
- TestResult tr10 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_RENDERURL11);
- /* TODO: implement test */
- tr10.appendTcDetail("Not implemented.");
- tr10.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_portletMode1 */
- /* Details: "The portlet may not set a portlet mode that is not */
- /* defined as supported in the deployment descriptor on a portlet */
- /* URL" */
- TestResult tr11 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_PORTLETMODE1);
- /* TODO: implement test */
- tr11.appendTcDetail("Not implemented.");
- tr11.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_portletMode2 */
- /* Details: "The portlet may not set a portlet mode on a portlet URL */
- /* that it is not allowed to use" */
- TestResult tr12 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_PORTLETMODE2);
- /* TODO: implement test */
- tr12.appendTcDetail("Not implemented.");
- tr12.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_portletMode4 */
- /* Details: "If the portlet mode is not set, the URL must have the */
- /* portlet mode set for the current request as default" */
- TestResult tr13 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_PORTLETMODE4);
- /* TODO: implement test */
- tr13.appendTcDetail("Not implemented.");
- tr13.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_windowState1 */
- /* Details: "The portlet may not set a window state that is not */
- /* defined as supported in the deployment descriptor on a portlet */
- /* URL" */
- TestResult tr14 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_WINDOWSTATE1);
- /* TODO: implement test */
- tr14.appendTcDetail("Not implemented.");
- tr14.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_windowState2 */
- /* Details: "The portlet may not set a window state on a portlet URL */
- /* that it is not allowed to use" */
- TestResult tr15 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_WINDOWSTATE2);
- /* TODO: implement test */
- tr15.appendTcDetail("Not implemented.");
- tr15.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_windowState4 */
- /* Details: "If the window state is not set, the URL must have the */
- /* window state set for the current request as default" */
- TestResult tr16 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_WINDOWSTATE4);
- /* TODO: implement test */
- tr16.appendTcDetail("Not implemented.");
- tr16.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_setSecure1 */
- /* Details: "If setSecure is called with the parameter set to TRUE, */
- /* the transport for the request triggered by the URL must be secure" */
- TestResult tr17 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_SETSECURE1);
- /* TODO: implement test */
- tr17.appendTcDetail("Not implemented.");
- tr17.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlRender_setSecure3 */
- /* Details: "If setSecure is not called, the transport for the */
- /* request triggered by the URL should be at the same security level */
- /* as the current request" */
- TestResult tr18 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRENDER_SETSECURE3);
- /* TODO: implement test */
- tr18.appendTcDetail("Not implemented.");
- tr18.writeTo(writer);
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c95907b1/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java b/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java
deleted file mode 100644
index 31b9b4b..0000000
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/java/javax/portlet/tck/portlets/AddlUrlTests_SPEC2_7_UrlResource.java
+++ /dev/null
@@ -1,197 +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.JSR286SpecTestCaseDetails.*;
-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 AddlUrlTests_SPEC2_7_UrlResource_event
- *
- */
-public class AddlUrlTests_SPEC2_7_UrlResource implements Portlet, ResourceServingPortlet {
- private static final String LOG_CLASS =
- AddlUrlTests_SPEC2_7_UrlResource.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();
-
- JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
-
- // Create result objects for the tests
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL1 */
- /* Details: "When a resource URL is triggered, the serveResource */
- /* method must be invoked" */
- TestResult tr0 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL1);
- /* TODO: implement test */
- tr0.appendTcDetail("Not implemented.");
- tr0.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL2 */
- /* Details: "When resource parameters are set on a resource URL, */
- /* those parameters must become resource parameters of the request */
- /* resulting from triggering the resourceURL" */
- TestResult tr1 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL2);
- /* TODO: implement test */
- tr1.appendTcDetail("Not implemented.");
- tr1.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL3 */
- /* Details: "When resource parameters are set on a resource URL, */
- /* those parameters must become resource parameters of the request */
- /* resulting from triggering the resourceURL" */
- TestResult tr2 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL3);
- /* TODO: implement test */
- tr2.appendTcDetail("Not implemented.");
- tr2.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL4 */
- /* Details: "Resource parameters can be set on the resource URL */
- /* through the setParameter(String, String) method" */
- TestResult tr3 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL4);
- /* TODO: implement test */
- tr3.appendTcDetail("Not implemented.");
- tr3.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL5 */
- /* Details: "Resource parameters can be set on the resource URL */
- /* through the setParameter(String, String[]) method" */
- TestResult tr4 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL5);
- /* TODO: implement test */
- tr4.appendTcDetail("Not implemented.");
- tr4.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL6 */
- /* Details: "Resource parameters can be set on the resource URL */
- /* through the setParameterMap(Map<String, String[]>) method" */
- TestResult tr5 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL6);
- /* TODO: implement test */
- tr5.appendTcDetail("Not implemented.");
- tr5.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL7 */
- /* Details: "If a parameter with an existing name is set through one */
- /* of the setParameter methods, the existing value is replaced with */
- /* the new value" */
- TestResult tr6 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL7);
- /* TODO: implement test */
- tr6.appendTcDetail("Not implemented.");
- tr6.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL8 */
- /* Details: "When a resource URL is created, render parameters from */
- /* the current request are automatically copied to the new resource */
- /* URL" */
- TestResult tr7 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL8);
- /* TODO: implement test */
- tr7.appendTcDetail("Not implemented.");
- tr7.writeTo(writer);
-
- /* TestCase: V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL9 */
- /* Details: "When a resource URL is created, the automatically copied */
- /* render parameters are hidden to the ResourceURL getParameter */
- /* method" */
- TestResult tr8 = tcd.getTestResultFailed(V2ADDLURLTESTS_SPEC2_7_URLRESOURCE_RESOURCEURL9);
- /* TODO: implement test */
- tr8.appendTcDetail("Not implemented.");
- tr8.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=\"AddlUrlTests_SPEC2_7_UrlResource\">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(\"AddlUrlTests_SPEC2_7_UrlResource\").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/c95907b1/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/logging.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/logging.properties b/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/logging.properties
deleted file mode 100644
index e71eca6..0000000
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/logging.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-############################################################
-# Define logging for this webapp (Tomcat)
-############################################################
-handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
-
-org.apache.juli.FileHandler.level = FINEST
-org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-org.apache.juli.FileHandler.prefix = javax.portlet-tck.
-
-java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-javax.portlet.tck.level = FINEST
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c95907b1/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/xml-resources/additionalTCs.xml
index c3ef790..fb66b69 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2AddlUrlTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -20,41 +20,4 @@
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
<!-- JSR 286 API AddlUrlTests test case names and page mappings -->
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL1">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL2">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL3">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL4">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL5">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL6">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL7">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL8">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL9">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL10">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_renderURL11">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_portletMode1">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_portletMode2">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_portletMode4">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_windowState1">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_windowState2">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_windowState4">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_setSecure1">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlRender_setSecure3">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL1">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL2">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL3">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL4">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL5">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL6">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL7">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlAction_actionURL8">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL1">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL2">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL3">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL4">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL5">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL6">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL7">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL8">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlResource_resourceURL9">V2AddlUrlTests</entry>
-<entry key="V2AddlUrlTests_SPEC2_7_UrlListener_portletURLGenerationListener6">V2AddlUrlTests</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c95907b1/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/portlet.xml
index 72953be..9b5d2f4 100644
--- a/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2AddlUrlTests/src/main/webapp/WEB-INF/portlet.xml
@@ -22,72 +22,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
xmlns:tck="http://www.apache.org/portals/pluto/portlet-tck_3.0"
version="2.0" id="V2AddlUrlTests">
- <portlet>
- <portlet-name>AddlUrlTests_SPEC2_7_UrlRender</portlet-name>
- <portlet-class>javax.portlet.tck.portlets.AddlUrlTests_SPEC2_7_UrlRender</portlet-class>
- <expiration-cache>0</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- </supports>
- <supported-locale>en_US</supported-locale>
- <portlet-info>
- <title>AddlUrlTests_SPEC2_7_UrlRender</title>
- </portlet-info>
- </portlet>
- <portlet>
- <portlet-name>AddlUrlTests_SPEC2_7_UrlAction</portlet-name>
- <portlet-class>javax.portlet.tck.portlets.AddlUrlTests_SPEC2_7_UrlAction</portlet-class>
- <expiration-cache>0</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- </supports>
- <supported-locale>en_US</supported-locale>
- <portlet-info>
- <title>AddlUrlTests_SPEC2_7_UrlAction</title>
- </portlet-info>
- </portlet>
-
- <portlet>
- <portlet-name>AddlUrlTests_SPEC2_7_UrlResource</portlet-name>
- <portlet-class>javax.portlet.tck.portlets.AddlUrlTests_SPEC2_7_UrlResource</portlet-class>
- <expiration-cache>0</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- </supports>
- <supported-locale>en_US</supported-locale>
- <portlet-info>
- <title>AddlUrlTests_SPEC2_7_UrlResource</title>
- </portlet-info>
- </portlet>
-
- <portlet>
- <portlet-name>AddlUrlTests_SPEC2_7_UrlListener</portlet-name>
- <portlet-class>javax.portlet.tck.portlets.AddlUrlTests_SPEC2_7_UrlListener</portlet-class>
- <expiration-cache>0</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- </supports>
- <supported-locale>en_US</supported-locale>
- <portlet-info>
- <title>AddlUrlTests_SPEC2_7_UrlListener</title>
- </portlet-info>
- </portlet>
-
- <event-definition>
- <qname>tck:AddlPortletTests_SPEC2_5_EventHandling</qname>
- <value-type>java.lang.String</value-type>
- </event-definition>
-
- <event-definition>
- <qname>tck:AddlPortletTests_SPEC2_15_Event</qname>
- <value-type>java.lang.String</value-type>
- </event-definition>
-
- <event-definition>
- <qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
- <value-type>java.lang.String</value-type>
- </event-definition>
<public-render-parameter>
<identifier>tckPRP1</identifier>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c95907b1/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/listeners/TestPortletURLGenerationListener2.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/listeners/TestPortletURLGenerationListener2.java b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/listeners/TestPortletURLGenerationListener2.java
new file mode 100644
index 0000000..c29f62d
--- /dev/null
+++ b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/listeners/TestPortletURLGenerationListener2.java
@@ -0,0 +1,78 @@
+/* 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.listeners;
+
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+import static java.util.logging.Logger.*;
+import javax.portlet.*;
+import javax.portlet.filter.*;
+import javax.portlet.tck.beans.*;
+import javax.portlet.tck.constants.*;
+import static javax.portlet.tck.constants.Constants.*;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.*;
+import static javax.portlet.PortletSession.*;
+import static javax.portlet.ResourceURL.*;
+
+/**
+ *Test PortletURLGenerationListener
+ * Used by portlet: URLTests_PortletURLGenerationListener_ApiRenderResurl
+ *
+ * @author nick
+ *
+ */
+public class TestPortletURLGenerationListener2 implements PortletURLGenerationListener {
+ private static final String LOG_CLASS =
+ TestPortletURLGenerationListener2.class.getName();
+ private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+ // set parameters on URLs to indicate test success
+
+ public void filterActionURL(PortletURL url) {
+ if (isURLGenTc(url)) url.setParameter("PUGL2", "Action");
+ }
+
+ public void filterRenderURL(PortletURL url) {
+ if (isURLGenTc(url)) url.setParameter("PUGL2", "Render");
+ }
+
+ public void filterResourceURL(ResourceURL url) {
+ if (isURLGenTc(url)) url.setParameter("PUGL2", "Resource");
+ }
+
+ // only set parm for PortletURLGenerationListener test cases.
+ // This is the second registered listener, so the parameter set by
+ // the first listener should be set. If it isn't, it's an error,
+ // so refrain from setting the "PUGL2" parameter.
+ 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")) {
+ vals = (String[]) url.getParameterMap().get("PUGL");
+ if ((vals != null) && (vals.length > 0) && vals[0].matches("^(?:Action|Render|Resource)$")) {
+ ok = true;
+ }
+ }
+ return ok;
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c95907b1/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_PortletURLGenerationListener_ApiRenderActurl.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_PortletURLGenerationListener_ApiRenderActurl.java b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_PortletURLGenerationListener_ApiRenderActurl.java
index 42e21ef..b87de6d 100644
--- a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_PortletURLGenerationListener_ApiRenderActurl.java
+++ b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_PortletURLGenerationListener_ApiRenderActurl.java
@@ -90,93 +90,111 @@ public class URLTests_PortletURLGenerationListener_ApiRenderActurl implements Po
}
}
+ // evaluate results for test case V2URLTests_PortletURLGenerationListener_ApiRenderActurl_portletURLGenerationListener6
+ {
+ JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
+ TestResult tr1 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_PORTLETURLGENERATIONLISTENER6);
+ String tcval = portletReq.getParameter("tc");
+ if (tcval.equals("V2URLTests_PortletURLGenerationListener_ApiRenderActurl_portletURLGenerationListener6")) {
+ // Verify that the listener set the parameter as expected
+ String val = portletReq.getParameter("PUGL2");
+ boolean ok = (val != null) && val.equals("Action");
+ if (!ok) {
+ tr1.appendTcDetail("Parameter not set by listener. Expected: Action, actual: " + val);
+ }
+ tr1.setTcSuccess(ok);
+ PortletSession ps = portletReq.getPortletSession();
+ ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_portletURLGenerationListener6", tr1);
+ }
+ }
+
// evaluate results for test case V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL1
{
JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
- TestResult tr1 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL1);
+ TestResult tr2 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL1);
String tcval = portletReq.getParameter("tc");
if (tcval.equals("V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL1")) {
// Verify that the listener set the parameter as expected
String val = portletReq.getParameter("PUGL");
boolean ok = (val != null) && val.equals("Action");
if (!ok) {
- tr1.appendTcDetail("Parameter not set by listener. Expected: Action, actual: " + val);
+ tr2.appendTcDetail("Parameter not set by listener. Expected: Action, actual: " + val);
}
- tr1.setTcSuccess(ok);
+ tr2.setTcSuccess(ok);
PortletSession ps = portletReq.getPortletSession();
- ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL1", tr1);
+ ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL1", tr2);
}
}
// evaluate results for test case V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL2
{
JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
- TestResult tr2 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL2);
+ TestResult tr3 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL2);
String tcval = portletReq.getParameter("tc");
if (tcval.equals("V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL2")) {
// Verify that the listener set the parameter as expected
String val = portletReq.getParameter("PUGL");
boolean ok = (val != null) && val.equals("Action");
if (!ok) {
- tr2.appendTcDetail("Parameter not set by listener. Expected: Action, actual: " + val);
+ tr3.appendTcDetail("Parameter not set by listener. Expected: Action, actual: " + val);
}
- tr2.setTcSuccess(ok);
+ tr3.setTcSuccess(ok);
PortletSession ps = portletReq.getPortletSession();
- ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL2", tr2);
+ ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL2", tr3);
}
}
// evaluate results for test case V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL3
{
JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
- TestResult tr3 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL3);
+ TestResult tr4 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL3);
String tcval = portletReq.getParameter("tc");
if (tcval.equals("V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL3")) {
// Verify that the listener set the parameter as expected
String val = portletReq.getParameter("PUGL");
boolean ok = (val != null) && val.equals("Action");
if (!ok) {
- tr3.appendTcDetail("Parameter not set by listener. Expected: Action, actual: " + val);
+ tr4.appendTcDetail("Parameter not set by listener. Expected: Action, actual: " + val);
}
- tr3.setTcSuccess(ok);
+ tr4.setTcSuccess(ok);
PortletSession ps = portletReq.getPortletSession();
- ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL3", tr3);
+ ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL3", tr4);
}
}
// evaluate results for test case V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL4
{
JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
- TestResult tr4 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL4);
+ TestResult tr5 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL4);
String tcval = portletReq.getParameter("tc");
if (tcval.equals("V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL4")) {
// Verify that the listener set the parameter as expected
String val = portletReq.getParameter("PUGL");
boolean ok = (val != null) && val.equals("Action");
if (!ok) {
- tr4.appendTcDetail("Parameter not set by listener. Expected: Action, actual: " + val);
+ tr5.appendTcDetail("Parameter not set by listener. Expected: Action, actual: " + val);
}
- tr4.setTcSuccess(ok);
+ tr5.setTcSuccess(ok);
PortletSession ps = portletReq.getPortletSession();
- ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL4", tr4);
+ ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL4", tr5);
}
}
// evaluate results for test case V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL5
{
JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
- TestResult tr5 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL5);
+ TestResult tr6 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL5);
String tcval = portletReq.getParameter("tc");
if (tcval.equals("V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL5")) {
// Verify that the listener set the parameter as expected
String val = portletReq.getParameter("PUGL");
boolean ok = (val != null) && val.equals("Action");
if (!ok) {
- tr5.appendTcDetail("Parameter not set by listener. Expected: Action, actual: " + val);
+ tr6.appendTcDetail("Parameter not set by listener. Expected: Action, actual: " + val);
}
- tr5.setTcSuccess(ok);
+ tr6.setTcSuccess(ok);
PortletSession ps = portletReq.getPortletSession();
- ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL5", tr5);
+ ps.setAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL5", tr6);
}
}
@@ -236,11 +254,38 @@ public class URLTests_PortletURLGenerationListener_ApiRenderActurl implements Po
} catch(Exception e) {tr0.appendTcDetail(e.toString());}
tr0.writeTo(writer);
+ /* TestCase: V2URLTests_PortletURLGenerationListener_ApiRenderActurl_portletURLGenerationListener6 */
+ /* Details: "If more than one listener is registered the portlet */
+ /* container must chain the listeners in the order of how they appear */
+ /* in the deployment descriptor" */
+ TestResult tr1 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_PORTLETURLGENERATIONLISTENER6);
+ try {
+ PortletURL turl = portletResp.createActionURL();
+ turl.setParameter("tc", "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_portletURLGenerationListener6");
+ String urlstr = turl.toString();
+
+ // add the execution button for an action request
+ TestButton tb = new TestButton("V2URLTests_PortletURLGenerationListener_ApiRenderActurl_portletURLGenerationListener6", urlstr);
+ tb.writeTo(writer);
+
+ // display evaluated results
+ String tcval = portletReq.getParameter("tc");
+ if (tcval.equals("V2URLTests_PortletURLGenerationListener_ApiRenderActurl_portletURLGenerationListener6")) {
+ PortletSession ps = portletReq.getPortletSession();
+ TestResult tmp = (TestResult)ps.getAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_portletURLGenerationListener6");
+ if (tmp != null) {
+ tr1 = tmp;
+ ps.removeAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_portletURLGenerationListener6");
+ }
+ }
+ } catch(Exception e) {tr1.appendTcDetail(e.toString());}
+ tr1.writeTo(writer);
+
/* TestCase: V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL1 */
/* Details: "Method filterActionURL(PortletURL): The */
/* filterActionURL(PortletURL): method is called before the */
/* toString() method is executed" */
- TestResult tr1 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL1);
+ TestResult tr2 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL1);
try {
PortletURL turl = portletResp.createActionURL();
turl.setParameter("tc", "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL1");
@@ -256,18 +301,18 @@ public class URLTests_PortletURLGenerationListener_ApiRenderActurl implements Po
PortletSession ps = portletReq.getPortletSession();
TestResult tmp = (TestResult)ps.getAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL1");
if (tmp != null) {
- tr1 = tmp;
+ tr2 = tmp;
ps.removeAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL1");
}
}
- } catch(Exception e) {tr1.appendTcDetail(e.toString());}
- tr1.writeTo(writer);
+ } catch(Exception e) {tr2.appendTcDetail(e.toString());}
+ tr2.writeTo(writer);
/* TestCase: V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL2 */
/* Details: "Method filterActionURL(PortletURL): The */
/* filterActionURL(PortletURL): method is called before the */
/* write(Writer out) method is executed" */
- TestResult tr2 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL2);
+ TestResult tr3 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL2);
try {
PortletURL turl = portletResp.createActionURL();
turl.setParameter("tc", "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL2");
@@ -285,18 +330,18 @@ public class URLTests_PortletURLGenerationListener_ApiRenderActurl implements Po
PortletSession ps = portletReq.getPortletSession();
TestResult tmp = (TestResult)ps.getAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL2");
if (tmp != null) {
- tr2 = tmp;
+ tr3 = tmp;
ps.removeAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL2");
}
}
- } catch(Exception e) {tr2.appendTcDetail(e.toString());}
- tr2.writeTo(writer);
+ } catch(Exception e) {tr3.appendTcDetail(e.toString());}
+ tr3.writeTo(writer);
/* TestCase: V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL3 */
/* Details: "Method filterActionURL(PortletURL): The */
/* filterActionURL(PortletURL): method is called before the */
/* write(Writer out, boolean escapeXML) method is executed" */
- TestResult tr3 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL3);
+ TestResult tr4 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL3);
try {
PortletURL turl = portletResp.createActionURL();
turl.setParameter("tc", "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL3");
@@ -314,18 +359,18 @@ public class URLTests_PortletURLGenerationListener_ApiRenderActurl implements Po
PortletSession ps = portletReq.getPortletSession();
TestResult tmp = (TestResult)ps.getAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL3");
if (tmp != null) {
- tr3 = tmp;
+ tr4 = tmp;
ps.removeAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL3");
}
}
- } catch(Exception e) {tr3.appendTcDetail(e.toString());}
- tr3.writeTo(writer);
+ } catch(Exception e) {tr4.appendTcDetail(e.toString());}
+ tr4.writeTo(writer);
/* TestCase: V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL4 */
/* Details: "Method filterActionURL(PortletURL): The filterActionURL */
/* method is passed the PortletURL object representing the action */
/* URL" */
- TestResult tr4 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL4);
+ TestResult tr5 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL4);
try {
PortletURL turl = portletResp.createActionURL();
turl.setParameter("tc", "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL4");
@@ -341,18 +386,18 @@ public class URLTests_PortletURLGenerationListener_ApiRenderActurl implements Po
PortletSession ps = portletReq.getPortletSession();
TestResult tmp = (TestResult)ps.getAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL4");
if (tmp != null) {
- tr4 = tmp;
+ tr5 = tmp;
ps.removeAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL4");
}
}
- } catch(Exception e) {tr4.appendTcDetail(e.toString());}
- tr4.writeTo(writer);
+ } catch(Exception e) {tr5.appendTcDetail(e.toString());}
+ tr5.writeTo(writer);
/* TestCase: V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL5 */
/* Details: "Method filterActionURL(PortletURL): The input URL object */
/* can be modified by setting a parameter and the modified URL object */
/* is processed by the PortletURL toString or write method" */
- TestResult tr5 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL5);
+ TestResult tr6 = tcd.getTestResultFailed(V2URLTESTS_PORTLETURLGENERATIONLISTENER_APIRENDERACTURL_FILTERACTIONURL5);
try {
PortletURL turl = portletResp.createActionURL();
turl.setParameter("tc", "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL5");
@@ -368,12 +413,12 @@ public class URLTests_PortletURLGenerationListener_ApiRenderActurl implements Po
PortletSession ps = portletReq.getPortletSession();
TestResult tmp = (TestResult)ps.getAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL5");
if (tmp != null) {
- tr5 = tmp;
+ tr6 = tmp;
ps.removeAttribute(RESULT_ATTR_PREFIX + "V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL5");
}
}
- } catch(Exception e) {tr5.appendTcDetail(e.toString());}
- tr5.writeTo(writer);
+ } catch(Exception e) {tr6.appendTcDetail(e.toString());}
+ tr6.writeTo(writer);
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c95907b1/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_ResourceURL_ApiRenderResurl.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_ResourceURL_ApiRenderResurl.java b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_ResourceURL_ApiRenderResurl.java
index 480b10b..a5a2472 100644
--- a/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_ResourceURL_ApiRenderResurl.java
+++ b/portlet-tck_3.0/V2URLTests/src/main/java/javax/portlet/tck/portlets/URLTests_ResourceURL_ApiRenderResurl.java
@@ -87,50 +87,50 @@ public class URLTests_ResourceURL_ApiRenderResurl implements Portlet, ResourceSe
// evaluate results for test case V2URLTests_ResourceURL_ApiRenderResurl_setResourceID
{
JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
- TestResult tr4 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETRESOURCEID);
+ TestResult tr6 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETRESOURCEID);
String tcval = portletReq.getParameter("tc");
if (tcval.equals("V2URLTests_ResourceURL_ApiRenderResurl_setResourceID")) {
String resid = portletReq.getResourceID();
boolean ok = (resid.equals("TestResourceID"));
if (!ok) {
- tr4.appendTcDetail("ResourceID expected: \"TestResourceID\", actual: " + resid);
+ tr6.appendTcDetail("ResourceID expected: \"TestResourceID\", actual: " + resid);
}
- tr4.setTcSuccess(ok);
- tr4.writeTo(writer);
+ tr6.setTcSuccess(ok);
+ tr6.writeTo(writer);
}
}
// evaluate results for test case V2URLTests_ResourceURL_ApiRenderResurl_setCacheability1
{
JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
- TestResult tr6 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETCACHEABILITY1);
+ TestResult tr8 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETCACHEABILITY1);
String tcval = portletReq.getParameter("tc");
if (tcval.equals("V2URLTests_ResourceURL_ApiRenderResurl_setCacheability1")) {
String c = portletReq.getCacheability();
boolean ok = (c.equals(ResourceURL.PORTLET));
if (!ok) {
- tr6.appendTcDetail("Cacheability expected: " + ResourceURL.PORTLET + ", actual: " + c);
+ tr8.appendTcDetail("Cacheability expected: " + ResourceURL.PORTLET + ", actual: " + c);
}
- tr6.setTcSuccess(ok);
- tr6.writeTo(writer);
+ tr8.setTcSuccess(ok);
+ tr8.writeTo(writer);
}
}
// evaluate results for test case V2URLTests_ResourceURL_ApiRenderResurl_setCacheability3
{
JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
- TestResult tr8 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETCACHEABILITY3);
+ TestResult tr10 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETCACHEABILITY3);
String tcval = portletReq.getParameter("tc");
if (tcval.equals("V2URLTests_ResourceURL_ApiRenderResurl_setCacheability3")) {
try {
ResourceURL rurl = portletResp.createResourceURL();
rurl.setCacheability(ResourceURL.PAGE);
} catch (IllegalStateException ise) {
- tr8.setTcSuccess(true);
+ tr10.setTcSuccess(true);
} catch (Exception e) {
- tr8.appendTcDetail(e.toString());
+ tr10.appendTcDetail(e.toString());
}
- tr8.writeTo(writer);
+ tr10.writeTo(writer);
}
}
@@ -186,10 +186,28 @@ public class URLTests_ResourceURL_ApiRenderResurl implements Portlet, ResourceSe
} catch(Exception e) {tr3.appendTcDetail(e.toString());}
tr3.writeTo(writer);
+ /* TestCase: V2URLTests_ResourceURL_ApiRenderResurl_resourceURL8 */
+ /* Details: "When a resource URL is created, render parameters from */
+ /* the current request are automatically copied to the new resource */
+ /* URL" */
+ TestResult tr4 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_RESOURCEURL8);
+ /* TODO: implement test */
+ tr4.appendTcDetail("Not implemented.");
+ tr4.writeTo(writer);
+
+ /* TestCase: V2URLTests_ResourceURL_ApiRenderResurl_resourceURL9 */
+ /* Details: "When a resource URL is created, the automatically copied */
+ /* render parameters are hidden to the ResourceURL getParameter */
+ /* method" */
+ TestResult tr5 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_RESOURCEURL9);
+ /* TODO: implement test */
+ tr5.appendTcDetail("Not implemented.");
+ tr5.writeTo(writer);
+
/* TestCase: V2URLTests_ResourceURL_ApiRenderResurl_setResourceID */
/* Details: "Method setResourceID(String): Sets the specified String */
/* as the portlet resource ID" */
- TestResult tr4 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETRESOURCEID);
+ TestResult tr6 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETRESOURCEID);
try {
ResourceURL turl = portletResp.createResourceURL();
turl.setParameter("tc", "V2URLTests_ResourceURL_ApiRenderResurl_setResourceID");
@@ -199,30 +217,30 @@ public class URLTests_ResourceURL_ApiRenderResurl implements Portlet, ResourceSe
ResourceLink rl = new ResourceLink("V2URLTests_ResourceURL_ApiRenderResurl_setResourceID", turl);
rl.writeResourceFetcher(writer);
} catch(Exception e) {
- tr4.appendTcDetail(e.toString());
- tr4.writeTo(writer);
+ tr6.appendTcDetail(e.toString());
+ tr6.writeTo(writer);
}
/* TestCase: V2URLTests_ResourceURL_ApiRenderResurl_getCacheability */
/* Details: "Method getCacheability(): Returns a String containing */
/* the cacheability level set on the resource URL" */
- TestResult tr5 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_GETCACHEABILITY);
+ TestResult tr7 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_GETCACHEABILITY);
try {
ResourceURL turl = portletResp.createResourceURL();
turl.setParameter("tc", "V2URLTests_ResourceURL_ApiRenderResurl_getCacheability");
String c = turl.getCacheability();
boolean ok = ((c != null) && ResourceURL.PAGE.equals(c));
if (!ok) {
- tr5.appendTcDetail("Cacheability expected: " + ResourceURL.PAGE + ", actual: " + c);
+ tr7.appendTcDetail("Cacheability expected: " + ResourceURL.PAGE + ", actual: " + c);
}
- tr5.setTcSuccess(ok);
- } catch(Exception e) {tr5.appendTcDetail(e.toString());}
- tr5.writeTo(writer);
+ tr7.setTcSuccess(ok);
+ } catch(Exception e) {tr7.appendTcDetail(e.toString());}
+ tr7.writeTo(writer);
/* TestCase: V2URLTests_ResourceURL_ApiRenderResurl_setCacheability1 */
/* Details: "Method setCacheability(String): Sets the cacheability */
/* level for the resource URL" */
- TestResult tr6 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETCACHEABILITY1);
+ TestResult tr8 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETCACHEABILITY1);
try {
ResourceURL turl = portletResp.createResourceURL();
turl.setParameter("tc", "V2URLTests_ResourceURL_ApiRenderResurl_setCacheability1");
@@ -232,33 +250,33 @@ public class URLTests_ResourceURL_ApiRenderResurl implements Portlet, ResourceSe
ResourceLink rl = new ResourceLink("V2URLTests_ResourceURL_ApiRenderResurl_setCacheability1", turl);
rl.writeResourceFetcher(writer);
} catch(Exception e) {
- tr6.appendTcDetail(e.toString());
- tr6.writeTo(writer);
+ tr8.appendTcDetail(e.toString());
+ tr8.writeTo(writer);
}
/* TestCase: V2URLTests_ResourceURL_ApiRenderResurl_setCacheability2 */
/* Details: "Method setCacheability(String): Throws */
/* IllegalArgumentException if the input parameter does not have a */
/* value of \"FULL\", \"PAGE\", or \"PORTLET\"" */
- TestResult tr7 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETCACHEABILITY2);
+ TestResult tr9 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETCACHEABILITY2);
try {
ResourceURL turl = portletResp.createResourceURL();
turl.setParameter("tc", "V2URLTests_ResourceURL_ApiRenderResurl_setCacheability2");
try {
turl.setCacheability("InvalidCacheability");;
} catch (IllegalArgumentException iae) {
- tr7.setTcSuccess(true);
+ tr9.setTcSuccess(true);
} catch (Exception e) {
- tr7.appendTcDetail(e.toString());
+ tr9.appendTcDetail(e.toString());
}
- } catch(Exception e) {tr7.appendTcDetail(e.toString());}
- tr7.writeTo(writer);
+ } catch(Exception e) {tr9.appendTcDetail(e.toString());}
+ tr9.writeTo(writer);
/* TestCase: V2URLTests_ResourceURL_ApiRenderResurl_setCacheability3 */
/* Details: "Method setCacheability(String): Throws */
/* IllegalStateException if the specified cacheability level is */
/* weaker than the cacheability level for the parent resource URL" */
- TestResult tr8 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETCACHEABILITY3);
+ TestResult tr10 = tcd.getTestResultFailed(V2URLTESTS_RESOURCEURL_APIRENDERRESURL_SETCACHEABILITY3);
try {
ResourceURL turl = portletResp.createResourceURL();
turl.setParameter("tc", "V2URLTests_ResourceURL_ApiRenderResurl_setCacheability3");
@@ -268,8 +286,8 @@ public class URLTests_ResourceURL_ApiRenderResurl implements Portlet, ResourceSe
ResourceLink rl = new ResourceLink("V2URLTests_ResourceURL_ApiRenderResurl_setCacheability3", turl);
rl.writeResourceFetcher(writer);
} catch(Exception e) {
- tr8.appendTcDetail(e.toString());
- tr8.writeTo(writer);
+ tr10.appendTcDetail(e.toString());
+ tr10.writeTo(writer);
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c95907b1/portlet-tck_3.0/V2URLTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2URLTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2URLTests/src/main/resources/xml-resources/additionalTCs.xml
index a7ff3f5..8959382 100644
--- a/portlet-tck_3.0/V2URLTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2URLTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -137,12 +137,15 @@
<entry key="V2URLTests_ResourceURL_ApiRenderResurl_fieldPAGE">V2URLTests</entry>
<entry key="V2URLTests_ResourceURL_ApiRenderResurl_fieldPORTLET">V2URLTests</entry>
<entry key="V2URLTests_ResourceURL_ApiRenderResurl_fieldSHARED">V2URLTests</entry>
+<entry key="V2URLTests_ResourceURL_ApiRenderResurl_resourceURL8">V2URLTests</entry>
+<entry key="V2URLTests_ResourceURL_ApiRenderResurl_resourceURL9">V2URLTests</entry>
<entry key="V2URLTests_ResourceURL_ApiRenderResurl_setResourceID">V2URLTests</entry>
<entry key="V2URLTests_ResourceURL_ApiRenderResurl_getCacheability">V2URLTests</entry>
<entry key="V2URLTests_ResourceURL_ApiRenderResurl_setCacheability1">V2URLTests</entry>
<entry key="V2URLTests_ResourceURL_ApiRenderResurl_setCacheability2">V2URLTests</entry>
<entry key="V2URLTests_ResourceURL_ApiRenderResurl_setCacheability3">V2URLTests</entry>
<entry key="V2URLTests_PortletURLGenerationListener_ApiRenderActurl_configuration">V2URLTests</entry>
+<entry key="V2URLTests_PortletURLGenerationListener_ApiRenderActurl_portletURLGenerationListener6">V2URLTests</entry>
<entry key="V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL1">V2URLTests</entry>
<entry key="V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL2">V2URLTests</entry>
<entry key="V2URLTests_PortletURLGenerationListener_ApiRenderActurl_filterActionURL3">V2URLTests</entry>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/c95907b1/portlet-tck_3.0/V2URLTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2URLTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2URLTests/src/main/webapp/WEB-INF/portlet.xml
index e8301d2..57ee5fb 100644
--- a/portlet-tck_3.0/V2URLTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2URLTests/src/main/webapp/WEB-INF/portlet.xml
@@ -167,4 +167,7 @@
<listener>
<listener-class>javax.portlet.tck.listeners.TestPortletURLGenerationListener</listener-class>
</listener>
+ <listener>
+ <listener-class>javax.portlet.tck.listeners.TestPortletURLGenerationListener2</listener-class>
+ </listener>
</portlet-app>