May 2015 - Sandbox-commits - mailman.cloud.codelutin.com

r1384 - oipf/js/test
by ygrego＠users.nuiton.org 19 May '15

19 May '15

Author: ygrego Date: 2015-05-19 08:55:19 +0000 (Tue, 19 May 2015) New Revision: 1384 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1384 Log: Addition of methods "testSetBlockUnratedWithValidPINAndTrue" and "testSetBlockUnratedWithValidPINAndFalse". Modified: oipf/js/test/ParentalControlManagerTest.js Modified: oipf/js/test/ParentalControlManagerTest.js =================================================================== --- oipf/js/test/ParentalControlManagerTest.js 2015-05-19 08:53:23 UTC (rev 1383) +++ oipf/js/test/ParentalControlManagerTest.js 2015-05-19 08:55:19 UTC (rev 1384) @@ -11,6 +11,7 @@ this.PIN_CORRECT = 0; this.PIN_INCORRECT = 1; this.PIN_LOCKED = 2; + this.PIN = "1234"; }, beforeTest: function() { @@ -64,7 +65,33 @@ reject(); } }, + + testSetBlockUnratedWithValidPINAndTrue: function(resolve, reject) { + var result = this.parentalControlManagerObject + .setBlockUnrated(this.PIN, true); + + console.log(result); + + if (this.assertEquals(result, 0)) { + resolve(); + } else { + reject(); + } + }, + testSetBlockUnratedWithValidPINAndFalse: function(resolve, reject) { + var result = this.parentalControlManagerObject + .setBlockUnrated(this.PIN, false); + + console.log(result); + + if (this.assertEquals(result, 0)) { + resolve(); + } else { + reject(); + } + }, + testGetBlockUnratedWhenUnratedContentsAreBlocked: function(resolve, reject) { this.parentalControlManagerObject.setBlockUnrated("1234", true);

1 0

r1383 - oipf/js/test
by ygrego＠users.nuiton.org 19 May '15

19 May '15

Author: ygrego Date: 2015-05-19 08:53:23 +0000 (Tue, 19 May 2015) New Revision: 1383 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1383 Log: Rename previous test "testSetBlockUnratedWithValidPINAndfalse" with "testSetBlockUnratedWithValidPINAndFalse" in section "ParentalControlManager". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-05-19 08:48:58 UTC (rev 1382) +++ oipf/js/test/Test.js 2015-05-19 08:53:23 UTC (rev 1383) @@ -759,7 +759,7 @@ }, { label: "Call method 'setBlockUnrated' with a valid pin and value 'false' to don't blocked unrated contents.", - method: "testSetBlockUnratedWithValidPINAndfalse" + method: "testSetBlockUnratedWithValidPINAndFalse" } ] }],

1 0

r1382 - oipf/js/test
by ygrego＠users.nuiton.org 19 May '15

19 May '15

Author: ygrego Date: 2015-05-19 08:48:58 +0000 (Tue, 19 May 2015) New Revision: 1382 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1382 Log: Addition of test "testSetBlockUnratedWithValidPINAndfalse" in section "ParentalControlManager". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-05-19 08:38:24 UTC (rev 1381) +++ oipf/js/test/Test.js 2015-05-19 08:48:58 UTC (rev 1382) @@ -756,6 +756,10 @@ { label: "Call method 'setBlockUnrated' with a valid pin and value 'true' to blocked unrated contents.", method: "testSetBlockUnratedWithValidPINAndTrue" + }, + { + label: "Call method 'setBlockUnrated' with a valid pin and value 'false' to don't blocked unrated contents.", + method: "testSetBlockUnratedWithValidPINAndfalse" } ] }],

1 0

r1381 - oipf/js/test
by ygrego＠users.nuiton.org 19 May '15

19 May '15

Author: ygrego Date: 2015-05-19 08:38:24 +0000 (Tue, 19 May 2015) New Revision: 1381 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1381 Log: Addition of test "testSetBlockUnratedWithValidPINAndTrue" in section "ParentalControlManager". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-05-18 16:00:46 UTC (rev 1380) +++ oipf/js/test/Test.js 2015-05-19 08:38:24 UTC (rev 1381) @@ -752,6 +752,10 @@ { label: "Call method 'getBlockUnrated' when contents have been blocked.", method: "testGetBlockUnratedWhenUnratedContentsAreBlocked" + }, + { + label: "Call method 'setBlockUnrated' with a valid pin and value 'true' to blocked unrated contents.", + method: "testSetBlockUnratedWithValidPINAndTrue" } ] }],

1 0

r1380 - oipf/js/test
by ygrego＠users.nuiton.org 18 May '15

18 May '15

