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/14 14:28:50 UTC
[10/50] [abbrv] portals-pluto git commit: Renamed PortletState to
RenderState and made all corresponding code and documentation updates.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/portlet-api/src/main/javascript/portlet.js
----------------------------------------------------------------------
diff --git a/portlet-api/src/main/javascript/portlet.js b/portlet-api/src/main/javascript/portlet.js
index d68b54a..c1b9163 100644
--- a/portlet-api/src/main/javascript/portlet.js
+++ b/portlet-api/src/main/javascript/portlet.js
@@ -47,34 +47,19 @@
* To represent the parameter having a <code>null</code> value, the
* property value must equal [null].
* <p>
- * PortletParameters objects obtained from the Portlet Hub define some helper
- * functions for accessing the parameter values.
- * <p>
* @typedef PortletParameters
* @property {string[]} {string} The parameters object may have
* multiple properties.
- * @property {function} clone() Returns a new copy of this object
- * @property {function} setValue(n,v) Sets a parameter with name n and value v.
- * The value v may be a string or an array.
- * @property {function} setValues(n,v) Sets a parameter with name n and value v.
- * The value v may be a string or an array.
- * @property {function} getValue(n,d) Gets the string parameter value for the name n.
- * If n designates a multi-valued parameter, this function returns the first value in the values array.
- * If parameter n is undefined, the function returns the optional default value d.
- * @property {function} getValues(n,d) Gets the string array parameter value for the name n.
- * If parameter n is undefined, the function returns the optional default value array d.
- * @property {function} remove(n) Removes the parameter with name n.
*/
/**
- * Represents the portlet state.
+ * Represents the render state.
* <p>
- * PortletState objects obtained from the Portlet Hub define some helper
+ * RenderState objects obtained from the Portlet Hub define some helper
* functions for accessing the parameter values.
* <p>
- * @typedef PortletState
+ * @typedef RenderState
* @property {PortletParameters} parameters The portlet parameters
- * @property {PortletParameters} p an alias for the 'parameters' property
* @property {string} portletMode The portlet mode
* @property {string} windowState The window state
* @property {function} clone() Returns a new copy of this object
@@ -84,6 +69,16 @@
* @property {function} setWindowState(ws) Sets the window state to the specified value
* @property {function} getWindowState() Returns the current window state
* The strings defined by the {@link PortletConstants} object should be used to specify the window state.
+ * @property {function} setValue(n,v) Sets a parameter with name n and value v.
+ * The value v may be a string or an array.
+ * @property {function} setValues(n,v) Sets a parameter with name n and value v.
+ * The value v may be a string or an array.
+ * @property {function} getValue(n,d) Gets the string parameter value for the name n.
+ * If n designates a multi-valued parameter, this function returns the first value in the values array.
+ * If parameter n is undefined, the function returns the optional default value d.
+ * @property {function} getValues(n,d) Gets the string array parameter value for the name n.
+ * If parameter n is undefined, the function returns the optional default value array d.
+ * @property {function} remove(n) Removes the parameter with name n.
*/
/**
@@ -103,7 +98,7 @@
/**
* Optional render data that may be provided by the portlet hub when
- * a portlet state change occurs.
+ * a render state change occurs.
*
* @typedef RenderData
* @property {string} renderData The render data
@@ -119,29 +114,29 @@
* event type through the {@link addEventListener} function.
* <p>
* When the portlet hub calls the onStateChange callback, it will pass
- * a copy of the current portlet state as a parameter.
- * The portlet client can make changes to the PortletState object
- * without affecting the actual portlet state, which is maintained by the
+ * a copy of the current render state as a parameter.
+ * The portlet client can make changes to the RenderState object
+ * without affecting the actual render state, which is maintained by the
* portlet hub.
- * The portlet client uses the {@link setPortletState} method to
- * make changes to the local copy of the PortletState object active.
+ * The portlet client uses the {@link setRenderState} method to
+ * make changes to the local copy of the RenderState object active.
* <p>
* Optionally, the portlet hub will make a RenderData object available
* to the portlet client.
* When the RenderData object is available, it contains the same data
* as would be available through a portlet resource request using the
- * current portlet state with no additional resource parameters and with
+ * current render state with no additional resource parameters and with
* the resource URL cacheability option set to "PAGE".
* <p>
* The portlet client may not call portlet hub functions that can
- * cause state to be updated ({@link action}, {@link updatePortletState},
+ * cause state to be updated ({@link action}, {@link updateRenderState},
* {@link startPartialAction})
* during onStateChange execution.
*
* @name onStateChange
* @callback onStateChange
* @param {string} type The event type "portlet.onStateChange".
- * @param {PortletState} portletState The portlet state
+ * @param {RenderState} RenderState The render state
* @param {RenderData} renderData The render data.
* Optionally provided by the portlet hub.
*/
@@ -234,7 +229,7 @@
* </dd>
* </dl>
* <h5>
- * Changing the Portlet State
+ * Changing the render state
* </h5>
* <p>
* The portlet client can use portlet hub functions to initiate state changes.
@@ -261,7 +256,7 @@
* portlets will not be updated with new page state information before the
* page refresh is carried out.
* <h5>
- * Receiving Portlet State Updates
+ * Receiving render state Updates
* </h5>
* <p>
* When a state change occurs that affects a portlet, the portlet hub informs the
@@ -301,14 +296,14 @@
* The portlet hub calls the portlet client callback functions in several situations as described
* above.
* When the portlet hub calls the portlet client, the portlet client may navigate
- * to a different page or may initiate another change to the portlet state
+ * to a different page or may initiate another change to the render state
* that could potentially cause a page refresh.
* <p>
- * Due to this behavior, the delivery of neither portlet state updates nor
+ * Due to this behavior, the delivery of neither render state updates nor
* portlet client events can be guaranteed.
* <p>
* The portlet hub provides for orderly state transitions by allowing only a
- * single blocking operation ({@link action}, {@link setPortletState},
+ * single blocking operation ({@link action}, {@link setRenderState},
* {@link startPartialAction}) to be active at any one time.
* <p>
* The state transition is considered to be active from the initial portlet
@@ -322,7 +317,7 @@
* <li>
* It is not possible to initiate a sequence of blocking operations.
* <p>
- * For example, once a portlet client calls the {@link setPortletState} method,
+ * For example, once a portlet client calls the {@link setRenderState} method,
* it cannot call any additional blocking method until after its
* onStateChange listener function has been called.
* </li>
@@ -447,7 +442,7 @@ var portlet = portlet || {};
* for each portlet
*
* @typedef PortletData
- * @property {PortletState} state The current PortletState object
+ * @property {RenderState} state The current RenderState object
* @property {string[]} pubParms String array declaring the public
* parameters for the portlet
* @property {RenderData} renderData Render data for the portlet
@@ -813,7 +808,7 @@ var portlet = portlet || {};
},
/**
- * Accepts an object containing changed portlet states. Updates
+ * Accepts an object containing changed render states. Updates
* the state for each portlet present.
*
* @param {string} upids array of portlet IDs to be updated
@@ -825,9 +820,9 @@ var portlet = portlet || {};
if (upids.length === 0) {
busy = false;
} else {
- for (ii = 0; ii < upids.length; ii++) {
- _updateStateForPortlet(upids[ii]);
- }
+ for (ii = 0; ii < upids.length; ii++) {
+ _updateStateForPortlet(upids[ii]);
+ }
}
},
@@ -858,14 +853,14 @@ var portlet = portlet || {};
},
/**
- * Updates the portlet state, taking the public render
+ * Updates the render state, taking the public render
* parameters into account.
* The portlet client requesting the change, represented
* by the supplied portelt ID, is updated, along with each portlet
* that has a public render parameter update.
*
* @param {string} pid The portlet ID
- * @param {PortletState} state The new portlet state
+ * @param {RenderState} state The new render state
* @throws {AccessDeniedException}
* Thrown if a blocking operation is
* already in progress.
@@ -1017,7 +1012,7 @@ var portlet = portlet || {};
* for the portlet.
*
* @param {string} pid The portlet ID
- * @param {PortletState} state The portlet state object to check
+ * @param {RenderState} state The render state object to check
* @private
* @throws {IllegalArgumentException}
* Thrown if any component of the state is incorrect
@@ -1237,7 +1232,7 @@ var portlet = portlet || {};
* <dl>
* <dt>portlet.onStateChange</dt>
* <dd>
- * Fired when the portlet state changes.
+ * Fired when the render state changes.
* In order to participate in the portlet Ajax support, a portlet client must register
* an {@link onStateChange} event listener for this event type.
* <p>
@@ -1360,31 +1355,31 @@ var portlet = portlet || {};
},
/**
- * Sets the portlet state, which consists of the public and private
+ * Sets the render state, which consists of the public and private
* render parameters, the portlet mode, and the window state.
* <p>
- * When the portlet state has been successfully set, a copy of the portlet state
+ * When the render state has been successfully set, a copy of the render state
* will be provided to the portlet client
* through the {@link onStateChange} listener function.
* A portlet client can modify this state object and pass it to the
- * setPortletState function to update the portlet state.
+ * setRenderState function to update the render state.
* <p>
* However, it is also possible for the portal to completely refresh the
- * page as a response to setting the portlet state.
+ * page as a response to setting the render state.
* This may occur in order to support portlets on the page that do not participate
* in the Portlet 3.0 Ajax support or due to configuration settings, for example.
* <p>
* If the page is completely refreshed, it will be rendered according to
* render parameters set on the server.
* <p>
- * Setting the portlet state is a blocking operation.
+ * Setting the render state is a blocking operation.
* To allow for orderly state transitions, the portlet hub does not allow
* this function to be used while a blocking operation is in progress.
* A blocking operation is considered to be in progress
* from the initial call until the final onStateChange event for that
* operation has been fired. See {@link portlet} for further information.
*
- * @param {PortletState} state The new state to be set
+ * @param {RenderState} state The new state to be set
*
* @throws {IllegalArgumentException}
* Thrown if the input parameters are invalid
@@ -1397,15 +1392,15 @@ var portlet = portlet || {};
*
* @memberOf PortletInit
*/
- setPortletState : function (state) {
+ setRenderState : function (state) {
- console.log("setPortletState", state);
+ console.log("setRenderState", state);
// check for exactly 1 argument of type 'object'
// make sure an onStateChange listener is registered by providing portlet ID
checkArguments(arguments, 1, 1, ['object']);
- // validate portlet state & throw exception if incorrect
+ // validate render state & throw exception if incorrect
validateState(portletId, state);
// Ok so far, so do the update. Throws if busy or no callback registered
@@ -1424,8 +1419,8 @@ var portlet = portlet || {};
* the server-side serveResource method.
* <p>
* Resource parameters are optional parameters attached to a resource
- * URL in addition to any portlet state values that may be present.
- * Resource parameters do not influence the portlet state.
+ * URL in addition to any render state values that may be present.
+ * Resource parameters do not influence the render state.
* <p>
* The resource parameters must be an object containing properties
* representing parameter names whose values must be an array of string
@@ -1538,11 +1533,11 @@ var portlet = portlet || {};
* Initiates a portlet action using the specified action parameters and element
* arguments.
* <p>
- * When the action has successfully completed, a copy of the portlet state
+ * When the action has successfully completed, a copy of the render state
* will be provided to the portlet client
* through the {@link onStateChange} listener function.
* A portlet client can modify this state object and pass it to the
- * setPortletState function to update the portlet state.
+ * setRenderState function to update the render state.
* <p>
* However, it is also possible for the portal to completely refresh the
* page as a response to the action.
@@ -1553,8 +1548,8 @@ var portlet = portlet || {};
* render parameters set on the server.
* <p>
* Action parameters are optional parameters attached to a action
- * URL in addition to any portlet state values that may be present.
- * Action parameters do not influence the portlet state.
+ * URL in addition to any render state values that may be present.
+ * Action parameters do not influence the render state.
* <p>
* The action parameters must be an object containing properties
* representing parameter names whose values must be an array of string
@@ -1702,7 +1697,7 @@ var portlet = portlet || {};
* action and event processing on the server resulting from the partial action.
* <p>
* After the <code>setPageState</code> function has been called,
- * a copy of the portlet state will be provided to each affected portlet client
+ * a copy of the render state will be provided to each affected portlet client
* through the {@link onStateChange} listener function.
* <p>
* However, it is also possible for the portal to completely refresh the
@@ -1714,8 +1709,8 @@ var portlet = portlet || {};
* render parameters set on the server.
* <p>
* Action parameters are optional parameters attached to a action
- * URL in addition to any portlet state values that may be present.
- * Action parameters do not influence the portlet state.
+ * URL in addition to any render state values that may be present.
+ * Action parameters do not influence the render state.
* <p>
* The action parameters must be an object containing properties
* representing parameter names whose values must be an array of string
@@ -1797,14 +1792,14 @@ var portlet = portlet || {};
* state change is in progress before initiating a blocking operation.
* <p>
* Note that if the portlet client uses this function to implement
- * a waiting function, the portlet state may be changed during the
+ * a waiting function, the render state may be changed during the
* time that the portlet client waits.
* Also note that the portal may choose to refresh the page as a response
* to a blocking operation, in which case the waiting function would not
* complete.
* <p>
* The portlet hub provides for orderly state transitions by allowing only a
- * single blocking operation ({@link action}, {@link setPortletState},
+ * single blocking operation ({@link action}, {@link setRenderState},
* {@link startPartialAction}) to be active at any one time.
* <p>
* The state transition is considered to be active from the initial portlet
@@ -1852,9 +1847,9 @@ var portlet = portlet || {};
* Take for example a scenario where a portlet issues an event to
* several other portlets, perhaps including itself.
* Due to the event, each portlet updates parameters
- * through use of the {@link setPortletState} function.
+ * through use of the {@link setRenderState} function.
* <p>
- * The <code>setPortletState</code> function can cause a page refresh
+ * The <code>setRenderState</code> function can cause a page refresh
* depending on the situation.
* If all portlets on the page participate in the JSR 362 Ajax support,
* the portlet hub might not cause a page refresh.
@@ -1915,15 +1910,15 @@ var portlet = portlet || {};
},
/**
- * Creates and returns a new PortletState object.
+ * Creates and returns a new RenderState object.
* <p>
- * If no argument is provided, an empty PortletState object will be
- * returned. If an existing PortletState object is provided as argument,
+ * If no argument is provided, an empty RenderState object will be
+ * returned. If an existing RenderState object is provided as argument,
* a clone of the input object will be returned.
*
- * @param {PortletState} s An optional PortletState object to be copied
+ * @param {RenderState} s An optional RenderState object to be copied
*
- * @returns {PortletState} The new PortletState object
+ * @returns {RenderState} The new RenderState object
*
* @memberOf PortletInit
*/
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/portlet-api/src/test/javascript/ActionTest.js
----------------------------------------------------------------------
diff --git a/portlet-api/src/test/javascript/ActionTest.js b/portlet-api/src/test/javascript/ActionTest.js
index f722597..a8fde18 100644
--- a/portlet-api/src/test/javascript/ActionTest.js
+++ b/portlet-api/src/test/javascript/ActionTest.js
@@ -278,11 +278,11 @@ describe('The portlet hub allows the portlet client to execute a portlet action'
str = portlet.test.data.updateStrings[portletA];
states = portlet.test.decodeUpdateString(str, portletA);
stateA = hubA.newState(states[portletA]);
- expect(cbA.retPortletState).toEqual(stateA);
+ expect(cbA.retRenderState).toEqual(stateA);
});
});
- it('allows a resource URL to be created containing the portlet state',function(){
+ it('allows a resource URL to be created containing the render state',function(){
var parms = {rp1 : ["resVal"], rp2 : ["resVal2"]}, cache="cacheLevelPage", url, str;
var testFunc = function () {
return hubA.createResourceUrl(parms, cache);
@@ -384,9 +384,9 @@ describe('The portlet hub allows the portlet client to execute a portlet action'
str = portlet.test.data.updateStrings[portletB];
states = portlet.test.decodeUpdateString(str, portletB);
state = hubB.newState(states[portletB]);
- expect(cbB.retPortletState).toEqual(state);
+ expect(cbB.retRenderState).toEqual(state);
state = hubC.newState(states[portletC]);
- expect(cbC.retPortletState).toEqual(state);
+ expect(cbC.retRenderState).toEqual(state);
expect(cbA.isComplete()).toBeFalsy();
expect(cbD.isComplete()).toBeFalsy();
});
@@ -408,16 +408,16 @@ describe('The portlet hub allows the portlet client to execute a portlet action'
states = portlet.test.decodeUpdateString(str, portletC);
state = hubA.newState(states[portletA]);
- expect(cbA.retPortletState).toEqual(state);
+ expect(cbA.retRenderState).toEqual(state);
state = hubB.newState(states[portletB]);
- expect(cbB.retPortletState).toEqual(state);
+ expect(cbB.retRenderState).toEqual(state);
state = hubC.newState(states[portletC]);
- expect(cbC.retPortletState).toEqual(state);
+ expect(cbC.retRenderState).toEqual(state);
state = hubD.newState(states[portletD]);
- expect(cbD.retPortletState).toEqual(state);
+ expect(cbD.retRenderState).toEqual(state);
});
});
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/portlet-api/src/test/javascript/AddEventListenerTest.js
----------------------------------------------------------------------
diff --git a/portlet-api/src/test/javascript/AddEventListenerTest.js b/portlet-api/src/test/javascript/AddEventListenerTest.js
index 0ff0e86..61b475c 100644
--- a/portlet-api/src/test/javascript/AddEventListenerTest.js
+++ b/portlet-api/src/test/javascript/AddEventListenerTest.js
@@ -55,7 +55,7 @@ describe('The portlet hub provides the ability to add and remove event listeners
complete = false,
retType,
retErrorData,
- retPortletState,
+ retRenderState,
retRenderData,
// handler for portlet client event
@@ -71,9 +71,9 @@ describe('The portlet hub provides the ability to add and remove event listeners
},
// onStateChange handler
- onStateChange = function (type, portletState, renderData) {
+ onStateChange = function (type, RenderState, renderData) {
retType = type;
- retPortletState = portletState;
+ retRenderState = RenderState;
retRenderData = renderData;
complete = true;
return;
@@ -343,8 +343,8 @@ describe('The portlet hub provides the ability to add and remove event listeners
expect(retType).toEqual("portlet.onStateChange");
});
- it('is passed a PortletState parameter that is an object',function(){
- expect(typeof retPortletState).toEqual('object');
+ it('is passed a RenderState parameter that is an object',function(){
+ expect(typeof retRenderState).toEqual('object');
});
// portlet A is set up not to have render data
@@ -352,30 +352,30 @@ describe('The portlet hub provides the ability to add and remove event listeners
expect(typeof retRenderData).toEqual('undefined');
});
- it('is passed a PortletState parameter that has 4 properties',function(){
+ it('is passed a RenderState parameter that has 4 properties',function(){
var cnt = 0, prop;
- for (prop in retPortletState) {
- if (retPortletState.hasOwnProperty(prop)) {
+ for (prop in retRenderState) {
+ if (retRenderState.hasOwnProperty(prop)) {
cnt = cnt + 1;
}
}
expect(cnt).toEqual(4);
});
- it('is passed a PortletState object with a "parameters" property',function(){
- expect(typeof retPortletState.parameters).not.toEqual('undefined');
+ it('is passed a RenderState object with a "parameters" property',function(){
+ expect(typeof retRenderState.parameters).not.toEqual('undefined');
});
- it('is passed a PortletState object with a "portletMode" property',function(){
- expect(typeof retPortletState.portletMode).not.toEqual('undefined');
+ it('is passed a RenderState object with a "portletMode" property',function(){
+ expect(typeof retRenderState.portletMode).not.toEqual('undefined');
});
- it('is passed a PortletState object with a "windowState" property',function(){
- expect(typeof retPortletState.windowState).not.toEqual('undefined');
+ it('is passed a RenderState object with a "windowState" property',function(){
+ expect(typeof retRenderState.windowState).not.toEqual('undefined');
});
- it('its PortletState "parameters" property is an object',function(){
- expect(typeof retPortletState.parameters).toEqual('object');
+ it('its RenderState "parameters" property is an object',function(){
+ expect(typeof retRenderState.parameters).toEqual('object');
});
var parmCnt = 0, parms = pageState[portletA].state.parameters;
@@ -385,8 +385,8 @@ describe('The portlet hub provides the ability to add and remove event listeners
}
}
- it('its PortletState has ' + parmCnt + " parameters",function(){
- var retParmCnt = 0, parms = retPortletState.parameters;
+ it('its RenderState has ' + parmCnt + " parameters",function(){
+ var retParmCnt = 0, parms = retRenderState.parameters;
for (var prop in parms) {
if (parms.hasOwnProperty(prop)) {
retParmCnt = retParmCnt + 1;
@@ -395,33 +395,33 @@ describe('The portlet hub provides the ability to add and remove event listeners
expect(retParmCnt).toEqual(parmCnt);
});
- it('its PortletState "windowState" property is a string',function(){
- expect(typeof retPortletState.windowState).toEqual('string');
+ it('its RenderState "windowState" property is a string',function(){
+ expect(typeof retRenderState.windowState).toEqual('string');
});
- it('its PortletState "portletMode" property is a string',function(){
- expect(typeof retPortletState.portletMode).toEqual('string');
+ it('its RenderState "portletMode" property is a string',function(){
+ expect(typeof retRenderState.portletMode).toEqual('string');
});
- it('its PortletState has windowState=' +
+ it('its RenderState has windowState=' +
pageState[portletA].state.windowState,function(){
- expect(retPortletState.windowState)
+ expect(retRenderState.windowState)
.toEqual(pageState[portletA].state.windowState);
});
- it('its PortletState has portletMode=' +
+ it('its RenderState has portletMode=' +
pageState[portletA].state.portletMode,function(){
- expect(retPortletState.portletMode)
+ expect(retRenderState.portletMode)
.toEqual(pageState[portletA].state.portletMode);
});
- it('its PortletState parameter is not identical to the test state object"',function(){
- expect(retPortletState).not.toBe(pageState[portletA].state);
+ it('its RenderState parameter is not identical to the test state object"',function(){
+ expect(retRenderState).not.toBe(pageState[portletA].state);
});
- it('its PortletState parameter equals the test state object"',function(){
+ it('its RenderState parameter equals the test state object"',function(){
var ts = hubA.newState(pageState[portletA].state);
- expect(retPortletState).toEqual(ts);
+ expect(retRenderState).toEqual(ts);
});
});
@@ -460,39 +460,39 @@ describe('The portlet hub provides the ability to add and remove event listeners
expect(retType).toEqual("portlet.onStateChange");
});
- it('is passed a PortletState parameter that is an object',function(){
- expect(typeof retPortletState).toEqual('object');
+ it('is passed a RenderState parameter that is an object',function(){
+ expect(typeof retRenderState).toEqual('object');
});
- it('is passed a PortletState parameter that has 4 properties',function(){
+ it('is passed a RenderState parameter that has 4 properties',function(){
var cnt = 0;
- for (var prop in retPortletState) {
- if (retPortletState.hasOwnProperty(prop)) {
+ for (var prop in retRenderState) {
+ if (retRenderState.hasOwnProperty(prop)) {
cnt = cnt + 1;
}
}
expect(cnt).toEqual(4);
});
- it('is passed a PortletState object with a "parameters" property',function(){
- expect(typeof retPortletState.parameters).not.toEqual('undefined');
+ it('is passed a RenderState object with a "parameters" property',function(){
+ expect(typeof retRenderState.parameters).not.toEqual('undefined');
});
- it('is passed a PortletState object with a "portletMode" property',function(){
- expect(typeof retPortletState.portletMode).not.toEqual('undefined');
+ it('is passed a RenderState object with a "portletMode" property',function(){
+ expect(typeof retRenderState.portletMode).not.toEqual('undefined');
});
- it('is passed a PortletState object with a "windowState" property',function(){
- expect(typeof retPortletState.windowState).not.toEqual('undefined');
+ it('is passed a RenderState object with a "windowState" property',function(){
+ expect(typeof retRenderState.windowState).not.toEqual('undefined');
});
- it('its PortletState parameter is not identical to the test state object"',function(){
- expect(retPortletState).not.toBe(pageState[portletB].state);
+ it('its RenderState parameter is not identical to the test state object"',function(){
+ expect(retRenderState).not.toBe(pageState[portletB].state);
});
- it('its PortletState parameter equals the test state object"',function(){
+ it('its RenderState parameter equals the test state object"',function(){
var ts = hubA.newState(pageState[portletB].state);
- expect(retPortletState).toEqual(ts);
+ expect(retRenderState).toEqual(ts);
});
// portlet B is set up to have render data
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/portlet-api/src/test/javascript/CreateResourceUrlTest.js
----------------------------------------------------------------------
diff --git a/portlet-api/src/test/javascript/CreateResourceUrlTest.js b/portlet-api/src/test/javascript/CreateResourceUrlTest.js
index 28f81a4..d11d50c 100644
--- a/portlet-api/src/test/javascript/CreateResourceUrlTest.js
+++ b/portlet-api/src/test/javascript/CreateResourceUrlTest.js
@@ -501,7 +501,7 @@ describe('The portlet hub allows the portlet client to create a resource URL.',f
}
});
- it('returns a URL with the portlet state set when cacheability = cacheLevelPage',function(){
+ it('returns a URL with the render state set when cacheability = cacheLevelPage',function(){
var parms = {rp1 : ["resVal"], rp2 : ["resVal2"]}, cache="cacheLevelPage", url, str;
var testFunc = function () {
return hubB.createResourceUrl(parms, cache);
@@ -517,7 +517,7 @@ describe('The portlet hub allows the portlet client to create a resource URL.',f
});
});
- it('returns a URL with the portlet state set when cacheability = cacheLevelPortlet',function(){
+ it('returns a URL with the render state set when cacheability = cacheLevelPortlet',function(){
var parms = {rp1 : ["resVal"], rp2 : ["resVal2"]}, cache="cacheLevelPortlet", url, str;
var testFunc = function () {
return hubB.createResourceUrl(parms, cache);
@@ -533,7 +533,7 @@ describe('The portlet hub allows the portlet client to create a resource URL.',f
});
});
- it('returns a URL with no portlet state set when cacheability = cacheLevelFull',function(){
+ it('returns a URL with no render state set when cacheability = cacheLevelFull',function(){
var parms = {rp1 : ["resVal"], rp2 : ["resVal2"]}, cache="cacheLevelFull", url, str, state;
var testFunc = function () {
return hubB.createResourceUrl(parms, cache);
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/portlet-api/src/test/javascript/IsInProgressTest.js
----------------------------------------------------------------------
diff --git a/portlet-api/src/test/javascript/IsInProgressTest.js b/portlet-api/src/test/javascript/IsInProgressTest.js
index a8b4769..591890d 100644
--- a/portlet-api/src/test/javascript/IsInProgressTest.js
+++ b/portlet-api/src/test/javascript/IsInProgressTest.js
@@ -396,13 +396,13 @@ describe('The portlet hub allows the portlet client test for a blocking operatio
});
});
- it('returns true when setPortletState has been called but the updates have not been dispatched',function(){
+ it('returns true when setRenderState has been called but the updates have not been dispatched',function(){
var parms = {ap1 : ["actionVal"]};
runs(function() {
var state = cbC.getState();
state.parameters["someparm1"] = ["NewVal"];
var testFunc = function () {
- hubC.setPortletState(state);
+ hubC.setRenderState(state);
}
expect(testFunc).not.toThrow();
});
@@ -414,13 +414,13 @@ describe('The portlet hub allows the portlet client test for a blocking operatio
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
});
- it('returns true through a different hub when setPortletState has been called but the updates have not been dispatched',function(){
+ it('returns true through a different hub when setRenderState has been called but the updates have not been dispatched',function(){
var parms = {ap1 : ["actionVal"]};
runs(function() {
var state = cbC.getState();
state.parameters["someparm1"] = ["NewVal"];
var testFunc = function () {
- hubC.setPortletState(state);
+ hubC.setRenderState(state);
}
expect(testFunc).not.toThrow();
});
@@ -432,13 +432,13 @@ describe('The portlet hub allows the portlet client test for a blocking operatio
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
});
- it('returns false after setPortletState updates have been dispatched',function(){
+ it('returns false after setRenderState updates have been dispatched',function(){
var parms = {ap1 : ["actionVal"]};
runs(function() {
var state = cbC.getState();
state.parameters["someparm1"] = ["NewVal"];
var testFunc = function () {
- hubC.setPortletState(state);
+ hubC.setRenderState(state);
}
expect(testFunc).not.toThrow();
});
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/portlet-api/src/test/javascript/JasminePortletUtils.js
----------------------------------------------------------------------
diff --git a/portlet-api/src/test/javascript/JasminePortletUtils.js b/portlet-api/src/test/javascript/JasminePortletUtils.js
index 1017b91..999d661 100644
--- a/portlet-api/src/test/javascript/JasminePortletUtils.js
+++ b/portlet-api/src/test/javascript/JasminePortletUtils.js
@@ -39,7 +39,7 @@ var portlet = portlet || {};
this.retType = null;
this.retErrorData = null;
- this.retPortletState = null;
+ this.retRenderState = null;
this.retRenderData = null;
this.retPayload = null;
},
@@ -70,8 +70,8 @@ var portlet = portlet || {};
// Meant to be called after the listener has been added
// & the callback has added the state
getState : function () {
- if (this.retPortletState !== null) {
- return this.cloneState(this.retPortletState);
+ if (this.retRenderState !== null) {
+ return this.cloneState(this.retRenderState);
} else {
return this.cloneState(this.pageState[this.portletId]);
}
@@ -94,10 +94,10 @@ var portlet = portlet || {};
},
// onStateChange handler
- onStateChange : function (type, portletState, renderData) {
+ onStateChange : function (type, RenderState, renderData) {
this.complete = true;
this.retType = type;
- this.retPortletState = portletState;
+ this.retRenderState = RenderState;
this.retRenderData = renderData;
return;
},
@@ -115,8 +115,8 @@ var portlet = portlet || {};
};
}
}
- return function(type, portletState, renderData) {
- that.onStateChange(type, portletState, renderData);
+ return function(type, RenderState, renderData) {
+ that.onStateChange(type, RenderState, renderData);
};
},
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/portlet-api/src/test/javascript/PartialActionTest.js
----------------------------------------------------------------------
diff --git a/portlet-api/src/test/javascript/PartialActionTest.js b/portlet-api/src/test/javascript/PartialActionTest.js
index 679e307..ffcf3e2 100644
--- a/portlet-api/src/test/javascript/PartialActionTest.js
+++ b/portlet-api/src/test/javascript/PartialActionTest.js
@@ -271,7 +271,7 @@ describe('The portlet hub allows the portlet client to initiate a partial action
runs(function() {
var states = portlet.test.decodeUpdateString(ustr, portletA),
stateA = hubA.newState(states[portletA]);
- expect(cbA.retPortletState).toEqual(stateA);
+ expect(cbA.retRenderState).toEqual(stateA);
});
});
@@ -378,7 +378,7 @@ describe('The portlet hub allows the portlet client to initiate a partial action
str = portlet.test.data.updateStrings[portletA];
states = portlet.test.decodeUpdateString(str, portletA);
stateA = hubA.newState(states[portletA]);
- expect(cbA.retPortletState).toEqual(stateA);
+ expect(cbA.retRenderState).toEqual(stateA);
});
});
@@ -541,7 +541,7 @@ describe('The portlet hub allows the portlet client to initiate a partial action
});
});
- it('allows a resource URL to be created containing the portlet state',function(){
+ it('allows a resource URL to be created containing the render state',function(){
var parms = {ap1 : ["actionVal"], ap2 : ["actionVal2"]},
cache="cacheLevelPage", url = null, str;
runs(function() {
@@ -633,9 +633,9 @@ describe('The portlet hub allows the portlet client to initiate a partial action
runs(function() {
states = portlet.test.decodeUpdateString(ustr, portletB);
state = hubA.newState(states[portletB]);
- expect(cbB.retPortletState).toEqual(state);
+ expect(cbB.retRenderState).toEqual(state);
state = hubC.newState(states[portletC]);
- expect(cbC.retPortletState).toEqual(state);
+ expect(cbC.retRenderState).toEqual(state);
expect(cbA.isComplete()).toBeFalsy();
expect(cbD.isComplete()).toBeFalsy();
});
@@ -663,16 +663,16 @@ describe('The portlet hub allows the portlet client to initiate a partial action
states = portlet.test.decodeUpdateString(ustr, portletC);
state = hubA.newState(states[portletA]);
- expect(cbA.retPortletState).toEqual(state);
+ expect(cbA.retRenderState).toEqual(state);
state = hubB.newState(states[portletB]);
- expect(cbB.retPortletState).toEqual(state);
+ expect(cbB.retRenderState).toEqual(state);
state = hubC.newState(states[portletC]);
- expect(cbC.retPortletState).toEqual(state);
+ expect(cbC.retRenderState).toEqual(state);
state = hubD.newState(states[portletD]);
- expect(cbD.retPortletState).toEqual(state);
+ expect(cbD.retRenderState).toEqual(state);
});
});
@@ -724,7 +724,7 @@ describe('The portlet hub allows the portlet client to initiate a partial action
waitsFor(cbA.getIsComplete(), "The onStateChange callback should be called", 100);
});
- it('Blocks the setPortletState method for a different portlet until setPageState is called',function(){
+ it('Blocks the setRenderState method for a different portlet until setPageState is called',function(){
var parms = {ap1 : ["actionVal"]};
var ustr = portlet.test.data.updateStrings[portletA];
runs(function() {
@@ -738,7 +738,7 @@ describe('The portlet hub allows the portlet client to initiate a partial action
var state = cbC.getState();
state.parameters["someparm1"] = ["NewVal"];
var testFunc = function () {
- hubC.setPortletState(state);
+ hubC.setRenderState(state);
}
expect(testFunc).toThrowCustomException("AccessDeniedException");
});
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/portlet-api/src/test/javascript/SetPortletStateTest.js
----------------------------------------------------------------------
diff --git a/portlet-api/src/test/javascript/SetPortletStateTest.js b/portlet-api/src/test/javascript/SetPortletStateTest.js
index 0b72134..fa0947d 100644
--- a/portlet-api/src/test/javascript/SetPortletStateTest.js
+++ b/portlet-api/src/test/javascript/SetPortletStateTest.js
@@ -126,7 +126,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
});
- describe('The portlet hub setPortletState function: ',function(){
+ describe('The portlet hub setRenderState function: ',function(){
// The tests in this section use just a single portlet - portletA
var cbA = new portlet.jasmine.JasminePortletUtils(portletA, pageState);
@@ -152,33 +152,33 @@ describe('The portlet hub allows the portlet client to set its state.',function(
});
it('is present in the register return object and is a function',function(){
- expect(typeof hubA.setPortletState).toEqual('function');
+ expect(typeof hubA.setRenderState).toEqual('function');
});
it('throws an IllegalArgumentException if no argument is provided',function(){
var testFunc = function () {
- hubA.setPortletState();
+ hubA.setRenderState();
}
expect(testFunc).toThrowCustomException("IllegalArgumentException");
});
it('throws an IllegalArgumentException if too many (>1) arguments are provided',function(){
var testFunc = function () {
- hubA.setPortletState("parm1", "parm2");
+ hubA.setRenderState("parm1", "parm2");
}
expect(testFunc).toThrowCustomException("IllegalArgumentException");
});
it('throws an IllegalArgumentException if the argument is not an object',function(){
var testFunc = function () {
- hubA.setPortletState(89);
+ hubA.setRenderState(89);
}
expect(testFunc).toThrowCustomException("IllegalArgumentException");
});
it('throws an IllegalArgumentException if the argument is null',function(){
var testFunc = function () {
- hubA.setPortletState(null);
+ hubA.setRenderState(null);
}
expect(testFunc).toThrowCustomException("IllegalArgumentException");
});
@@ -189,7 +189,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
windowState : "NORMAL",
};
var testFunc = function () {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
}
expect(testFunc).toThrowCustomException("IllegalArgumentException");
});
@@ -200,7 +200,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
portletMode : "VIEW",
};
var testFunc = function () {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
}
expect(testFunc).toThrowCustomException("IllegalArgumentException");
});
@@ -211,16 +211,16 @@ describe('The portlet hub allows the portlet client to set its state.',function(
windowState : "NORMAL",
};
var testFunc = function () {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
}
expect(testFunc).toThrowCustomException("IllegalArgumentException");
});
- it('throws an AccessDeniedException if setPortletState is called twice',function(){
+ it('throws an AccessDeniedException if setRenderState is called twice',function(){
var state = cbA.getState();
var testFunc = function () {
- hubA.setPortletState(state);
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
+ hubA.setRenderState(state);
}
expect(testFunc).toThrowCustomException("AccessDeniedException");
});
@@ -228,7 +228,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
it('throws an NotInitializedException if no onStateChange listener is registered',function(){
var state = cbA.getState();
var testFunc = function () {
- hubB.setPortletState(state);
+ hubB.setRenderState(state);
}
expect(testFunc).toThrowCustomException("NotInitializedException");
});
@@ -237,7 +237,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbA.getState();
state.windowState = "ABNORMAL";
var testFunc = function () {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
}
expect(testFunc).toThrowCustomException("IllegalArgumentException");
});
@@ -246,7 +246,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbA.getState();
state.portletMode = "ABNORMAL";
var testFunc = function () {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
}
expect(testFunc).toThrowCustomException("IllegalArgumentException");
});
@@ -256,7 +256,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var testFunc = function () {
hubA.removeEventListener(cbA.oscHandle);
cbA.oscHandle = null;
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
}
expect(testFunc).toThrowCustomException("NotInitializedException");
});
@@ -265,7 +265,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = pageState[portletA].state;
runs(function() {
var testFunc = function () {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
}
expect(testFunc).not.toThrow();
});
@@ -275,7 +275,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
it('causes the onStateChange listener to be called',function(){
var state = pageState[portletA].state;
runs(function() {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
});
waitsFor(cbA.getIsComplete(), "The onStateChange callback should be called", 100);
});
@@ -284,11 +284,11 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbA.getState();
state.portletMode = "EDIT";
runs(function() {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
});
waitsFor(cbA.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbA.retPortletState.portletMode).toEqual("EDIT");
+ expect(cbA.retRenderState.portletMode).toEqual("EDIT");
});
});
@@ -296,11 +296,11 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbA.getState();
state.portletMode = "VIEW";
runs(function() {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
});
waitsFor(cbA.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbA.retPortletState.portletMode).toEqual("VIEW");
+ expect(cbA.retRenderState.portletMode).toEqual("VIEW");
});
});
@@ -308,11 +308,11 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbA.getState();
state.windowState = "MAXIMIZED";
runs(function() {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
});
waitsFor(cbA.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbA.retPortletState.windowState).toEqual("MAXIMIZED");
+ expect(cbA.retRenderState.windowState).toEqual("MAXIMIZED");
});
});
@@ -320,11 +320,11 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbA.getState();
state.windowState = "NORMAL";
runs(function() {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
});
waitsFor(cbA.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbA.retPortletState.windowState).toEqual("NORMAL");
+ expect(cbA.retRenderState.windowState).toEqual("NORMAL");
});
});
@@ -332,11 +332,11 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbA.getState();
state.parameters["NewParm"] = ["NewVal"];
runs(function() {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
});
waitsFor(cbA.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbA.retPortletState.parameters["NewParm"]).toEqual(["NewVal"]);
+ expect(cbA.retRenderState.parameters["NewParm"]).toEqual(["NewVal"]);
});
});
@@ -345,11 +345,11 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var val = ["NewVal1", "NewVal2"];
state.parameters["NewParm"] = val;
runs(function() {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
});
waitsFor(cbA.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbA.retPortletState.parameters["NewParm"]).toEqual(val);
+ expect(cbA.retRenderState.parameters["NewParm"]).toEqual(val);
});
});
@@ -357,11 +357,11 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbA.getState();
delete state.parameters["NewParm"];
runs(function() {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
});
waitsFor(cbA.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbA.retPortletState.parameters["NewParm"]).not.toEqual(["NewVal"]);
+ expect(cbA.retRenderState.parameters["NewParm"]).not.toEqual(["NewVal"]);
});
});
@@ -369,12 +369,12 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbA.getState();
state.parameters = {};
runs(function() {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
});
waitsFor(cbA.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
// count the parameters
- var cnt = 0, parms = cbA.retPortletState.parameters;
+ var cnt = 0, parms = cbA.retRenderState.parameters;
for (var parm in parms) {
if (parms.hasOwnProperty(parm)) {
cnt++;
@@ -393,22 +393,22 @@ describe('The portlet hub allows the portlet client to set its state.',function(
};
state.parameters = newParms;
runs(function() {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
});
waitsFor(cbA.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbA.retPortletState.parameters).toEqual(hubA.newParameters(newParms));
+ expect(cbA.retRenderState.parameters).toEqual(hubA.newParameters(newParms));
});
});
it('allows setting the state back to the original test data',function(){
var state = cbA.getState();
runs(function() {
- hubA.setPortletState(state);
+ hubA.setRenderState(state);
});
waitsFor(cbA.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbA.retPortletState).toEqual(hubA.newState(state));
+ expect(cbA.retRenderState).toEqual(hubA.newState(state));
});
});
@@ -416,7 +416,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
- describe('The portlet hub setPortletState function handles public render parameters: ',function(){
+ describe('The portlet hub setRenderState function handles public render parameters: ',function(){
// The tests in this section use three portlets that have public render parameters defined
var cbB = new portlet.jasmine.JasminePortletUtils(portletB, pageState);
@@ -459,14 +459,14 @@ describe('The portlet hub allows the portlet client to set its state.',function(
}
});
- it('throws an AccessDeniedException if called before previous set portlet state completes',function(){
+ it('throws an AccessDeniedException if called before previous set render state completes',function(){
var parms = {rp1 : ["resVal"]};
var el = document.createElement("form");
runs(function() {
var state = cbB.getState();
state.parameters["pubparm1"] = ["NewVal"];
var testFunc = function () {
- hubB.setPortletState(state);
+ hubB.setRenderState(state);
}
expect(testFunc).not.toThrow();
});
@@ -474,7 +474,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbC.getState();
state.parameters["someparm1"] = ["NewVal"];
var testFunc = function () {
- hubC.setPortletState(state);
+ hubC.setRenderState(state);
}
expect(testFunc).toThrowCustomException("AccessDeniedException");
});
@@ -485,11 +485,11 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbB.getState();
state.parameters["pubparm1"] = ["NewVal"];
runs(function() {
- hubB.setPortletState(state);
+ hubB.setRenderState(state);
});
waitsFor(cbB.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbB.retPortletState.parameters["pubparm1"]).toEqual(["NewVal"]);
+ expect(cbB.retRenderState.parameters["pubparm1"]).toEqual(["NewVal"]);
});
});
@@ -497,11 +497,11 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbB.getState();
state.parameters["pubparm1"] = ["NewVal2"];
runs(function() {
- hubB.setPortletState(state);
+ hubB.setRenderState(state);
});
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbC.retPortletState.parameters["pubparm1"]).toEqual(["NewVal2"]);
+ expect(cbC.retRenderState.parameters["pubparm1"]).toEqual(["NewVal2"]);
});
});
@@ -509,7 +509,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbB.getState();
state.parameters["pubparm1"] = ["NewVal"];
runs(function() {
- hubB.setPortletState(state);
+ hubB.setRenderState(state);
});
waitsFor(cbB.getIsComplete(), "The onStateChange callback should be called", 100);
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
@@ -522,7 +522,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbC.getState();
state.parameters["pubparm1"] = ["newVal4"];
runs(function() {
- hubC.setPortletState(state);
+ hubC.setRenderState(state);
});
waitsFor(cbB.getIsComplete(), "The onStateChange callback should be called", 100);
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
@@ -535,13 +535,13 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbD.getState();
state.parameters["pubparm1"] = ["NewVal5"];
runs(function() {
- hubD.setPortletState(state);
+ hubD.setRenderState(state);
});
waitsFor(cbD.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
expect(cbB.isComplete()).toBeFalsy();
expect(cbC.isComplete()).toBeFalsy();
- expect(cbD.retPortletState.parameters["pubparm1"]).toEqual(["NewVal5"]);
+ expect(cbD.retRenderState.parameters["pubparm1"]).toEqual(["NewVal5"]);
});
});
@@ -550,18 +550,18 @@ describe('The portlet hub allows the portlet client to set its state.',function(
prp1 = state.parameters.pubparm1 = ["NewVal5", "NewVal6"];
prp2 = state.parameters.pubparm2 = ["NewVal7", "NewVal8"];
runs(function() {
- hubC.setPortletState(state);
+ hubC.setRenderState(state);
});
waitsFor(cbB.getIsComplete(), "The onStateChange callback should be called", 100);
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
waitsFor(cbD.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbB.retPortletState.parameters["pubparm1"]).toEqual(prp1);
- expect(cbC.retPortletState.parameters["pubparm1"]).toEqual(prp1);
- expect(cbC.retPortletState.parameters["pubparm2"]).toEqual(prp2);
- expect(cbD.retPortletState.parameters["pubparm2"]).toEqual(prp2);
+ expect(cbB.retRenderState.parameters["pubparm1"]).toEqual(prp1);
+ expect(cbC.retRenderState.parameters["pubparm1"]).toEqual(prp1);
+ expect(cbC.retRenderState.parameters["pubparm2"]).toEqual(prp2);
+ expect(cbD.retRenderState.parameters["pubparm2"]).toEqual(prp2);
// pubparm1 is private parm for portletD
- expect(cbD.retPortletState.parameters["pubparm1"]).not.toEqual(prp1);
+ expect(cbD.retRenderState.parameters["pubparm1"]).not.toEqual(prp1);
});
});
@@ -569,13 +569,13 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbB.getState();
delete state.parameters["pubparm1"];
runs(function() {
- hubB.setPortletState(state);
+ hubB.setRenderState(state);
});
waitsFor(cbB.getIsComplete(), "The onStateChange callback should be called", 100);
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbB.retPortletState.parameters["pubparm1"]).toBeUndefined();
- expect(cbC.retPortletState.parameters["pubparm1"]).toBeUndefined();
+ expect(cbB.retRenderState.parameters["pubparm1"]).toBeUndefined();
+ expect(cbC.retRenderState.parameters["pubparm1"]).toBeUndefined();
});
});
@@ -583,13 +583,13 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbB.getState();
state.parameters["pubparm1"] = ["NewVal2", "NewVal3"];
runs(function() {
- hubB.setPortletState(state);
+ hubB.setRenderState(state);
});
waitsFor(cbB.getIsComplete(), "The onStateChange callback should be called", 100);
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbB.retPortletState.parameters["pubparm1"]).toEqual(["NewVal2", "NewVal3"]);
- expect(cbC.retPortletState.parameters["pubparm1"]).toEqual(["NewVal2", "NewVal3"]);
+ expect(cbB.retRenderState.parameters["pubparm1"]).toEqual(["NewVal2", "NewVal3"]);
+ expect(cbC.retRenderState.parameters["pubparm1"]).toEqual(["NewVal2", "NewVal3"]);
expect(cbD.isComplete()).toBeFalsy();
});
});
@@ -598,7 +598,7 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbB.getState();
delete state.parameters["pubparm1"];
runs(function() {
- hubB.setPortletState(state);
+ hubB.setRenderState(state);
});
waitsFor(cbB.getIsComplete(), "The onStateChange callback should be called", 100);
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
@@ -612,16 +612,16 @@ describe('The portlet hub allows the portlet client to set its state.',function(
prp1 = ["NewVal10", "NewVal11"];
state.parameters["pubparm1"] = prp1;
runs(function() {
- hubC.setPortletState(state);
+ hubC.setRenderState(state);
});
waitsFor(cbB.getIsComplete(), "The onStateChange callback should be called", 100);
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbB.retPortletState.parameters["pubparm1"]).toEqual(prp1);
- expect(cbC.retPortletState.parameters["pubparm1"]).toEqual(prp1);
+ expect(cbB.retRenderState.parameters["pubparm1"]).toEqual(prp1);
+ expect(cbC.retRenderState.parameters["pubparm1"]).toEqual(prp1);
// pubparm1 is private parameter for portlet D
expect(cbD.isComplete()).toBeFalsy();
- expect(cbD.retPortletState.parameters["pubparm1"]).not.toEqual(prp1);
+ expect(cbD.retRenderState.parameters["pubparm1"]).not.toEqual(prp1);
});
});
@@ -629,17 +629,17 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var state = cbC.getState();
state.parameters = {};
runs(function() {
- hubC.setPortletState(state);
+ hubC.setRenderState(state);
});
waitsFor(cbB.getIsComplete(), "The onStateChange callback should be called", 100);
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
waitsFor(cbD.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbB.retPortletState.parameters["pubparm1"]).toBeUndefined();
- expect(cbC.retPortletState.parameters["pubparm1"]).toBeUndefined();
- expect(cbC.retPortletState.parameters["pubparm2"]).toBeUndefined();
- expect(cbD.retPortletState.parameters["pubparm2"]).toBeUndefined();
- expect(cbD.retPortletState.parameters["pubparm1"]).toBeDefined();
+ expect(cbB.retRenderState.parameters["pubparm1"]).toBeUndefined();
+ expect(cbC.retRenderState.parameters["pubparm1"]).toBeUndefined();
+ expect(cbC.retRenderState.parameters["pubparm2"]).toBeUndefined();
+ expect(cbD.retRenderState.parameters["pubparm2"]).toBeUndefined();
+ expect(cbD.retRenderState.parameters["pubparm1"]).toBeDefined();
});
});
@@ -648,17 +648,17 @@ describe('The portlet hub allows the portlet client to set its state.',function(
var prp1 = state.parameters.pubparm1;
var prp2 = state.parameters.pubparm2;
runs(function() {
- hubC.setPortletState(state);
+ hubC.setRenderState(state);
});
waitsFor(cbB.getIsComplete(), "The onStateChange callback should be called", 100);
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
waitsFor(cbD.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbB.retPortletState.parameters["pubparm1"]).toEqual(prp1);
- expect(cbC.retPortletState.parameters["pubparm1"]).toEqual(prp1);
- expect(cbC.retPortletState.parameters["pubparm2"]).toEqual(prp2);
- expect(cbD.retPortletState.parameters["pubparm2"]).toEqual(prp2);
- expect(cbD.retPortletState.parameters["pubparm1"]).not.toEqual(prp1);
+ expect(cbB.retRenderState.parameters["pubparm1"]).toEqual(prp1);
+ expect(cbC.retRenderState.parameters["pubparm1"]).toEqual(prp1);
+ expect(cbC.retRenderState.parameters["pubparm2"]).toEqual(prp2);
+ expect(cbD.retRenderState.parameters["pubparm2"]).toEqual(prp2);
+ expect(cbD.retRenderState.parameters["pubparm1"]).not.toEqual(prp1);
});
});
@@ -670,25 +670,25 @@ describe('The portlet hub allows the portlet client to set its state.',function(
prp2 = stateC.parameters.pubparm2;
runs(function() {
- hubB.setPortletState(stateB);
+ hubB.setRenderState(stateB);
});
waitsFor(cbB.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- hubC.setPortletState(stateC);
+ hubC.setRenderState(stateC);
});
waitsFor(cbC.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- hubD.setPortletState(stateD);
+ hubD.setRenderState(stateD);
});
waitsFor(cbD.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
- expect(cbB.retPortletState.parameters["pubparm1"]).toEqual(prp1);
- expect(cbC.retPortletState.parameters["pubparm1"]).toEqual(prp1);
- expect(cbC.retPortletState.parameters["pubparm2"]).toEqual(prp2);
- expect(cbD.retPortletState.parameters["pubparm2"]).toEqual(prp2);
+ expect(cbB.retRenderState.parameters["pubparm1"]).toEqual(prp1);
+ expect(cbC.retRenderState.parameters["pubparm1"]).toEqual(prp1);
+ expect(cbC.retRenderState.parameters["pubparm2"]).toEqual(prp2);
+ expect(cbD.retRenderState.parameters["pubparm2"]).toEqual(prp2);
});
});
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/portlet-api/src/test/javascript/SimulatedErrorTests.js
----------------------------------------------------------------------
diff --git a/portlet-api/src/test/javascript/SimulatedErrorTests.js b/portlet-api/src/test/javascript/SimulatedErrorTests.js
index c61010e..e34a6b4 100644
--- a/portlet-api/src/test/javascript/SimulatedErrorTests.js
+++ b/portlet-api/src/test/javascript/SimulatedErrorTests.js
@@ -263,14 +263,14 @@ describe('If the PortletHub mock implementation is present, simulated error cond
var state = cbErr.getState();
state.parameters["NewParm"] = ["NewVal"];
runs(function() {
- hubErr.setPortletState(state);
+ hubErr.setRenderState(state);
});
waitsFor(cbErr.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
expect(cbErr.retType).not.toEqual('portlet.onError');
- expect(cbErr.retPortletState).not.toEqual(null);
+ expect(cbErr.retRenderState).not.toEqual(null);
expect(cbErr.retErrorData).toEqual(null);
- expect(cbErr.retPortletState.parameters["NewParm"]).toEqual(["NewVal"]);
+ expect(cbErr.retRenderState.parameters["NewParm"]).toEqual(["NewVal"]);
});
});
@@ -278,7 +278,7 @@ describe('If the PortletHub mock implementation is present, simulated error cond
var state = cbErr.getState();
state.parameters["SimulateError"] = ["reject"];
runs(function() {
- hubErr.setPortletState(state);
+ hubErr.setRenderState(state);
});
waitsFor(cbErr.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
@@ -295,7 +295,7 @@ describe('If the PortletHub mock implementation is present, simulated error cond
waitsFor(cbErr.getIsComplete(), "The onStateChange callback should be called", 100);
runs(function() {
expect(cbErr.retType).not.toEqual('portlet.onError');
- expect(cbErr.retPortletState).not.toEqual(null);
+ expect(cbErr.retRenderState).not.toEqual(null);
expect(cbErr.retErrorData).toEqual(null);
});
});
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/5a59b412/portlet-api/src/test/javascript/StateTests.js
----------------------------------------------------------------------
diff --git a/portlet-api/src/test/javascript/StateTests.js b/portlet-api/src/test/javascript/StateTests.js
index aa1db43..7e99ee8 100644
--- a/portlet-api/src/test/javascript/StateTests.js
+++ b/portlet-api/src/test/javascript/StateTests.js
@@ -26,7 +26,7 @@
*/
-describe('The Portlet Hub provides accessor functions for the portlet state and parameters.',function(){
+describe('The Portlet Hub provides accessor functions for the render state and parameters.',function(){
'use strict'
// get the portlet IDs provided by the system under test. The function must