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:31 UTC
[12/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/090f142b
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/090f142b
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/090f142b
Branch: refs/heads/master
Commit: 090f142b8d4c395e492afebf1996cf93d27fd48b
Parents: 7e57c0c
Author: Jayendran Anil Kumar <ak...@de.ibm.com>
Authored: Fri Mar 4 10:09:18 2016 +0100
Committer: Jayendran Anil Kumar <ak...@de.ibm.com>
Committed: Fri Mar 4 10:09:18 2016 +0100
----------------------------------------------------------------------
.../portlets/TestModule3_Portlet2.java | 2 +-
.../AddlPortletTests_SPEC2_6_RenderConfig.java | 16 +-
.../resources/xml-resources/additionalTCs.xml | 1 +
...ortletTests_EventPortlet_ApiEvent_event.java | 7 +-
.../PortletTests_GenericPortlet_ApiRender.java | 275 ++++++++-----------
.../PortletTests_PortletConfig_ApiRender.java | 102 ++++---
.../PortletTests_PortletConfig_ApiRender2.java | 12 -
.../PortletTests_Portlet_ApiAction.java | 8 +-
.../PortletTests_Portlet_ApiRender.java | 51 ++--
.../portlet/tck/portlets/TestBundle.properties | 7 +
.../portlet/tck/portlets/TestBundle2.properties | 7 +
.../resources/xml-resources/additionalTCs.xml | 2 -
.../src/main/webapp/WEB-INF/portlet.xml | 36 ++-
.../tck/beans/JSR286ApiTestCaseDetails.java | 2 -
.../tck/beans/JSR286SpecTestCaseDetails.java | 2 +
15 files changed, 264 insertions(+), 266 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/TestModule3-portlet2/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet2.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/TestModule3-portlet2/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet2.java b/portlet-tck_3.0/TestModule3-portlet2/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet2.java
index c38446c..771146f 100644
--- a/portlet-tck_3.0/TestModule3-portlet2/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet2.java
+++ b/portlet-tck_3.0/TestModule3-portlet2/src/main/java/javax/portlet/tck/TestModule3/portlets/TestModule3_Portlet2.java
@@ -117,7 +117,7 @@ public class TestModule3_Portlet2 implements Portlet {
// (expected to succeed)
if (test.equals(TEST3)) {
String val = request.getParameter(TM3PRP3a);
- if (val != null) {
+ if (val == null) {
tr = tcd.getTestResultSucceeded(TEST3);
} else {
tr = tcd.getTestResultFailed(TEST3);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java
index eb05cae..51ca033 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig.java
@@ -215,7 +215,21 @@ public class AddlPortletTests_SPEC2_6_RenderConfig implements Portlet, ResourceS
/* TODO: implement test */
tr11.appendTcDetail("Not implemented.");
tr11.writeTo(writer);
-
+
+ /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig_getDefaultNamespace2 */
+ /* Details: "Method getDefaultNamespace(): Returns */
+ /* XMLConstants.NULL_NS_URI if no default namespace is defined in the */
+ /* deployment descriptor " */
+ TestResult tr12 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETDEFAULTNAMESPACE2);
+ tr12.appendTcDetail("Not implemented");
+ tr12.writeTo(writer);
+
+ /* TestCase: V2PortletTests_PortletConfig_ApiRender_getContainerRuntimeOptions4 */
+ /* Details: "Method getContainerRuntimeOptions(): Returns an empty */
+ /* map if no container runtime options have been defined " */
+ TestResult tr13= tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS9);
+ tr13.appendTcDetail("Not implemented.");
+ tr13.writeTo(writer);
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml
index 94a4b6f..de99fdd 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -49,6 +49,7 @@
<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions7">V2AddlPortletTests</entry>
<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions8">V2AddlPortletTests</entry>
<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getDefaultNamespace2">V2AddlPortletTests</entry>
<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle8">V2AddlPortletTests</entry>
<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle9">V2AddlPortletTests</entry>
<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle10">V2AddlPortletTests</entry>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java
index 5779fb0..eee34c6 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_EventPortlet_ApiEvent_event.java
@@ -89,12 +89,7 @@ public class PortletTests_EventPortlet_ApiEvent_event implements Portlet, EventP
/* called when an event is targeted to the portlet" */
TestResult tr0 = tcd.getTestResultFailed(V2PORTLETTESTS_EVENTPORTLET_APIEVENT_PROCESSEVENT);
try {
- Event evt=portletReq.getEvent();
- if(evt.getValue().toString().equals("Hi!")) {
- tr0.setTcSuccess(true);
- } else {
- tr0.appendTcDetail("The Event Payload has incorrect value :");
- }
+ tr0.setTcSuccess(true);
}catch(Exception e) {tr0.appendTcDetail(e.toString());}
tr0.writeTo(writer);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/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 e221f4a..e12465e 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
@@ -51,13 +51,18 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
private boolean initCalled = false;
-
+ private boolean pcInitCalled = false;
@Override
public void init() {
initCalled = true;
}
-
+ @Override
+ public void init(PortletConfig config) throws PortletException {
+ super.init(config);
+ pcInitCalled = true;
+ }
+
@Override
public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
@@ -70,7 +75,32 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
StringWriter writer = new StringWriter();
}
-
+
+ @Override
+ protected void doView(RenderRequest req,RenderResponse resp)
+ throws PortletException,IOException {
+
+ }
+
+ @Override
+ protected void doEdit(RenderRequest req,RenderResponse resp)
+ throws PortletException,IOException {
+
+ }
+
+ @Override
+ protected void doHelp(RenderRequest req,RenderResponse resp)
+ throws PortletException,IOException {
+
+ }
+
+ @Override
+ protected void doDispatch(RenderRequest req,RenderResponse resp)
+ throws PortletException,IOException {
+
+ }
+
+
@Override
public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
@@ -82,7 +112,7 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
PrintWriter writer = portletResp.getWriter();
}
-
+
@Override
public void render(RenderRequest portletReq, RenderResponse portletResp)
throws PortletException, IOException {
@@ -98,20 +128,8 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
// Create result objects for the tests
ClassChecker cc = new ClassChecker(GenericPortlet.class);
-
-
+
- /* TestCase: V2PortletTests_GenericPortlet_ApiRender_getPortletConfig */
- /* Details: "Method getPortletConfig(): Returns the PortletConfig */
- /* object for the portlet" */
- TestResult tr31 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_GETPORTLETCONFIG);
- String pc=getPortletConfig().getPortletName();
- if(pc.equals("PortletTests_GenericPortlet_ApiRender")) {
- tr31.setTcSuccess(true);
- } else {
- tr31.appendTcDetail("The PortletName does not match the actual name :"+pc.toString());
- }
- tr31.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_initA */
/* Details: "Method init(): Called when the portlet is initialized" */
@@ -120,31 +138,29 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
tr0.setTcSuccess(true);
}
tr0.writeTo(writer);
+
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_initB */
/* Details: "Method init(PortletConfig): Called when the portlet is */
/* initialized" */
TestResult tr1 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_INITB);
-
+ if(pcInitCalled = true) {
+ tr1.setTcSuccess(true);
+ }
+ tr1.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_processAction1 */
/* Details: "Method processAction(ActionRequest, ActionResponse): If */
/* overridden, the Portlet.processAction tests execute correctly" */
TestResult tr2 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_PROCESSACTION1);
- try {
- String name = "processAction";
- Class<?> retType = void.class;
- Class<?>[] parms = {ActionRequest.class, ActionResponse.class};
- tr2.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr2.appendTcDetail(e.toString());}
- tr2.writeTo(writer);
+ tr2.setTcSuccess(true);
+ tr2.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_processAction2 */
/* Details: "Method processAction(ActionRequest, ActionResponse): */
/* Dispatches to @ProcessAction annotated method matching the */
/* ActionRequest.ACTION_NAME parameter" */
TestResult tr3 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_PROCESSACTION2);
- /* TODO: implement test */
- tr3.appendTcDetail("Not implemented.");
+
tr3.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_processAction3 */
@@ -152,25 +168,15 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* Throws PortletException if no matching @ProcessAction annotated */
/* method found" */
TestResult tr4 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_PROCESSACTION3);
- try {
- String name = "processAction";
- Class<?>[] exceptions = {PortletException.class, java.io.IOException.class};
- Class<?>[] parms = {ActionRequest.class, ActionResponse.class};
- tr4.setTcSuccess(cc.hasMethod(name, parms, exceptions));
- } catch(Exception e) {tr4.appendTcDetail(e.toString());}
+
tr4.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_render1 */
/* Details: "Method render(RenderRequest, RenderResponse): If */
/* overridden, Portlet.render tests execute correctly" */
TestResult tr5 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_RENDER1);
- try {
- String name = "render";
- Class<?> retType = void.class;
- Class<?>[] parms = {RenderRequest.class, RenderResponse.class};
- tr5.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr5.appendTcDetail(e.toString());}
- tr5.writeTo(writer);
+ tr5.setTcSuccess(true);
+ tr5.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_render2 */
/* Details: "Method render(RenderRequest, RenderResponse): If */
@@ -248,24 +254,18 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* Details: "Method render(RenderRequest, RenderResponse): If */
/* RENDER_PART=<any other value>, throws PortletException " */
TestResult tr14 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_RENDER10);
- try {
- String name = "render";
- Class<?>[] exceptions = {PortletException.class, java.io.IOException.class};
- Class<?>[] parms = {RenderRequest.class, RenderResponse.class};
- tr14.setTcSuccess(cc.hasMethod(name, parms, exceptions));
- } catch(Exception e) {tr14.appendTcDetail(e.toString());}
tr14.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_getTitle1 */
/* Details: "Method getTitle(): If overridden, the String returned by */
/* this method is used as the portlet title" */
TestResult tr15 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_GETTITLE1);
- try {
- String name = "getTitle";
- Class<?>[] exceptions = null;
- Class<?>[] parms = {RenderRequest.class};
- tr15.setTcSuccess(cc.hasMethod(name, parms, exceptions));
- } catch(Exception e) {tr15.appendTcDetail(e.toString());}
+ String title=getTitle(portletReq);
+ if(title!=null && title.equals(this.getClass().getSimpleName())) {
+ tr15.setTcSuccess(true);
+ } else {
+ tr15.appendTcDetail("The Title doesnot match the actual value " +title);
+ }
tr15.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_getTitle2 */
@@ -273,44 +273,41 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* from the portlet resource bundle under the key */
/* \"javax.portlet.title\"" */
TestResult tr16 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_GETTITLE2);
- try {
- String name = "getTitle";
- Class<?> retType = String.class;
- Class<?>[] parms = {RenderRequest.class};
- tr16.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr16.appendTcDetail(e.toString());}
+ ResourceBundle rb1=ResourceBundle.getBundle("javax.portlet.tck.portlets.TestBundle");
+ String portletTitle1=rb1.getString("javax.portlet.title");
+ if(portletTitle1.equals("Resource Bundle Test")) {
+ tr16.setTcSuccess(true);
+ } else {
+ tr16.appendTcDetail("The Title doesnot match the actual value in ResourceBundle" +portletTitle1);
+ }
tr16.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_getTitle3 */
/* Details: "Method getTitle(): Returns null if no title is available */
/* from the portlet resource bundle" */
TestResult tr17 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_GETTITLE3);
- try {
- String name = "getTitle";
- Class<?> retType = null;
- Class<?>[] parms = {RenderRequest.class};
- tr17.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr17.appendTcDetail(e.toString());}
- tr17.writeTo(writer);
+ ResourceBundle rb2=ResourceBundle.getBundle("javax.portlet.tck.portlets.TestBundle2");
+ String portletTitle2=rb2.getString("javax.portlet.title");
+ if(portletTitle2==null) {
+ tr17.setTcSuccess(true);
+ } else {
+ tr17.appendTcDetail("The ResourceBundle has a title" +portletTitle2);
+ }
+ tr17.writeTo(writer);
+
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doDispatch1 */
/* Details: "Method doDispatch(RenderRequest, RenderResponse): If */
/* overridden, is called when markup is to be generated" */
TestResult tr18 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DODISPATCH1);
- try {
- String name = "doDispatch";
- Class<?> retType = void.class;
- Class<?>[] parms = {RenderRequest.class, RenderResponse.class};
- tr18.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr18.appendTcDetail(e.toString());}
- tr18.writeTo(writer);
+ tr18.setTcSuccess(true);
+ tr18.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doDispatch2 */
/* Details: "Method doDispatch(RenderRequest, RenderResponse): If not */
/* overridden, If the WindowState is minimized, no markup method is */
/* called and no markup is generated" */
TestResult tr19 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DODISPATCH2);
- /* TODO: implement test */
- tr19.appendTcDetail("Not implemented.");
+ //Pending
tr19.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doDispatch3 */
@@ -318,8 +315,7 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* overridden and not minimized, the @RenderMode annotated method */
/* matching the current PortletMode is called " */
TestResult tr20 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DODISPATCH3);
- /* TODO: implement test */
- tr20.appendTcDetail("Not implemented.");
+ //Pending
tr20.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doDispatch4 */
@@ -328,8 +324,7 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* the current render mode is \"view\", the doView(RenderRequest, */
/* RenderResponse): method is called " */
TestResult tr21 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DODISPATCH4);
- /* TODO: implement test */
- tr21.appendTcDetail("Not implemented.");
+ // Pending
tr21.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doDispatch5 */
@@ -338,8 +333,7 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* the current render mode is \"edit\", the doEdit(RenderRequest, */
/* RenderResponse): method is called " */
TestResult tr22 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DODISPATCH5);
- /* TODO: implement test */
- tr22.appendTcDetail("Not implemented.");
+ // Pending
tr22.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doDispatch6 */
@@ -348,8 +342,7 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* the current render mode is \"help\", the doHelp(RenderRequest, */
/* RenderResponse): method is called " */
TestResult tr23 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DODISPATCH6);
- /* TODO: implement test */
- tr23.appendTcDetail("Not implemented.");
+ // Pending
tr23.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doDispatch7 */
@@ -358,49 +351,29 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* mode is not \"view\", \"edit\", or \"help\", throws a */
/* PortletException" */
TestResult tr24 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DODISPATCH7);
- try {
- String name = "doDispatch";
- Class<?>[] exceptions = {PortletException.class, java.io.IOException.class};
- Class<?>[] parms = {RenderRequest.class, RenderResponse.class};
- tr24.setTcSuccess(cc.hasMethod(name, parms, exceptions));
- } catch(Exception e) {tr24.appendTcDetail(e.toString());}
- tr24.writeTo(writer);
+ //Pending
+ tr24.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doView1 */
/* Details: "Method doView(RenderRequest, RenderResponse): If */
/* overridden, is called when a render request in view mode occurs" */
TestResult tr25 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DOVIEW1);
- try {
- String name = "doView";
- Class<?> retType = void.class;
- Class<?>[] parms = {RenderRequest.class, RenderResponse.class};
- tr25.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr25.appendTcDetail(e.toString());}
+
tr25.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doView2 */
/* Details: "Method doView(RenderRequest, RenderResponse): If not */
/* overridden, throws a PortletException" */
TestResult tr26 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DOVIEW2);
- try {
- String name = "doView";
- Class<?>[] exceptions = {PortletException.class, java.io.IOException.class};
- Class<?>[] parms = {RenderRequest.class, RenderResponse.class};
- tr26.setTcSuccess(cc.hasMethod(name, parms, exceptions));
- } catch(Exception e) {tr26.appendTcDetail(e.toString());}
+
tr26.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doEdit1 */
/* Details: "Method doEdit(RenderRequest, RenderResponse): If */
/* overridden, is called when a render request in edit mode occurs" */
TestResult tr27 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DOEDIT1);
- try {
- String name = "doEdit";
- Class<?> retType = void.class;
- Class<?>[] parms = {RenderRequest.class, RenderResponse.class};
- tr27.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr27.appendTcDetail(e.toString());}
- tr27.writeTo(writer);
+
+ tr27.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doEdit2 */
/* Details: "Method doEdit(RenderRequest, RenderResponse): If not */
@@ -438,31 +411,32 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
tr30.setTcSuccess(cc.hasMethod(name, parms, exceptions));
} catch(Exception e) {tr30.appendTcDetail(e.toString());}
tr30.writeTo(writer);
-
+
+ /* TestCase: V2PortletTests_GenericPortlet_ApiRender_getPortletConfig */
+ /* Details: "Method getPortletConfig(): Returns the PortletConfig */
+ /* object for the portlet" */
+ TestResult tr31 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_GETPORTLETCONFIG);
+ PortletConfig pc=this.getPortletConfig();
+ if(pc!=null) {
+ tr31.setTcSuccess(true);
+ } else {
+ tr31.appendTcDetail("The PortletConfig has null value");
+ }
+ tr31.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_destroy */
/* Details: "Method destroy(): Called by the portlet container to */
/* indicate to a portlet that the portlet is being taken out of */
/* service. " */
TestResult tr32 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DESTROY);
- try {
- String name = "destroy";
- Class<?> retType = void.class;
- Class<?>[] parms = null;
- tr32.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr32.appendTcDetail(e.toString());}
- tr32.writeTo(writer);
+
+ tr32.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_serveResource1 */
/* Details: "Method serveResource(ResourceRequest, ResourceResponse): */
/* Is called when a ResourceURL targeting the portlet is triggered" */
TestResult tr33 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_SERVERESOURCE1);
- try {
- String name = "serveResource";
- Class<?> retType = void.class;
- Class<?>[] parms = {ResourceRequest.class, ResourceResponse.class};
- tr33.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr33.appendTcDetail(e.toString());}
+ tr33.setTcSuccess(true);
tr33.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_serveResource2 */
@@ -470,8 +444,6 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* Forwards the request to the ResourceID value if the method is not */
/* overridden and if the resource ID is not null" */
TestResult tr34 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_SERVERESOURCE2);
- /* TODO: implement test */
- tr34.appendTcDetail("Not implemented.");
tr34.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_serveResource3 */
@@ -479,29 +451,22 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* Does nothing if the method is not overridden and if the resource */
/* ID is null" */
TestResult tr35 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_SERVERESOURCE3);
- /* TODO: implement test */
- tr35.appendTcDetail("Not implemented.");
+ tr35.setTcSuccess(true);
tr35.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_processEvent1 */
/* Details: "Method processEvent(EventRequest, EventResponse): Is */
/* called when an Event targeting the portlet occurs" */
TestResult tr36 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_PROCESSEVENT1);
- try {
- String name = "processEvent";
- Class<?> retType = void.class;
- Class<?>[] parms = {EventRequest.class, EventResponse.class};
- tr36.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr36.appendTcDetail(e.toString());}
- tr36.writeTo(writer);
+ tr36.setTcSuccess(true);
+ tr36.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_processEvent2 */
/* Details: "Method processEvent(EventRequest, EventResponse): The */
/* @ProcessEvent annotated method matching the current Event is */
/* called " */
TestResult tr37 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_PROCESSEVENT2);
- /* TODO: implement test */
- tr37.appendTcDetail("Not implemented.");
+
tr37.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_processEvent3 */
@@ -509,52 +474,42 @@ public class PortletTests_GenericPortlet_ApiRender extends GenericPortlet {
/* there is no matching annotated method, sets the render parameters */
/* on the EventResponse to equal the EventRequest parameters" */
TestResult tr38 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_PROCESSEVENT3);
- /* TODO: implement test */
- tr38.appendTcDetail("Not implemented.");
+
tr38.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doHeaders1 */
/* Details: "Method doHeaders(RenderRequest, RenderResponse): Is */
/* called during generic portlet render request processing " */
TestResult tr39 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DOHEADERS1);
- try {
- String name = "doHeaders";
- Class<?>[] exceptions = null;
- Class<?>[] parms = {RenderRequest.class, RenderResponse.class};
- tr39.setTcSuccess(cc.hasMethod(name, parms, exceptions));
- } catch(Exception e) {tr39.appendTcDetail(e.toString());}
- tr39.writeTo(writer);
+ tr39.setTcSuccess(true);
+ tr39.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_doHeaders2 */
/* Details: "Method doHeaders(RenderRequest, RenderResponse): The */
/* default implementation does nothing" */
TestResult tr40 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_DOHEADERS2);
- try {
- String name = "doHeaders";
- Class<?> retType = void.class;
- Class<?>[] parms = {RenderRequest.class, RenderResponse.class};
- tr40.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr40.appendTcDetail(e.toString());}
- tr40.writeTo(writer);
+
+ tr40.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_getNextPossiblePortletModes1 */
/* Details: "Method getNextPossiblePortletModes(): Is called during */
/* generic portlet render request processing" */
TestResult tr41 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_GETNEXTPOSSIBLEPORTLETMODES1);
-
- tr41.writeTo(writer);
+ Collection<PortletMode> nextmode=getNextPossiblePortletModes(portletReq);
+ tr41.setTcSuccess(true);
+ tr41.writeTo(writer);
/* TestCase: V2PortletTests_GenericPortlet_ApiRender_getNextPossiblePortletModes2 */
/* Details: "Method getNextPossiblePortletModes(): The default */
/* implementation returns null" */
TestResult tr42 = tcd.getTestResultFailed(V2PORTLETTESTS_GENERICPORTLET_APIRENDER_GETNEXTPOSSIBLEPORTLETMODES2);
- try {
- String name = "getNextPossiblePortletModes";
- Class<?>[] exceptions = null;
- Class<?>[] parms = {RenderRequest.class};
- tr42.setTcSuccess(cc.hasMethod(name, parms, exceptions));
- } catch(Exception e) {tr42.appendTcDetail(e.toString());}
- tr42.writeTo(writer);
+ Collection<PortletMode> nextmodes=getNextPossiblePortletModes(portletReq);
+ if(nextmodes==null) {
+ tr42.setTcSuccess(true);
+ } else {
+ tr42.appendTcDetail("The getNextPossiblePortletModes has values" +nextmodes.toString());
+ }
+ tr42.writeTo(writer);
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/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 4ac93c5..048c317 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
@@ -34,6 +34,7 @@ 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
@@ -135,7 +136,13 @@ private static final Locale Locale = null;
/* Details: "Method getResourceBundle(Locale): Returns the */
/* ResourceBundle for the specified locale" */
TestResult tr2 = tcd.getTestResultSucceeded(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETRESOURCEBUNDLE);
- ResourceBundle rb=portletConfig.getResourceBundle(portletReq.getLocale());
+ Locale loc=portletReq.getLocale();
+ ResourceBundle rb=portletConfig.getResourceBundle(loc);
+ if(rb!=null) {
+ tr2.setTcSuccess(true);
+ } else {
+ tr2.appendTcDetail("The Resource Bundle Does not exist");
+ }
tr2.writeTo(writer);
/* TestCase: V2PortletTests_PortletConfig_ApiRender_getInitParameter1 */
@@ -224,16 +231,17 @@ private static final Locale Locale = null;
TestResult tr8 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETPUBLISHINGEVENTQNAMES1);
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("Publish EventQnames had invalid length" +list1.size());
- }
- }
- tr8.writeTo(writer);
+ if (list8.size() == 1) {
+ QName goodQN = new QName("http://www.apache.org/portals/pluto/portlet-tck_3.0", "PortletTests_Event_ApiEvent");
+ if (goodQN.equals(list8.get(0))) {
+ tr8.setTcSuccess(true);
+ } else {
+ tr8.appendTcDetail("The PublishingEventQNames does not match the actual value :" +list8.toString());
+ }
+ } else {
+ tr8.appendTcDetail("PublishingEventQNames had invalid length" +list8.size());
+ }
+ tr8.writeTo(writer);
/* TestCase: V2PortletTests_PortletConfig_ApiRender_getProcessingEventQNames1 */
/* Details: "Method getProcessingEventQNames(): Returns an */
@@ -242,16 +250,17 @@ private static final Locale Locale = null;
TestResult tr9 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETPROCESSINGEVENTQNAMES1);
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);
+ if (list9.size() == 1) {
+ QName goodQN = new QName("http://www.apache.org/portals/pluto/portlet-tck_3.0", "PortletTests_Event_ApiEvent");
+ if (goodQN.equals(list9.get(0))) {
+ tr9.setTcSuccess(true);
+ } else {
+ tr9.appendTcDetail("The ProcessingEventQNames does not match the actual value :" +list9.toString());
+ }
+ } else {
+ tr9.appendTcDetail("PublishingEventQNames had invalid length" +list9.size());
+ }
+ tr9.writeTo(writer);
/* TestCase: V2PortletTests_PortletConfig_ApiRender_getSupportedLocales1 */
@@ -259,11 +268,9 @@ private static final Locale Locale = null;
/* java.util.Enumeration<java.lang.String> containing the names */
/* of the supported locales as defined in the deployment descriptor" */
TestResult tr10 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETSUPPORTEDLOCALES1);
- Enumeration<java.util.Locale> locale=portletConfig.getSupportedLocales();
- List<Locale> list10 = Collections.list(locale);
- StringBuilder txt=new StringBuilder(128);
+ ArrayList<Locale> list10 = Collections.list(portletConfig.getSupportedLocales());
if (list10.size() == 1 ) {
- if (list10.contains(Locale.forLanguageTag("en-us"))) {
+ if (list10.contains(Locale.forLanguageTag(Locale.forLanguageTag("en").toLanguageTag()))) {
tr10.setTcSuccess(true);
} else {
tr10.appendTcDetail("Locales did not match :" +list10.toString());
@@ -279,8 +286,17 @@ private static final Locale Locale = null;
/* containing the container runtime options as defined in the */
/* deployment descriptor" */
TestResult tr11 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETCONTAINERRUNTIMEOPTIONS1);
- Map<String,String[]> runoption=portletConfig.getContainerRuntimeOptions();
- tr11.appendTcDetail("The values");
+ Map<String,String[]> runoption1=portletConfig.getContainerRuntimeOptions();
+ if(runoption1.size()==2) {
+ if(runoption1!=null && runoption1.containsKey("javax.portlet.servletDefaultSessionScope")) {
+ tr11.setTcSuccess(true);
+ } else {
+ tr11.appendTcDetail("No supported runtime options are defined in deployment descriptor");
+ }
+ } else {
+ tr11.appendTcDetail("The container Runtime Options had invalid length" +runoption1.size());
+ }
+
tr11.writeTo(writer);
@@ -289,24 +305,36 @@ private static final Locale Locale = null;
/* is defined at the portlet application and at the portlet level, */
/* the definition at the portlet level takes precedence" */
TestResult tr12 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETCONTAINERRUNTIMEOPTIONS2);
- /* TODO: implement test */
- tr12.appendTcDetail("Not implemented.");
+ Map<String,String[]> runoption2=portletConfig.getContainerRuntimeOptions();
+ String[] val5=runoption2.get("javax.portlet.servletDefaultSessionScope");
+ if(runoption2.size()==2) {
+ if(runoption2!=null && runoption2.containsKey("javax.portlet.servletDefaultSessionScope") && val5[0].equals("PORTLET_SCOPE")) {
+ tr12.setTcSuccess(true);
+ } else {
+ tr12.appendTcDetail("No supported runtime options are defined in deployment descriptor");
+ }
+ } else {
+ tr12.appendTcDetail("The container Runtime Options had invalid length" +runoption2.size());
+ }
tr12.writeTo(writer);
-
+
/* TestCase: V2PortletTests_PortletConfig_ApiRender_getContainerRuntimeOptions3 */
/* Details: "Method getContainerRuntimeOptions(): If the portlet */
/* container does not support a runtime option defined in the portlet */
/* descriptor, that option will not be returned in this map" */
TestResult tr13 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETCONTAINERRUNTIMEOPTIONS3);
- /* TODO: implement test */
- tr13.appendTcDetail("Not implemented.");
+ Map<String,String[]> runoption3=portletConfig.getContainerRuntimeOptions();
+ if(runoption3.size()==2) {
+ if(runoption3!=null && !runoption3.equals("newruntimeoption")){
+ tr13.setTcSuccess(true);
+ } else {
+ tr13.appendTcDetail("No supported runtime options are defined in deployment descriptor");
+ }
+ } else {
+ tr13.appendTcDetail("The container Runtime Options had invalid length" +runoption3.size());
+ }
tr13.writeTo(writer);
- /* TestCase: V2PortletTests_PortletConfig_ApiRender_getContainerRuntimeOptions4 */
- /* Details: "Method getContainerRuntimeOptions(): Returns an empty */
- /* map if no container runtime options have been defined " */
- TestResult tr14 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER_GETCONTAINERRUNTIMEOPTIONS4);
-
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender2.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender2.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender2.java
index c0678df..7ab08d4 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender2.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_PortletConfig_ApiRender2.java
@@ -143,18 +143,6 @@ private static final String XMLConstants = null;
}
tr2.writeTo(writer);
- /* TestCase: V2PortletTests_PortletConfig_ApiRender2_getDefaultNamespace2 */
- /* Details: "Method getDefaultNamespace(): Returns */
- /* XMLConstants.NULL_NS_URI if no default namespace is defined in the */
- /* deployment descriptor " */
- TestResult tr3 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETDEFAULTNAMESPACE2);
- String str =portletConfig.getDefaultNamespace();
- if(str==null || str.equals("https://www.apache.org")) {
- tr3.setTcSuccess(true);
- } else {
- tr3.appendTcDetail("The DefaultNamespace has the values:" +str);
- }
- tr3.writeTo(writer);
/* TestCase: V2PortletTests_PortletConfig_ApiRender2_getPublishingEventQNames2 */
/* Details: "Method getPublishingEventQNames(): Returns an empty */
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Portlet_ApiAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Portlet_ApiAction.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Portlet_ApiAction.java
index 5fd0492..5b151de 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Portlet_ApiAction.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Portlet_ApiAction.java
@@ -83,12 +83,8 @@ public class PortletTests_Portlet_ApiAction implements Portlet, ResourceServingP
/* called when an action URL for the portlet is triggered" */
TestResult tr0 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLET_APIACTION_PROCESSACTION);
try {
- String val=portletReq.getAuthType();
- if(val.equals("FORM")) {
- tr0.setTcSuccess(true);
- }else {
- tr0.appendTcDetail("The Authentication type is null or incorrect");
- }
+
+ tr0.setTcSuccess(true);
} catch(Exception e) {tr0.appendTcDetail(e.toString());}
tr0.writeTo(writer);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Portlet_ApiRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Portlet_ApiRender.java b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Portlet_ApiRender.java
index 9745038..fde25a4 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Portlet_ApiRender.java
+++ b/portlet-tck_3.0/V2PortletTests/src/main/java/javax/portlet/tck/portlets/PortletTests_Portlet_ApiRender.java
@@ -51,12 +51,15 @@ public class PortletTests_Portlet_ApiRender implements Portlet, ResourceServingP
private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
private PortletConfig portletConfig = null;
-
+
+ private boolean initCalled = false;
@Override
public void init(PortletConfig config) throws PortletException {
this.portletConfig = config;
+ initCalled=true;
}
-
+
+
@Override
public void destroy() {
}
@@ -106,48 +109,38 @@ public class PortletTests_Portlet_ApiRender implements Portlet, ResourceServingP
/* Details: "Method init(PortletConfig): is called for the portlet */
/* defined in the deployment descriptor" */
TestResult tr0 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLET_APIRENDER_INIT1);
+ String name=portletConfig.getPortletName();
try {
- String name = "init";
- Class<?> retType = void.class;
- Class<?>[] parms = {PortletConfig.class};
- tr0.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr0.appendTcDetail(e.toString());}
- tr0.writeTo(writer);
+ if(name.equals(this.getClass().getSimpleName()) && initCalled==true)
+ tr0.setTcSuccess(true);
+ } catch(Exception e) {tr0.appendTcDetail(e.toString());}
+
+ tr0.writeTo(writer);
+
/* TestCase: V2PortletTests_Portlet_ApiRender_init2 */
/* Details: "Method init(PortletConfig): If the init method throws a */
/* PortletException, the portlet will not be placed in service" */
TestResult tr1 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLET_APIRENDER_INIT2);
- try {
- String name = "init";
- Class<?>[] exceptions = {PortletException.class};
- Class<?>[] parms = {PortletConfig.class};
- tr1.setTcSuccess(cc.hasMethod(name, parms, exceptions));
- } catch(Exception e) {tr1.appendTcDetail(e.toString());}
- tr1.writeTo(writer);
+
+ tr1.writeTo(writer);
/* TestCase: V2PortletTests_Portlet_ApiRender_render1 */
/* Details: "Method render(RenderRequest, RenderResponse): is called */
/* when the portlet is to be rendered" */
TestResult tr2 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLET_APIRENDER_RENDER1);
- try {
- String name = "render";
- Class<?> retType = void.class;
- Class<?>[] parms = {RenderRequest.class, RenderResponse.class};
- tr2.setTcSuccess(cc.methodHasReturnType(name, retType, parms));
- } catch(Exception e) {tr2.appendTcDetail(e.toString());}
- tr2.writeTo(writer);
+ tr2.setTcSuccess(true);
+ tr2.writeTo(writer);
/* TestCase: V2PortletTests_Portlet_ApiRender_render2 */
/* Details: "Method render(RenderRequest, RenderResponse): is called */
/* when a Render URL for the portlet is triggered" */
TestResult tr3 = tcd.getTestResultFailed(V2PORTLETTESTS_PORTLET_APIRENDER_RENDER2);
- try {
- String name = "render";
- Class<?>[] exceptions = {PortletException.class, java.io.IOException.class};
- Class<?>[] parms = {RenderRequest.class, RenderResponse.class};
- tr3.setTcSuccess(cc.hasMethod(name, parms, exceptions));
- } catch(Exception e) {tr3.appendTcDetail(e.toString());}
- tr3.writeTo(writer);
+ {
+ PortletURL rurl = portletResp.createRenderURL();
+ rurl.setPortletMode(PortletMode.VIEW);
+ tr3.setTcSuccess(true);
+ tr3.writeTo(writer);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/V2PortletTests/src/main/resources/javax/portlet/tck/portlets/TestBundle.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/resources/javax/portlet/tck/portlets/TestBundle.properties b/portlet-tck_3.0/V2PortletTests/src/main/resources/javax/portlet/tck/portlets/TestBundle.properties
new file mode 100644
index 0000000..9947c4d
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTests/src/main/resources/javax/portlet/tck/portlets/TestBundle.properties
@@ -0,0 +1,7 @@
+#
+# filename: GoodBundle_en.properties
+# Portlet Info resource bundle example
+javax.portlet.title=Resource Bundle Test
+javax.portlet.short-title=Test
+javax.portlet.keywords=Resouce,Bundle,Test
+name=Anil
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/V2PortletTests/src/main/resources/javax/portlet/tck/portlets/TestBundle2.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/resources/javax/portlet/tck/portlets/TestBundle2.properties b/portlet-tck_3.0/V2PortletTests/src/main/resources/javax/portlet/tck/portlets/TestBundle2.properties
new file mode 100644
index 0000000..08d9f0b
--- /dev/null
+++ b/portlet-tck_3.0/V2PortletTests/src/main/resources/javax/portlet/tck/portlets/TestBundle2.properties
@@ -0,0 +1,7 @@
+#
+# filename: GoodBundle_en.properties
+# Portlet Info resource bundle example
+javax.portlet.title=null
+javax.portlet.short-title=Test
+javax.portlet.keywords=Resouce,Bundle,Test
+name=Anil
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/V2PortletTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2PortletTests/src/main/resources/xml-resources/additionalTCs.xml
index 527db9d..3b2d2c7 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2PortletTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -34,11 +34,9 @@
<entry key="V2PortletTests_PortletConfig_ApiRender_getContainerRuntimeOptions1">V2PortletTests</entry>
<entry key="V2PortletTests_PortletConfig_ApiRender_getContainerRuntimeOptions2">V2PortletTests</entry>
<entry key="V2PortletTests_PortletConfig_ApiRender_getContainerRuntimeOptions3">V2PortletTests</entry>
-<entry key="V2PortletTests_PortletConfig_ApiRender_getContainerRuntimeOptions4">V2PortletTests</entry>
<entry key="V2PortletTests_PortletConfig_ApiRender2_getInitParameter2">V2PortletTests</entry>
<entry key="V2PortletTests_PortletConfig_ApiRender2_getInitParameterNames2">V2PortletTests</entry>
<entry key="V2PortletTests_PortletConfig_ApiRender2_getPublicRenderParameterNames2">V2PortletTests</entry>
-<entry key="V2PortletTests_PortletConfig_ApiRender2_getDefaultNamespace2">V2PortletTests</entry>
<entry key="V2PortletTests_PortletConfig_ApiRender2_getPublishingEventQNames2">V2PortletTests</entry>
<entry key="V2PortletTests_PortletConfig_ApiRender2_getProcessingEventQNames2">V2PortletTests</entry>
<entry key="V2PortletTests_PortletConfig_ApiRender2_getSupportedLocales2">V2PortletTests</entry>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/portlet.xml
index f3ede1b..c9e71f0 100644
--- a/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2PortletTests/src/main/webapp/WEB-INF/portlet.xml
@@ -43,22 +43,38 @@
<supports>
<mime-type>text/html</mime-type>
</supports>
- <supported-locale>en_US</supported-locale>
+ <supported-locale>en</supported-locale>
- <resource-bundle>content/TestBundle</resource-bundle>
+ <resource-bundle>javax.portlet.tck.portlets.TestBundle</resource-bundle>
<portlet-info>
<title>PortletTests_PortletConfig_ApiRender</title>
</portlet-info>
+
+ <supported-processing-event>
+ <qname>tck:PortletTests_Event_ApiEvent</qname>
+ </supported-processing-event>
+
<supported-publishing-event>
<qname>tck:PortletTests_Event_ApiEvent</qname>
</supported-publishing-event>
+
<supported-public-render-parameter>tckPRP1</supported-public-render-parameter>
- <container-runtime-option>
- <name>javax.portlet.escape.Xml</name>
- <value>false</value>
- </container-runtime-option>
+
+ <container-runtime-option>
+ <name>javax.portlet.servletDefaultSessionScope</name>
+ <value>PORTLET_SCOPE</value>
+ </container-runtime-option>
+ <container-runtime-option>
+ <name>javax.portlet.escapeXml</name>
+ <value>true</value>
+ </container-runtime-option>
+ <container-runtime-option>
+ <name>newruntimeoption</name>
+ <value>option</value>
+ </container-runtime-option>
+
</portlet>
@@ -237,8 +253,8 @@
<identifier>tckPRP1</identifier>
<qname>tck:tckPRP1</qname>
</public-render-parameter>
- <container-runtime-option>
- <name>javax.portlet.escape.Xml</name>
- <value>false</value>
- </container-runtime-option>
+ <container-runtime-option>
+ <name>javax.portlet.servletDefaultSessionScope</name>
+ <value>APPLICATION_SCOPE</value>
+ </container-runtime-option>
</portlet-app>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286ApiTestCaseDetails.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286ApiTestCaseDetails.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286ApiTestCaseDetails.java
index 25c015f..6c83cd6 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286ApiTestCaseDetails.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286ApiTestCaseDetails.java
@@ -1146,7 +1146,6 @@ public class JSR286ApiTestCaseDetails extends TestCaseDetails {
public final static String V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETINITPARAMETER2 = "V2PortletTests_PortletConfig_ApiRender2_getInitParameter2";
public final static String V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETINITPARAMETERNAMES2 = "V2PortletTests_PortletConfig_ApiRender2_getInitParameterNames2";
public final static String V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETPUBLICRENDERPARAMETERNAMES2 = "V2PortletTests_PortletConfig_ApiRender2_getPublicRenderParameterNames2";
- public final static String V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETDEFAULTNAMESPACE2 = "V2PortletTests_PortletConfig_ApiRender2_getDefaultNamespace2";
public final static String V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETPUBLISHINGEVENTQNAMES2 = "V2PortletTests_PortletConfig_ApiRender2_getPublishingEventQNames2";
public final static String V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETPROCESSINGEVENTQNAMES2 = "V2PortletTests_PortletConfig_ApiRender2_getProcessingEventQNames2";
public final static String V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETSUPPORTEDLOCALES2 = "V2PortletTests_PortletConfig_ApiRender2_getSupportedLocales2";
@@ -2664,7 +2663,6 @@ public class JSR286ApiTestCaseDetails extends TestCaseDetails {
tcd.put(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETINITPARAMETER2, "Method getInitParameter(String): Returns null if the specified initialization parameter does not exist");
tcd.put(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETINITPARAMETERNAMES2, "Method getInitParameterNames(): Returns an empty Enumeration if there are no initialization parameters available ");
tcd.put(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETPUBLICRENDERPARAMETERNAMES2, "Method getPublicRenderParameterNames(): Returns an empty Enumeration if there are no public render parameters are defined ");
- tcd.put(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETDEFAULTNAMESPACE2, "Method getDefaultNamespace(): Returns XMLConstants.NULL_NS_URI if no default namespace is defined in the deployment descriptor ");
tcd.put(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETPUBLISHINGEVENTQNAMES2, "Method getPublishingEventQNames(): Returns an empty Enumeration if there are no processing events are defined");
tcd.put(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETPROCESSINGEVENTQNAMES2, "Method getProcessingEventQNames(): Returns an empty Enumeration if there are no processing events are defined");
tcd.put(V2PORTLETTESTS_PORTLETCONFIG_APIRENDER2_GETSUPPORTEDLOCALES2, "Method getSupportedLocales(): Returns an empty Enumeration if there are no supported locales are defined");
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/090f142b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java
index ea0b0cd..08e8def 100644
--- a/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java
+++ b/portlet-tck_3.0/common/src/main/java/javax/portlet/tck/beans/JSR286SpecTestCaseDetails.java
@@ -62,6 +62,7 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS7 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions7";
public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS8 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions8";
public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS9 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions9";
+ public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETDEFAULTNAMESPACE2 = "V2AddlPortletTests_SPEC2_6_RenderConfig_getDefaultNamespace2";
public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE8 = "V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle8";
public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE9 = "V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle9";
public final static String V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE10 = "V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle10";
@@ -773,6 +774,7 @@ public class JSR286SpecTestCaseDetails extends TestCaseDetails {
tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS7, "The returned Map contains values defined in the deployment descriptor <container-runtime-option> elements at the portlet level");
tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS8, "If the deployment descriptor contains <container-runtime-option> elements defined at both the portlet and the portlet application levels, the returned Map contains a merger of all values");
tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETCONTAINERRUNTIMEOPTIONS9, "If the deployment descriptor contains <container-runtime-option> elements of the same name defined at both the portlet and the portlet application levels, the returned Map contains a the value defined at the portlet level");
+ tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG_GETDEFAULTNAMESPACE2,"Method getDefaultNamespace(): Returns XMLConstants.NULL_NS_URI if no default namespace is defined in the deployment descriptor");
tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE8, "If no resource bundle is defined, the value defined in the deployment descriptor <title> element is returned by the corresponding getString method call");
tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE9, "If no resource bundle is defined, the value defined in the deployment descriptor <short-title> element is returned by the corresponding getString method call");
tcd.put(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE10, "If no resource bundle is defined, the value defined in the deployment descriptor <keywords> element is returned by the corresponding getString method call");