Author: ygrego Date: 2015-05-18 16:00:46 +0000 (Mon, 18 May 2015) New Revision: 1380 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1380 Log: Addition of the method "testGetBlockUnratedWhenUnratedContentsAreBlocked". Modified: oipf/js/test/ParentalControlManagerTest.js Modified: oipf/js/test/ParentalControlManagerTest.js =================================================================== --- oipf/js/test/ParentalControlManagerTest.js 2015-05-18 15:56:57 UTC (rev 1379) +++ oipf/js/test/ParentalControlManagerTest.js 2015-05-18 16:00:46 UTC (rev 1380) @@ -65,8 +65,10 @@ } }, - testGetBlockUnrated: function(resolve, reject) { - if (!this.parentalControlManagerObject.getBlockUnrated()) { + testGetBlockUnratedWhenUnratedContentsAreBlocked: function(resolve, reject) { + this.parentalControlManagerObject.setBlockUnrated("1234", true); + + if (this.parentalControlManagerObject.getBlockUnrated()) { resolve(); } else { reject();

1 0

r1379 - oipf/js/test
by ygrego＠users.nuiton.org 18 May '15

18 May '15

Author: ygrego Date: 2015-05-18 15:56:57 +0000 (Mon, 18 May 2015) New Revision: 1379 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1379 Log: Modification of a method name in section "ParentalControlManager" of property "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-05-18 15:50:11 UTC (rev 1378) +++ oipf/js/test/Test.js 2015-05-18 15:56:57 UTC (rev 1379) @@ -750,8 +750,8 @@ method: "testSetBlockUnratedWithInvalidPIN10Times" }, { - label: "Call method 'getBlockUnrated'.", - method: "testGetBlockUnrated" + label: "Call method 'getBlockUnrated' when contents have been blocked.", + method: "testGetBlockUnratedWhenUnratedContentsAreBlocked" } ] }],

1 0

r1378 - oipf/js/impl
by ygrego＠users.nuiton.org 18 May '15

18 May '15

Author: ygrego Date: 2015-05-18 15:50:11 +0000 (Mon, 18 May 2015) New Revision: 1378 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1378 Log: Addition of method "unlockWithParentalControlPIN". Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 14:45:55 UTC (rev 1377) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 15:50:11 UTC (rev 1378) @@ -160,6 +160,45 @@ }, + /* + * Description: + * Unlock the object specified by target for viewing if pcPIN contains the + * correct parental control PIN. + * + * The object type of target can be one of the following: + * -video/broadcast object, in which case the content being + * presented through this object SHALL be unlocked until a new channel is + * selected. + * -A/V Control object, in which case the content being presented + * through this object. SHALL be unlocked until a new item of content is + * played using this object. + * + * Otherwise an Invalid Object error SHALL be returned. + * + * The return value indicates the success of the operation, and + * SHALL take the following values: + * + * ------------------------------------------------------------------------ + * Value | Description + * ------ ----------------------------------------------------------------- + * 0 | The PIN is correct. + * ------ ----------------------------------------------------------------- + * 1 | The PIN is incorrect. + * ------ ----------------------------------------------------------------- + * 2 | PIN entry is locked because an invalid PIN has been entered too + * | many times. The number of invalid PIN attempts before PIN entry + * | is locked is outside the scope of this specification. + * ------ ----------------------------------------------------------------- + * + * Arguments: + * - pcPIN: The parental control PIN. + * + * - target: The object to be unlocked. + */ + unlockWithParentalControlPIN: function(pcPIN, target) { + + }, + verifyParentalControlPIN: function(pcPIN) { if (this._currentPIN == pcPIN) { return this._PIN_CORRECT;

1 0

r1377 - oipf/js/impl
by ygrego＠users.nuiton.org 18 May '15

18 May '15

Author: ygrego Date: 2015-05-18 14:45:55 +0000 (Mon, 18 May 2015) New Revision: 1377 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1377 Log: Implementation of method "getParentalControlStatus" and modification of comment of method "getBlockUnrated". Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 14:34:52 UTC (rev 1376) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 14:45:55 UTC (rev 1377) @@ -220,11 +220,23 @@ /* * Description: - * Returns a flag indicating whether or not the OITF has been configured bythe user to block content for which a parental rating is absent. + * Returns a flag indicating whether or not the OITF has been configured by + * the user to block content for which a parental rating is absent. */ getBlockUnrated: function() { return this._blockUnrated; }, + + /* + * Description: + * Returns a flag indicating the temporary parental control status set by + * setParentalControlStatus() . Note that the returned status covers + * parental control functionality related to all rating schemes, not only + * the rating scheme upon which the method is called. + */ + getParentalControlStatus: function() { + return this._parentalControlStatus; + }, _lockPINEntry: function() { this.isPINEntryLocked = true;

1 0

r1376 - oipf/js/impl
by ygrego＠users.nuiton.org 18 May '15

18 May '15

Author: ygrego Date: 2015-05-18 14:34:52 +0000 (Mon, 18 May 2015) New Revision: 1376 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1376 Log: Modification of method "setParentalControlPIN" Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 14:25:36 UTC (rev 1375) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 14:34:52 UTC (rev 1376) @@ -144,23 +144,20 @@ * Return: Integer */ setParentalControlPIN: function(oldPcPIN, newPcPIN) { - if (this._currentInvalidPINAttempts < this._invalidPINAttemptsMax) { + + if (this._currentPIN == oldPcPIN) { + this._currentPIN = newPcPIN; + return this._PIN_CORRECT; + } + this._currentInvalidPINAttempts++; - if (this._currentPIN == oldPcPIN) { - - this._currentPIN = newPcPIN; - return this._PIN_CORRECT; - - } else { - - this._currentInvalidPINAttempts++; - return this._PIN_INCORRECT; - } + if (this._currentInvalidPINAttempts > this._invalidPINAttemptsMax) { + this._lockPINEntry(); + return this._PIN_LOCKED; } + + return this._PIN_INCORRECT; - this._lockPINEntry(); - - return this._PIN_LOCKED; }, verifyParentalControlPIN: function(pcPIN) {

1 0

r1375 - oipf/js/impl
by ygrego＠users.nuiton.org 18 May '15

18 May '15

Author: ygrego Date: 2015-05-18 14:25:36 +0000 (Mon, 18 May 2015) New Revision: 1375 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1375 Log: Addition of method "setParentalControlStatus" and property "_parentalControlStatus " which is initialized in constructor. Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 14:00:18 UTC (rev 1374) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 14:25:36 UTC (rev 1375) @@ -38,6 +38,13 @@ _blockUnrated:null, /* + * Represent a status indicating if a temporarily authorization for + * the comsumption of any blocked content have been set or not. + * + */ + _parentalControlStatus:null, + + /* * FIXME: * -Yannis 18/05/2015 The properties "_currentPIN" and "_invalidPINAttemps" * don't have to be innitialized here. @@ -48,6 +55,7 @@ this.isPINEntryLocked = false; this._blockUnrated = false; + this._parentalControlStatus = true; this._currentPIN = "1234"; this._invalidPINAttemptsMax = 4; @@ -60,6 +68,58 @@ }, /* + * As defined in [OIPF_CSP2], the OITF shall prevent the consumption of a + * programme when its parental rating doesn't meet the parental rating + * criterion currently defined in the OITF. Calling this method with enable + * set to false will temporarily allow the consumption of any blocked + * programme. Setting the parental control status using this method SHALL + * set the status until the consumption of any of all the blocked programmes + * terminates (e.g. until the content item being played is changed), + * or another call to the setParentalControlStatus() method is made. + * Setting the parental control status using this method has the following + * effect; for the Programme and Channel objects as defined in sections + * 7.16.2 and 7.13.11, the blocked property of a programme or channel SHALL + * be set to true for programmes whose parental rating does not meet the + * applicable parental rating criterion, but the locked property SHALL be + * set to false .This operation to temporarily disable parental rating + * control SHALL be protected by the parental control PIN (i.e. through the + * pcPIN argument). The return value indicates the success of the operation, + * and SHALL take one of the following values: + * ------------------------------------------------------------------------ + * Value | Description + * ------ ----------------------------------------------------------------- + * 0 | The PIN is correct. + * ------ ----------------------------------------------------------------- + * 1 | The PIN is incorrect. + * ------ ----------------------------------------------------------------- + * 2 | PIN entry is locked because an invalid PIN has been entered too + * | many times. The number of invalid PIN attempts before PIN entry + * | is locked is outside the scope of this specification. + * ------ ----------------------------------------------------------------- + * + * Arguments: + * - pcPIN: The parental control PIN. + * + * - enable: Flag indicating whether parental control should be enabled. + * + * Return: Integer + */ + setParentalControlStatus: function(pcPIN, enable) { + if (this._currentPIN == pcPIN) { + this._parentalControlStatus = enable; + return this._PIN_CORRECT; + } + this._currentInvalidPINAttempts++; + + if (this._currentInvalidPINAttempts > this._invalidPINAttemptsMax) { + this._lockPINEntry(); + return this._PIN_LOCKED; + } + + return this._PIN_INCORRECT; + }, + + /* * Description: * Set the parental control PIN. This operation SHALL be protected by the * parental control PIN (if PIN entry is enabled). The return value @@ -160,7 +220,7 @@ return this._PIN_INCORRECT; }, - + /* * Description: * Returns a flag indicating whether or not the OITF has been configured bythe user to block content for which a parental rating is absent.

1 0