Repository: portals-pluto
Updated Branches:
refs/heads/master a8fdd488f -> 7dd853690
PLUTO-672 TCK: Contesting tests that expect JspException to be thrown when the copyCurrentRenderParameters
attribute contains a non-boolean value
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/7dd85369
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/7dd85369
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/7dd85369
Branch: refs/heads/master
Commit: 7dd853690b24fdfc5304931aa6f46d3511256dd2
Parents: a8fdd48
Author: Neil Griffin <neil.griffin.scm@gmail.com>
Authored: Tue Feb 27 11:45:26 2018 -0500
Committer: Neil Griffin <neil.griffin.scm@gmail.com>
Committed: Tue Feb 27 11:45:26 2018 -0500
----------------------------------------------------------------------
.../resources/xml-resources/additionalTCs.xml | 2 -
...gLibraryTests2_SPEC2_26_IncludeJSPRender.jsp | 51 -------------------
.../resources/xml-resources/additionalTCs.xml | 2 -
...ibraryTests3_SPEC2_26_IncludeJSPResource.jsp | 53 +-------------------
4 files changed, 1 insertion(+), 107 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/7dd85369/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/xml-resources/additionalTCs.xml
b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/xml-resources/additionalTCs.xml
index 7137f0f..2f6dea5 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/resources/xml-resources/additionalTCs.xml
@@ -53,7 +53,6 @@
<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL19">V2PortletTagLibraryTests2</entry>
<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL20">V2PortletTagLibraryTests2</entry>
<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL21">V2PortletTagLibraryTests2</entry>
-<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL22">V2PortletTagLibraryTests2</entry>
<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL23">V2PortletTagLibraryTests2</entry>
<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL27">V2PortletTagLibraryTests2</entry>
<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL28">V2PortletTagLibraryTests2</entry>
@@ -77,7 +76,6 @@
<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL19">V2PortletTagLibraryTests2</entry>
<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL20">V2PortletTagLibraryTests2</entry>
<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL21">V2PortletTagLibraryTests2</entry>
-<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL22">V2PortletTagLibraryTests2</entry>
<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL23">V2PortletTagLibraryTests2</entry>
<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL1">V2PortletTagLibraryTests2</entry>
<entry key="V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_resourceURL2">V2PortletTagLibraryTests2</entry>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/7dd85369/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp
b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp
index 4ea2d1a..0e5cf45 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests2/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender.jsp
@@ -67,7 +67,6 @@ limitations under the License.
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL19"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL20"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL21"
%>
-<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL22"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL23"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL27"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL28"
%>
@@ -91,7 +90,6 @@ limitations under the License.
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL19"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL20"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL21"
%>
-<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL22"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL23"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL1"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RESOURCEURL4"
%>
@@ -674,31 +672,6 @@ limitations under the License.
</FORM>
</DIV>
<% }
-
- /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL22 */
- /* Details: "If the \"copyCurrentRenderParameters\" attribute */
- /* specifies an invalid value, a JspException is thrown" */
- TestResult tr33 =
- tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_ACTIONURL22);
- %>
- <c:catch var ="exceptionTr33">
- <portlet:renderURL copyCurrentRenderParameters="invalid"/>
- </c:catch>
- <c:if test = "${exceptionTr33 != null}">
- <%
- tr33.setTcSuccess(true);
- String exceptionTr33 = "";
- exceptionTr33 = exceptionTr33 + pageContext.getAttribute("exceptionTr33");
- tr33.appendTcDetail(exceptionTr33);
- %>
- </c:if>
- <c:if test = "${exceptionTr33 == null}">
- <%
- tr33.appendTcDetail("Test case failed as no Exception is raised while defining actionURL
with copyCurrentRenderParameters = invalid");
- %>
- </c:if>
- <%
- tr33.writeTo(writer);
/* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_actionURL23 */
/* Details: "The \"copyCurrentRenderParameters\" attribute is not */
@@ -1128,30 +1101,6 @@ limitations under the License.
</DIV>
<% }
- /* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL22 */
- /* Details: "If the \"copyCurrentRenderParameters\" attribute */
- /* specifies an invalid value, a JspException is thrown" */
- TestResult tr61 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS2_SPEC2_26_INCLUDEJSPRENDER_RENDERURL22);
- %>
- <c:catch var ="exceptionTr61">
- <portlet:renderURL copyCurrentRenderParameters="invalid"/>
- </c:catch>
- <c:if test = "${exceptionTr61 != null}">
- <%
- tr61.setTcSuccess(true);
- String exceptionTr61 = "";
- exceptionTr61 = exceptionTr61 + pageContext.getAttribute("exceptionTr61");
- tr61.appendTcDetail(exceptionTr61);
- %>
- </c:if>
- <c:if test = "${exceptionTr61 == null}">
- <%
- tr61.appendTcDetail("Test case failed as no Exception is raised while defining renderURL
with copyCurrentRenderParameters = invalid");
- %>
- </c:if>
- <%
- tr61.writeTo(writer);
-
/* TestCase: V2PortletTagLibraryTests2_SPEC2_26_IncludeJSPRender_renderURL23 */
/* Details: "The \"copyCurrentRenderParameters\" attribute is not */
/* specified, the security setting is retained" */
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/7dd85369/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/xml-resources/additionalTCs.xml
b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/xml-resources/additionalTCs.xml
index 25b68d8..91ae7d1 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/resources/xml-resources/additionalTCs.xml
@@ -53,7 +53,6 @@
<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL19">V2PortletTagLibraryTests3</entry>
<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL20">V2PortletTagLibraryTests3</entry>
<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL21">V2PortletTagLibraryTests3</entry>
-<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL22">V2PortletTagLibraryTests3</entry>
<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL23">V2PortletTagLibraryTests3</entry>
<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL27">V2PortletTagLibraryTests3</entry>
<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL28">V2PortletTagLibraryTests3</entry>
@@ -79,7 +78,6 @@
<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL19">V2PortletTagLibraryTests3</entry>
<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL20">V2PortletTagLibraryTests3</entry>
<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL21">V2PortletTagLibraryTests3</entry>
-<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL22">V2PortletTagLibraryTests3</entry>
<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL23">V2PortletTagLibraryTests3</entry>
<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL1">V2PortletTagLibraryTests3</entry>
<entry key="V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_resourceURL2">V2PortletTagLibraryTests3</entry>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/7dd85369/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp
b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp
index 5c8f7ab..6eb32ad 100644
--- a/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp
+++ b/portlet-tck_3.0/V2PortletTagLibraryTests3/src/main/webapp/WEB-INF/jsp/PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource.jsp
@@ -67,7 +67,6 @@ limitations under the License.
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL19"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL20"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL21"
%>
-<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL22"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL23"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL27"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL28"
%>
@@ -91,7 +90,6 @@ limitations under the License.
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL19"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL20"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL21"
%>
-<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL22"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL23"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL1"
%>
<%@ page import="static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RESOURCEURL4"
%>
@@ -704,32 +702,7 @@ limitations under the License.
</FORM>
</DIV>
<% }
-
- /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL22 */
- /* Details: "If the \"copyCurrentRenderParameters\" attribute */
- /* specifies an invalid value, a JspException is thrown" */
- TestResult tr33 =
- tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_ACTIONURL22);
- %>
- <c:catch var ="exceptionTr33">
- <portlet:renderURL copyCurrentRenderParameters="invalid"/>
- </c:catch>
- <c:if test = "${exceptionTr33 != null}">
- <%
- tr33.setTcSuccess(true);
- String exceptionTr33 = "";
- exceptionTr33 = exceptionTr33 + pageContext.getAttribute("exceptionTr33");
- tr33.appendTcDetail(exceptionTr33);
- %>
- </c:if>
- <c:if test = "${exceptionTr33 == null}">
- <%
- tr33.appendTcDetail("Test case failed as no Exception is raised while defining actionURL
with copyCurrentRenderParameters = invalid");
- %>
- </c:if>
- <%
- tr33.writeTo(writer);
-
+
/* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_actionURL23 */
/* Details: "The \"copyCurrentRenderParameters\" attribute is not */
/* specified, the security setting is retained" */
@@ -1158,30 +1131,6 @@ limitations under the License.
</DIV>
<% }
- /* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL22 */
- /* Details: "If the \"copyCurrentRenderParameters\" attribute */
- /* specifies an invalid value, a JspException is thrown" */
- TestResult tr61 = tcd.getTestResultFailed(V2PORTLETTAGLIBRARYTESTS3_SPEC2_26_INCLUDEJSPRESOURCE_RENDERURL22);
- %>
- <c:catch var ="exceptionTr61">
- <portlet:renderURL copyCurrentRenderParameters="invalid"/>
- </c:catch>
- <c:if test = "${exceptionTr61 != null}">
- <%
- tr61.setTcSuccess(true);
- String exceptionTr61 = "";
- exceptionTr61 = exceptionTr61 + pageContext.getAttribute("exceptionTr61");
- tr61.appendTcDetail(exceptionTr61);
- %>
- </c:if>
- <c:if test = "${exceptionTr61 == null}">
- <%
- tr61.appendTcDetail("Test case failed as no Exception is raised while defining renderURL
with copyCurrentRenderParameters = invalid");
- %>
- </c:if>
- <%
- tr61.writeTo(writer);
-
/* TestCase: V2PortletTagLibraryTests3_SPEC2_26_IncludeJSPResource_renderURL23 */
/* Details: "The \"copyCurrentRenderParameters\" attribute is not */
/* specified, the security setting is retained" */
|