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 2016/04/22 10:58:29 UTC
[10/30] portals-pluto git commit: updated
updated
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/1bd29725
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/1bd29725
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/1bd29725
Branch: refs/heads/master
Commit: 1bd297257ea4b4b4d3c3753e7873b5a40e6cc540
Parents: 3a0a180
Author: Jayendran Anil Kumar <ak...@de.ibm.com>
Authored: Mon Feb 29 13:28:11 2016 +0100
Committer: Jayendran Anil Kumar <ak...@de.ibm.com>
Committed: Mon Feb 29 13:28:11 2016 +0100
----------------------------------------------------------------------
.../PortletTests_GenericPortlet_ApiRender.java | 9 ++----
.../PortletTests_PortletConfig_ApiRender.java | 34 +++++++++-----------
2 files changed, 18 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1bd29725/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_GenericPortlet_ApiRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_GenericPortlet_ApiRender.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_GenericPortlet_ApiRender.java
index 9445e23..e221f4a 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_GenericPortlet_ApiRender.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_GenericPortlet_ApiRender.java
@@ -116,7 +116,7 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_initA */
/* Details: "Method init(): Called when the portlet is initialized" */
TestResult tr0 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_INITA);
- if(this.initCalled==true) {
+ if(initCalled==true) {
tr0.setTcSuccess(true);
}
tr0.writeTo(writer);
@@ -541,12 +541,7 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* Details: "Method getNextPossiblePortletModes(): Is called during */
/* generic portlet render request processing" */
TestResult tr41 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_GETNEXTPOSSIBLEPORTLETMODES1);
- try {
- String name = "getNextPossiblePortletModes";
- Class<?> retType = java.util.Collection.class;
- Class<?>[] parms = {RenderRequest.class};
- tr41.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr41.appendTcDetail(e.toString());}
+
tr41.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_getNextPossiblePortletModes2 */
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1bd29725/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 d7c2644..e9d727c 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
@@ -222,15 +222,15 @@ private static final Locale Locale = null;
/* java.util.Enumeration<java.lang.String> containing the */
/* publishing event qnames as defined in the deployment descriptor" */
TestResult tr8 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETPUBLISHINGEVENTQNAMES1);
- Enumeration<QName> eventqname=portletConfig.getPublishingEventQNames();
- List<QName> list8=Collections.list(eventqname);
+ Enumeration<QName> pubeventqname=portletConfig.getPublishingEventQNames();
+ List<QName> list8=Collections.list(pubeventqname);
for (QName qn : list8) {
if(list8.size()==1) {
if(list8.equals(qn.toString())) {
tr8.setTcSuccess(true);
}
} else {
- tr8.appendTcDetail("EventQnames had invalid length" +list1.size());
+ tr8.appendTcDetail("Publish EventQnames had invalid length" +list1.size());
}
}
tr8.writeTo(writer);
@@ -240,18 +240,18 @@ private static final Locale Locale = null;
/* java.util.Enumeration<java.lang.String> containing the */
/* processing event qnames as defined in the deployment descriptor" */
TestResult tr9 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETPROCESSINGEVENTQNAMES1);
- Enumeration<QName> nm1=portletConfig.getProcessingEventQNames();
- QName qname1=new QName("http://www.apache.org/portals/pluto/portlet-tck_3.0", "PortletTests_Event_ApiEvent");
- if (nm1 == null) {
- tr9.appendTcDetail("PublishEventQName is null.");
- } else if (!nm1.equals(qname1)) {
- StringBuilder txt9 = new StringBuilder(128);
- txt9.append("PublishEventQName is not expected value.");
- txt9.append(" Expected: ").append(qname1);
- txt9.append(" Actual: ").append(nm1);
- tr9.appendTcDetail(txt9.toString());
- }
- tr9.writeTo(writer);
+ Enumeration<QName> proeventqname=portletConfig.getProcessingEventQNames();
+ List<QName> list9=Collections.list(proeventqname);
+ for (QName qn : list9) {
+ if(list9.size()==1) {
+ if(list9.equals(qn.toString())) {
+ tr9.setTcSuccess(true);
+ }
+ } else {
+ tr9.appendTcDetail("Process EventQnames had invalid length" +list1.size());
+ }
+ }
+ tr9.writeTo(writer);
/* TestCase: V2PortletTests_PortletConfig_ApiRender_getSupportedLocales1 */
@@ -279,9 +279,7 @@ private static final Locale Locale = null;
/* deployment descriptor" */
TestResult tr11 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETCONTAINERRUNTIMEOPTIONS1);
Map<String,String[]> runoption=portletConfig.getContainerRuntimeOptions();
- int val1=runoption.size();
- tr11.appendTcDetail("The values"+val1);
-
+ tr11.appendTcDetail("The values");
tr11.writeTo(writer);