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/08/23 01:17:33 UTC

portals-pluto git commit: PLUTO-729 TCK: Contesting usage of upper-case portlet modes and window states in Portlet Hub tests

Repository: portals-pluto
Updated Branches:
  refs/heads/master c04143d03 -> e5e7f2709


PLUTO-729 TCK: Contesting usage of upper-case portlet modes and window states in Portlet Hub tests


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/e5e7f270
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/e5e7f270
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/e5e7f270

Branch: refs/heads/master
Commit: e5e7f27097e7607d8a0a30a43e417b5ddb215b8c
Parents: c04143d
Author: Neil Griffin <ne...@gmail.com>
Authored: Wed Aug 22 21:17:04 2018 -0400
Committer: Neil Griffin <ne...@gmail.com>
Committed: Wed Aug 22 21:17:04 2018 -0400

----------------------------------------------------------------------
 .../src/main/docs/ModuleAssertions.csv          |  8 ++---
 .../portlets/PortletHubTests_SPEC_23_JSRS.java  |  8 ++---
 .../portlet/tck/util/ModuleTestCaseDetails.java |  8 ++---
 .../javascript/PortletHubTests_SPEC_23_JSRS.js  | 16 ++++-----
 .../PortletHubTests_SPEC_23_JSState.js          | 36 ++++++++++----------
 5 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e5e7f270/portlet-tck_3.0/V3PortletHubTests/src/main/docs/ModuleAssertions.csv
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletHubTests/src/main/docs/ModuleAssertions.csv b/portlet-tck_3.0/V3PortletHubTests/src/main/docs/ModuleAssertions.csv
index 16baa76..ba95976 100644
--- a/portlet-tck_3.0/V3PortletHubTests/src/main/docs/ModuleAssertions.csv
+++ b/portlet-tck_3.0/V3PortletHubTests/src/main/docs/ModuleAssertions.csv
@@ -163,10 +163,10 @@ SPEC_23;JS URL;createResourceUrlC;TRUE;The portlet hub createResourceUrl functio
 SPEC_23;JS URL;createResourceUrlD;TRUE;The portlet hub createResourceUrl function returns a URL with no render state set when cacheability = cacheLevelFull
 
 SPEC_23;JS RS;setRenderState1;TRUE;The portlet hub setRenderState function causes the onStateChange listener to be called
