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 as...@apache.org on 2018/01/05 15:01:38 UTC
[3/3] portals-pluto git commit: PLUTO-675 Use parsed display name in
V2EnvironmentTests_PortletContext
PLUTO-675 Use parsed display name in V2EnvironmentTests_PortletContext
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/75353b1f
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/75353b1f
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/75353b1f
Branch: refs/heads/master
Commit: 75353b1fb38c4cdb9982d4895160303d443afb1d
Parents: fea0d6d
Author: Neil Griffin <ne...@gmail.com>
Authored: Fri Jan 5 10:00:14 2018 -0500
Committer: Neil Griffin <ne...@gmail.com>
Committed: Fri Jan 5 10:00:14 2018 -0500
----------------------------------------------------------------------
.../portlets/EnvironmentTests_PortletContext_ApiRender.java | 9 ++++++---
.../V2EnvironmentTests/src/main/webapp/WEB-INF/web.xml | 4 +++-
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/75353b1f/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletContext_ApiRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletContext_ApiRender.java b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletContext_ApiRender.java
index 7c15e8e..768618c 100644
--- a/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletContext_ApiRender.java
+++ b/portlet-tck_3.0/V2EnvironmentTests/src/main/java/javax/portlet/tck/portlets/EnvironmentTests_PortletContext_ApiRender.java
@@ -38,6 +38,7 @@ import javax.portlet.RenderResponse;
import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
import javax.portlet.tck.beans.TestResult;
+import javax.portlet.tck.servlet.StartupListener;
import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2ENVIRONMENTTESTS_PORTLETCONTEXT_APIRENDER_GETSERVERINFO1;
import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2ENVIRONMENTTESTS_PORTLETCONTEXT_APIRENDER_GETREQUESTDISPATCHER1;
@@ -134,6 +135,8 @@ public class EnvironmentTests_PortletContext_ApiRender implements Portlet {
JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
JSR286SpecTestCaseDetails tcd_spec = new JSR286SpecTestCaseDetails();
+ String displayName = StartupListener.getDisplayName();
+
// Create result objects for the tests
PortletContext pc = portletConfig.getPortletContext();
@@ -746,7 +749,7 @@ public class EnvironmentTests_PortletContext_ApiRender implements Portlet {
TestResult tr49 =
tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETCONTEXT_APIRENDER_GETPORTLETCONTEXTNAME1);
String getCntName1 = pc.getPortletContextName();
- if (getCntName1.equals("javax.portlet-tck-EnvironmentTests")) {
+ if (getCntName1.equals(displayName)) {
tr49.setTcSuccess(true);
tr49.appendTcDetail("Portlet Application name is - " + getCntName1);
} else {
@@ -760,11 +763,11 @@ public class EnvironmentTests_PortletContext_ApiRender implements Portlet {
TestResult tr50 =
tcd.getTestResultFailed(V2ENVIRONMENTTESTS_PORTLETCONTEXT_APIRENDER_GETPORTLETCONTEXTNAME2);
String getCntName2 = pc.getPortletContextName();
- if (getCntName2.equals("javax.portlet-tck-EnvironmentTests")) {
+ if (getCntName2.equals(displayName)) {
tr50.setTcSuccess(true);
} else {
tr50.appendTcDetail(
- "Failed because poetlet context name is not javax.portlet-tck-EnvironmentTests but "
+ "Failed because poetlet context name is not " + displayName + " but "
+ getCntName2);
}
tr50.writeTo(writer);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/75353b1f/portlet-tck_3.0/V2EnvironmentTests/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2EnvironmentTests/src/main/webapp/WEB-INF/web.xml b/portlet-tck_3.0/V2EnvironmentTests/src/main/webapp/WEB-INF/web.xml
index 52c4786..ee9fa76 100644
--- a/portlet-tck_3.0/V2EnvironmentTests/src/main/webapp/WEB-INF/web.xml
+++ b/portlet-tck_3.0/V2EnvironmentTests/src/main/webapp/WEB-INF/web.xml
@@ -74,5 +74,7 @@
javax.portlet.tck.attributes.V2EnvironmentTests_PortletSession_ApiRender_Attribute
</listener-class>
</listener>
-
+ <listener>
+ <listener-class>javax.portlet.tck.servlet.StartupListener</listener-class>
+ </listener>
</web-app>