From pluto-scm-return-3553-archive-asf-public=cust-asf.ponee.io@portals.apache.org Tue Jan 30 19:33:33 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id C71BC18061A for ; Tue, 30 Jan 2018 19:33:33 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B70E1160C54; Tue, 30 Jan 2018 18:33:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 88922160C2A for ; Tue, 30 Jan 2018 19:33:32 +0100 (CET) Received: (qmail 24285 invoked by uid 500); 30 Jan 2018 18:33:31 -0000 Mailing-List: contact pluto-scm-help@portals.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list pluto-scm@portals.apache.org Received: (qmail 24267 invoked by uid 99); 30 Jan 2018 18:33:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jan 2018 18:33:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 73DEEDFC3E; Tue, 30 Jan 2018 18:33:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: asfgriff@apache.org To: pluto-scm@portals.apache.org Date: Tue, 30 Jan 2018 18:33:31 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] portals-pluto git commit: PLUTO-686: TCK: Contesting tests that invoke portletConfig.getContainerRuntimeOptions Repository: portals-pluto Updated Branches: refs/heads/master 6f7653251 -> c573052f1 PLUTO-686: TCK: Contesting tests that invoke portletConfig.getContainerRuntimeOptions Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/a7eeb6f6 Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/a7eeb6f6 Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/a7eeb6f6 Branch: refs/heads/master Commit: a7eeb6f66169b7cefe1ff7ed836bd84646e96c8a Parents: 6f76532 Author: vsingleton Authored: Tue Jan 30 10:47:54 2018 -0500 Committer: vsingleton Committed: Tue Jan 30 12:14:36 2018 -0500 ---------------------------------------------------------------------- portlet-tck_3.0/V2PortletTests/pom.xml | 57 +++- .../PortletTests_PortletConfig_ApiRender.java | 27 +- .../resources/xml-resources/liferay/portlet.xml | 275 +++++++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 13 +- portlet-tck_3.0/pom.xml | 2 + 5 files changed, 361 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a7eeb6f6/portlet-tck_3.0/V2PortletTests/pom.xml ---------------------------------------------------------------------- diff --git a/portlet-tck_3.0/V2PortletTests/pom.xml b/portlet-tck_3.0/V2PortletTests/pom.xml index 0fd193d..f06b62f 100644 --- a/portlet-tck_3.0/V2PortletTests/pom.xml +++ b/portlet-tck_3.0/V2PortletTests/pom.xml @@ -100,6 +100,9 @@ org.apache.maven.plugins maven-war-plugin + + true + @@ -117,7 +120,11 @@ pluto - + + 2 + javax.portlet.servletDefaultSessionScope + PORTLET_SCOPE + org.apache.taglibs @@ -135,7 +142,53 @@ compile - + + + liferay + + 1 + javax.portlet.escapeXml + true + + + + + maven-antrun-plugin + + + prepare-package + prepare-package + + run + + + + + + + + + + package + package + + run + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a7eeb6f6/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender.java ---------------------------------------------------------------------- diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender.java index c71e50d..6644d36 100644 --- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender.java +++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender.java @@ -328,6 +328,14 @@ public class PortletTests_PortletConfig_ApiRender implements Portlet { tr10.writeTo(writer); /* + * different containers expect different options + */ + PortletContext portletContext = portletConfig.getPortletContext(); + String expectedNumber = portletContext.getInitParameter("tck.EXPECTED_NUMBER"); + String expectedOption = portletContext.getInitParameter("tck.EXPECTED_OPTION"); + String expectedPortletValue = portletContext.getInitParameter("tck.EXPECTED_PORTLET_VALUE"); + + /* * TestCase: * V2PortletTests_PortletConfig_ApiRender_getContainerRuntimeOptions1 */ @@ -339,9 +347,10 @@ public class PortletTests_PortletConfig_ApiRender implements Portlet { V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETCONTAINERRUNTIMEOPTIONS1); Map runoption1 = portletConfig .getContainerRuntimeOptions(); - if (runoption1.size() == 2) { + + if (runoption1.size() == Integer.parseInt(expectedNumber)) { if (runoption1 != null && runoption1 - .containsKey("javax.portlet.servletDefaultSessionScope")) { + .containsKey(expectedOption)) { tr11.setTcSuccess(true); } else { tr11.appendTcDetail( @@ -365,13 +374,11 @@ public class PortletTests_PortletConfig_ApiRender implements Portlet { V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETCONTAINERRUNTIMEOPTIONS2); Map runoption2 = portletConfig .getContainerRuntimeOptions(); - String[] val5 = runoption2 - .get("javax.portlet.servletDefaultSessionScope"); - if (runoption2.size() == 2) { + String[] val5 = runoption2.get(expectedOption); + if (runoption2.size() == Integer.parseInt(expectedNumber)) { if (runoption2 != null - && runoption2 - .containsKey("javax.portlet.servletDefaultSessionScope") - && val5[0].equals("PORTLET_SCOPE")) { + && runoption2.containsKey(expectedOption) + && val5[0].equals(expectedPortletValue)) { tr12.setTcSuccess(true); } else { tr12.appendTcDetail( @@ -394,8 +401,8 @@ public class PortletTests_PortletConfig_ApiRender implements Portlet { V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETCONTAINERRUNTIMEOPTIONS3); Map runoption3 = portletConfig .getContainerRuntimeOptions(); - if (runoption3.size() == 2) { - if (runoption3 != null && !runoption3.equals("newruntimeoption")) { + if (runoption3.size() == Integer.parseInt(expectedNumber)) { + if (runoption3 != null && !runoption3.containsKey("newruntimeoption")) { tr13.setTcSuccess(true); } else { tr13.appendTcDetail( http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a7eeb6f6/portlet-tck_3.0/V2PortletTests/src/main/resources/xml-resources/liferay/portlet.xml ---------------------------------------------------------------------- diff --git a/portlet-tck_3.0/V2PortletTests/src/main/resources/xml-resources/liferay/portlet.xml b/portlet-tck_3.0/V2PortletTests/src/main/resources/xml-resources/liferay/portlet.xml new file mode 100644 index 0000000..46c4ae0 --- /dev/null +++ b/portlet-tck_3.0/V2PortletTests/src/main/resources/xml-resources/liferay/portlet.xml @@ -0,0 +1,275 @@ + + + + + + PortletTests_PortletConfig_ApiRender + javax.portlet.tck.portlets.PortletTests_PortletConfig_ApiRender + + param1 + value1 + + + param2 + value2 + + + param3 + value3 + + + 0 + + text/html + + en + + javax.portlet.tck.portlets.TestBundle + + + PortletTests_PortletConfig_ApiRender + + + + tck:PortletTests_Event_ApiEvent + + + + + tck:PortletTests_Event_ApiEvent + + + tckPRP1 + + + javax.portlet.escapeXml + true + + + newruntimeoption + option + + + + + + + PortletTests_PortletConfig_ApiRender2 + javax.portlet.tck.portlets.PortletTests_PortletConfig_ApiRender2 + 0 + + text/html + + + PortletTests_PortletConfig_ApiRender2 + + + + + PortletTests_PortletMode_ApiRender + javax.portlet.tck.portlets.PortletTests_PortletMode_ApiRender + 0 + + text/html + + en_US + + PortletTests_PortletMode_ApiRender + + tckPRP1 + + + + PortletTests_WindowState_ApiRender + javax.portlet.tck.portlets.PortletTests_WindowState_ApiRender + 0 + + text/html + + en_US + + PortletTests_WindowState_ApiRender + + tckPRP1 + + + + PortletTests_Portlet_ApiRender + javax.portlet.tck.portlets.PortletTests_Portlet_ApiRender + 0 + + text/html + + en_US + + PortletTests_Portlet_ApiRender + + tckPRP1 + + + + PortletTests_Portlet_ApiAction + javax.portlet.tck.portlets.PortletTests_Portlet_ApiAction + 0 + + text/html + + en_US + + PortletTests_Portlet_ApiAction + + tckPRP1 + + + + PortletTests_Event_ApiEvent + javax.portlet.tck.portlets.PortletTests_Event_ApiEvent + 0 + + text/html + + en_US + + PortletTests_Event_ApiEvent + + + tck:PortletTests_Event_ApiEvent + + + tck:PortletTests_Event_ApiEvent2 + + + PortletTests_Event_ApiEvent_localPart + + tckPRP1 + + + + PortletTests_Event_ApiEvent_event + javax.portlet.tck.portlets.PortletTests_Event_ApiEvent_event + 0 + + text/html + + en_US + + PortletTests_Event_ApiEvent_event + + + tck:PortletTests_Event_ApiEvent + + + tck:PortletTests_Event_ApiEvent2 + + + PortletTests_Event_ApiEvent_localPart + + + + + PortletTests_EventPortlet_ApiEvent + javax.portlet.tck.portlets.PortletTests_EventPortlet_ApiEvent + 0 + + text/html + + en_US + + PortletTests_EventPortlet_ApiEvent + + + tck:PortletTests_EventPortlet_ApiEvent + + tckPRP1 + + + + PortletTests_EventPortlet_ApiEvent_event + javax.portlet.tck.portlets.PortletTests_EventPortlet_ApiEvent_event + 0 + + text/html + + en_US + + PortletTests_EventPortlet_ApiEvent_event + + + tck:PortletTests_EventPortlet_ApiEvent + + + + + PortletTests_ResourceServingPortlet_ApiResource + javax.portlet.tck.portlets.PortletTests_ResourceServingPortlet_ApiResource + 0 + + text/html + + en_US + + PortletTests_ResourceServingPortlet_ApiResource + + tckPRP1 + + + + PortletTests_GenericPortlet_ApiRender + javax.portlet.tck.portlets.PortletTests_GenericPortlet_ApiRender + 0 + + text/html + + en_US + + PortletTests_GenericPortlet_ApiRender + + tckPRP1 + + https://www.apache.org + + tck:PortletTests_Event_ApiEvent + java.lang.String + + + tck:PortletTests_Event_ApiEvent2 + java.lang.String + + + PortletTests_Event_ApiEvent_localPart + java.lang.String + + + tck:PortletTests_EventPortlet_ApiEvent + java.lang.String + + + tckPRP1 + tck:tckPRP1 + + + javax.portlet.escapeXml + APPLICATION + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a7eeb6f6/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/web.xml b/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/web.xml index bea8d08..aa79a15 100644 --- a/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/web.xml +++ b/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/web.xml @@ -19,5 +19,16 @@ --> javax.portlet-tck-PortletTests - + + tck.EXPECTED_NUMBER + ${expected.number} + + + tck.EXPECTED_OPTION + ${expected.option} + + + tck.EXPECTED_PORTLET_VALUE + ${expected.portlet.value} + http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/a7eeb6f6/portlet-tck_3.0/pom.xml ---------------------------------------------------------------------- diff --git a/portlet-tck_3.0/pom.xml b/portlet-tck_3.0/pom.xml index d62b2d7..ecab485 100644 --- a/portlet-tck_3.0/pom.xml +++ b/portlet-tck_3.0/pom.xml @@ -517,6 +517,8 @@ false false + WEB-INF/classes/xml-resources/liferay, + WEB-INF/classes/xml-resources/liferay/portlet.xml, WEB-INF/liferay-portlet.xml, WEB-INF/classes/log4j.properties