-SPEC_23;JS RS;setRenderState2;TRUE;The portlet hub setRenderState function allows the portlet mode to be set to "EDIT"
-SPEC_23;JS RS;setRenderState3;TRUE;The portlet hub setRenderState function allows the portlet mode to be set to "VIEW"
-SPEC_23;JS RS;setRenderState4;TRUE;The portlet hub setRenderState function allows the window state to be set to "MAXIMIZED"
-SPEC_23;JS RS;setRenderState5;TRUE;The portlet hub setRenderState function allows the window state to be set to "NORMAL"
+SPEC_23;JS RS;setRenderState2;TRUE;The portlet hub setRenderState function allows the portlet mode to be set to "edit"
+SPEC_23;JS RS;setRenderState3;TRUE;The portlet hub setRenderState function allows the portlet mode to be set to "view"
+SPEC_23;JS RS;setRenderState4;TRUE;The portlet hub setRenderState function allows the window state to be set to "maximized"
+SPEC_23;JS RS;setRenderState5;TRUE;The portlet hub setRenderState function allows the window state to be set to "normal"
 SPEC_23;JS RS;setRenderState6;TRUE;The portlet hub setRenderState function allows a new parameter "NewParm" to be set to "NewVal"
 SPEC_23;JS RS;setRenderState7;TRUE;The portlet hub setRenderState function allows parameter "NewParm" to be set to ["NewVal1", "NewVal2"]
 SPEC_23;JS RS;setRenderState8;TRUE;The portlet hub setRenderState function allows a new parameter "NewParm" to be deleted

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e5e7f270/portlet-tck_3.0/V3PortletHubTests/src/main/java/javax/portlet/tck/portlets/PortletHubTests_SPEC_23_JSRS.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletHubTests/src/main/java/javax/portlet/tck/portlets/PortletHubTests_SPEC_23_JSRS.java b/portlet-tck_3.0/V3PortletHubTests/src/main/java/javax/portlet/tck/portlets/PortletHubTests_SPEC_23_JSRS.java
index bae68d0..691e15c 100644
--- a/portlet-tck_3.0/V3PortletHubTests/src/main/java/javax/portlet/tck/portlets/PortletHubTests_SPEC_23_JSRS.java
+++ b/portlet-tck_3.0/V3PortletHubTests/src/main/java/javax/portlet/tck/portlets/PortletHubTests_SPEC_23_JSRS.java
@@ -91,7 +91,7 @@ public class PortletHubTests_SPEC_23_JSRS implements Portlet {
 
       /* TestCase: V3PortletHubTests_SPEC_23_JSRS_setRenderState2                   */
       /* Details: "The portlet hub setRenderState function allows the portlet mode  */
-      /* to be set to \"EDIT\""                                                     */
+      /* to be set to \"edit\""                                                     */
       {
          TestButtonAsync button = new TestButtonAsync(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE2);
          button.writeTo(writer);
@@ -101,7 +101,7 @@ public class PortletHubTests_SPEC_23_JSRS implements Portlet {
 
       /* TestCase: V3PortletHubTests_SPEC_23_JSRS_setRenderState3                   */
       /* Details: "The portlet hub setRenderState function allows the portlet mode  */
-      /* to be set to \"VIEW\""                                                     */
+      /* to be set to \"view\""                                                     */
       {
          TestButtonAsync button = new TestButtonAsync(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE3);
          button.writeTo(writer);
@@ -111,7 +111,7 @@ public class PortletHubTests_SPEC_23_JSRS implements Portlet {
 
       /* TestCase: V3PortletHubTests_SPEC_23_JSRS_setRenderState4                   */
       /* Details: "The portlet hub setRenderState function allows the window state  */
-      /* to be set to \"MAXIMIZED\""                                                */
+      /* to be set to \"maximized\""                                                */
       {
          TestButtonAsync button = new TestButtonAsync(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE4);
          button.writeTo(writer);
@@ -121,7 +121,7 @@ public class PortletHubTests_SPEC_23_JSRS implements Portlet {
 
       /* TestCase: V3PortletHubTests_SPEC_23_JSRS_setRenderState5                   */
       /* Details: "The portlet hub setRenderState function allows the window state  */
-      /* to be set to \"NORMAL\""                                                   */
+      /* to be set to \"normal\""                                                   */
       {
          TestButtonAsync button = new TestButtonAsync(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE5);
          button.writeTo(writer);

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e5e7f270/portlet-tck_3.0/V3PortletHubTests/src/main/java/javax/portlet/tck/util/ModuleTestCaseDetails.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletHubTests/src/main/java/javax/portlet/tck/util/ModuleTestCaseDetails.java b/portlet-tck_3.0/V3PortletHubTests/src/main/java/javax/portlet/tck/util/ModuleTestCaseDetails.java
index 0fac2e3..6ab9e61 100644
--- a/portlet-tck_3.0/V3PortletHubTests/src/main/java/javax/portlet/tck/util/ModuleTestCaseDetails.java
+++ b/portlet-tck_3.0/V3PortletHubTests/src/main/java/javax/portlet/tck/util/ModuleTestCaseDetails.java
@@ -351,10 +351,10 @@ public class ModuleTestCaseDetails extends TestCaseDetails {
       tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSURL_CREATERESOURCEURLC, "The portlet hub createResourceUrl function returns a URL with the render state set when cacheability = cacheLevelPortlet");
       tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSURL_CREATERESOURCEURLD, "The portlet hub createResourceUrl function returns a URL with no render state set when cacheability = cacheLevelFull");
       tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE1, "The portlet hub setRenderState function causes the onStateChange listener to be called");
-      tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE2, "The portlet hub setRenderState function allows the portlet mode to be set to \"EDIT\"");
-      tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE3, "The portlet hub setRenderState function allows the portlet mode to be set to \"VIEW\"");
-      tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE4, "The portlet hub setRenderState function allows the window state to be set to \"MAXIMIZED\"");
-      tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE5, "The portlet hub setRenderState function allows the window state to be set to \"NORMAL\"");
+      tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE2, "The portlet hub setRenderState function allows the portlet mode to be set to \"edit\"");
+      tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE3, "The portlet hub setRenderState function allows the portlet mode to be set to \"view\"");
+      tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE4, "The portlet hub setRenderState function allows the window state to be set to \"maximized\"");
+      tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE5, "The portlet hub setRenderState function allows the window state to be set to \"normal\"");
       tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE6, "The portlet hub setRenderState function allows a new parameter \"NewParm\" to be set to \"NewVal\"");
       tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE7, "The portlet hub setRenderState function allows parameter \"NewParm\" to be set to [\"NewVal1\", \"NewVal2\"]");
       tcd.put(V3PORTLETHUBTESTS_SPEC_23_JSRS_SETRENDERSTATE8, "The portlet hub setRenderState function allows a new parameter \"NewParm\" to be deleted");

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e5e7f270/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/javascript/PortletHubTests_SPEC_23_JSRS.js
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/javascript/PortletHubTests_SPEC_23_JSRS.js b/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/javascript/PortletHubTests_SPEC_23_JSRS.js
index 0fd0aed..9cdd889 100644
--- a/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/javascript/PortletHubTests_SPEC_23_JSRS.js
+++ b/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/javascript/PortletHubTests_SPEC_23_JSRS.js
@@ -95,7 +95,7 @@
 
       /* TestCase: V3PortletHubTests_SPEC_23_JSRS_setRenderState2                   */
       /* Details: "The portlet hub setRenderState function allows the portlet mode  */
-      /* to be set to \"EDIT\""                                                     */
+      /* to be set to \"edit\""                                                     */
       document.getElementById('V3PortletHubTests_SPEC_23_JSRS_setRenderState2-clickme').onclick = function () {
          var state = hub.newState();
          state.setValue('testcase', 'V3PortletHubTests_SPEC_23_JSRS_setRenderState2');
@@ -106,7 +106,7 @@
 
       /* TestCase: V3PortletHubTests_SPEC_23_JSRS_setRenderState3                   */
       /* Details: "The portlet hub setRenderState function allows the portlet mode  */
-      /* to be set to \"VIEW\""                                                     */
+      /* to be set to \"view\""                                                     */
       document.getElementById('V3PortletHubTests_SPEC_23_JSRS_setRenderState3-clickme').onclick = function () {
          var state = hub.newState();
          state.setValue('testcase', 'V3PortletHubTests_SPEC_23_JSRS_setRenderState3');
@@ -117,7 +117,7 @@
 
       /* TestCase: V3PortletHubTests_SPEC_23_JSRS_setRenderState4                   */
       /* Details: "The portlet hub setRenderState function allows the window state  */
-      /* to be set to \"MAXIMIZED\""                                                */
+      /* to be set to \"maximized\""                                                */
       document.getElementById('V3PortletHubTests_SPEC_23_JSRS_setRenderState4-clickme').onclick = function () {
          var state = hub.newState();
          state.setValue('testcase', 'V3PortletHubTests_SPEC_23_JSRS_setRenderState4');
@@ -128,7 +128,7 @@
 
       /* TestCase: V3PortletHubTests_SPEC_23_JSRS_setRenderState5                   */
       /* Details: "The portlet hub setRenderState function allows the window state  */
-      /* to be set to \"NORMAL\""                                                   */
+      /* to be set to \"normal\""                                                   */
       document.getElementById('V3PortletHubTests_SPEC_23_JSRS_setRenderState5-clickme').onclick = function () {
          var state = hub.newState();
          state.setValue('testcase', 'V3PortletHubTests_SPEC_23_JSRS_setRenderState5');
@@ -214,7 +214,7 @@
    
          /* TestCase: V3PortletHubTests_SPEC_23_JSRS_setRenderState2                   */
          /* Details: "The portlet hub setRenderState function allows the portlet mode  */
-         /* to be set to \"EDIT\""                                                     */
+         /* to be set to \"edit\""                                                     */
          if (state.getValue('testcase') === 'V3PortletHubTests_SPEC_23_JSRS_setRenderState2') {
             msg = null;
             if (state.getPortletMode().toLowerCase() !== 'edit') {
@@ -225,7 +225,7 @@
    
          /* TestCase: V3PortletHubTests_SPEC_23_JSRS_setRenderState3                   */
          /* Details: "The portlet hub setRenderState function allows the portlet mode  */
-         /* to be set to \"VIEW\""                                                     */
+         /* to be set to \"view\""                                                     */
          if (state.getValue('testcase') === 'V3PortletHubTests_SPEC_23_JSRS_setRenderState3') {
             msg = null;
             if (state.getPortletMode().toLowerCase() !== 'view') {
@@ -236,7 +236,7 @@
    
          /* TestCase: V3PortletHubTests_SPEC_23_JSRS_setRenderState4                   */
          /* Details: "The portlet hub setRenderState function allows the window state  */
-         /* to be set to \"MAXIMIZED\""                                                */
+         /* to be set to \"maximized\""                                                */
          if (state.getValue('testcase') === 'V3PortletHubTests_SPEC_23_JSRS_setRenderState4') {
             msg = null;
             if (state.getWindowState().toLowerCase() !== 'maximized') {
@@ -247,7 +247,7 @@
    
          /* TestCase: V3PortletHubTests_SPEC_23_JSRS_setRenderState5                   */
          /* Details: "The portlet hub setRenderState function allows the window state  */
-         /* to be set to \"NORMAL\""                                                   */
+         /* to be set to \"normal\""                                                   */
          if (state.getValue('testcase') === 'V3PortletHubTests_SPEC_23_JSRS_setRenderState5') {
             msg = null;
             if (state.getWindowState().toLowerCase() !== 'normal') {

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/e5e7f270/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/javascript/PortletHubTests_SPEC_23_JSState.js
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/javascript/PortletHubTests_SPEC_23_JSState.js b/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/javascript/PortletHubTests_SPEC_23_JSState.js
index 8c43aee..7674ca0 100644
--- a/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/javascript/PortletHubTests_SPEC_23_JSState.js
+++ b/portlet-tck_3.0/V3PortletHubTests/src/main/webapp/javascript/PortletHubTests_SPEC_23_JSState.js
@@ -211,8 +211,8 @@
          /* Details: "The RenderState object clone function returns a new object       */
          /* instance"                                                                  */
          state = hub.newState();
-         state.setPortletMode('VIEW');
-         state.setWindowState('NORMAL');
+         state.setPortletMode('view');
+         state.setWindowState('normal');
          newState = state.clone();
          msg = null;
          if (state === newState) {
@@ -259,11 +259,11 @@
          /* Details: "The RenderState object clone function returns a RenderState      */
          /* object with the same portlet mode"                                         */
          state = hub.newState();
-         state.setPortletMode('VIEW');
-         state.setWindowState('NORMAL');
+         state.setPortletMode('view');
+         state.setWindowState('normal');
          newState = state.clone();
          msg = null;
-         if (state.portletMode !== 'VIEW' || state.portletMode !== newState.portletMode) {
+         if (state.portletMode !== 'view' || state.portletMode !== newState.portletMode) {
             msg = 'Portlet mode invalid: ' + newState.portletMode;
          }
          setSuccess('V3PortletHubTests_SPEC_23_JSState_clone3', msg);
@@ -272,11 +272,11 @@
          /* Details: "The RenderState object clone function returns a RenderState      */
          /* object with the same window state"                                         */
          state = hub.newState();
-         state.setPortletMode('VIEW');
-         state.setWindowState('NORMAL');
+         state.setPortletMode('view');
+         state.setWindowState('normal');
          newState = state.clone();
          msg = null;
-         if (state.windowState !== 'NORMAL' || state.windowState !== newState.windowState) {
+         if (state.windowState !== 'normal' || state.windowState !== newState.windowState) {
             msg = 'Window State invalid: ' + newState.windowState;
          }
          setSuccess('V3PortletHubTests_SPEC_23_JSState_clone4', msg);
@@ -285,8 +285,8 @@
          /* Details: "The RenderState object clone function returns a RenderState      */
          /* object with no parameters if the original had no parameters"               */
          state = hub.newState();
-         state.setPortletMode('VIEW');
-         state.setWindowState('NORMAL');
+         state.setPortletMode('view');
+         state.setWindowState('normal');
          newState = state.clone();
          msg = null;
          params = hub.newParameters();
@@ -325,9 +325,9 @@
          /* TestCase: V3PortletHubTests_SPEC_23_JSState_setPortletMode2                */
          /* Details: "The RenderState object setPortletMode function sets the portlet  */
          /* mode"                                                                      */
-         state.setPortletMode('HELP');
+         state.setPortletMode('help');
          msg = null;
-         if (state.portletMode !== 'HELP') {
+         if (state.portletMode !== 'help') {
             msg = 'Portlet mode incorrectly set: ' + state.portletMode;
          }
          setSuccess('V3PortletHubTests_SPEC_23_JSState_setPortletMode2', msg);
@@ -335,9 +335,9 @@
          /* TestCase: V3PortletHubTests_SPEC_23_JSState_getPortletMode1                */
          /* Details: "The RenderState object getPortletMode function returns the       */
          /* portlet mode"                                                              */
-         state.portletMode = 'EDIT';
+         state.portletMode = 'edit';
          msg = null;
-         if (state.getPortletMode() !== 'EDIT') {
+         if (state.getPortletMode() !== 'edit') {
             msg = 'Portlet mode incorrectly retrieved: ' + state.getPortletMode();
          }
          setSuccess('V3PortletHubTests_SPEC_23_JSState_getPortletMode1', msg);
@@ -354,9 +354,9 @@
          /* TestCase: V3PortletHubTests_SPEC_23_JSState_setWindowState2                */
          /* Details: "The RenderState object setWindowState function sets the window   */
          /* state"                                                                     */
-         state.setWindowState('NORMAL');
+         state.setWindowState('normal');
          msg = null;
-         if (state.windowState !== 'NORMAL') {
+         if (state.windowState !== 'normal') {
             msg = 'Window state incorrectly set: ' + state.windowState;
          }
          setSuccess('V3PortletHubTests_SPEC_23_JSState_setWindowState2', msg);
@@ -364,9 +364,9 @@
          /* TestCase: V3PortletHubTests_SPEC_23_JSState_getWindowState1                */
          /* Details: "The RenderState object getWindowState function returns the       */
          /* window state"                                                              */
-         state.windowState = 'NORMAL';
+         state.windowState = 'normal';
          msg = null;
-         if (state.getWindowState() !== 'NORMAL') {
+         if (state.getWindowState() !== 'normal') {
             msg = 'Window state incorrectly retrieved: ' + state.getWindowState();
          }
          setSuccess('V3PortletHubTests_SPEC_23_JSState_getWindowState1', msg);