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

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

18 May '15

Author: ygrego Date: 2015-05-18 14:00:18 +0000 (Mon, 18 May 2015) New Revision: 1374 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1374 Log: Addition of method "getBlockUnrated". Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 13:55:08 UTC (rev 1373) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 14:00:18 UTC (rev 1374) @@ -161,6 +161,13 @@ 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. + */ + getBlockUnrated: function() { + return this._blockUnrated; + }, _lockPINEntry: function() { this.isPINEntryLocked = true;

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 13:55:08 +0000 (Mon, 18 May 2015) New Revision: 1373 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1373 Log: Addition of property "_blockUnrated" and its initialization are done in constructor. Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 13:45:14 UTC (rev 1372) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 13:55:08 UTC (rev 1373) @@ -32,6 +32,12 @@ _PINLockedTime: null, /* + * Let to manage the locking of programmes and/or channels which are + * initially unrated. + */ + _blockUnrated:null, + + /* * FIXME: * -Yannis 18/05/2015 The properties "_currentPIN" and "_invalidPINAttemps" * don't have to be innitialized here. @@ -41,6 +47,7 @@ this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); this.isPINEntryLocked = false; + this._blockUnrated = false; this._currentPIN = "1234"; this._invalidPINAttemptsMax = 4;

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 13:45:14 +0000 (Mon, 18 May 2015) New Revision: 1372 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1372 Log: Addition of the method "setBlockUnrated". Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 13:33:41 UTC (rev 1371) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 13:45:14 UTC (rev 1372) @@ -111,6 +111,50 @@ }, + /* + * Description: + * Set whether programmes for which no parental rating has been retrieved + * from the metadata client nor defined by the service provider should be + * blocked automatically by the terminal. + * + * This operation SHALL be protected + * by the parental control PIN (if PIN entry is enabled).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. + * + * - block: Flag indicating whether programmes SHALL be blocked. + * + */ + setBlockUnrated: function(pcPIN, block) { + if (this._currentPIN == pcPIN) { + this._blockUnrated = block; + return this._PIN_CORRECT; + } + this._currentInvalidPINAttempts++; + + if (this._currentInvalidPINAttempts > this._invalidPINAttemptsMax) { + this._lockPINEntry(); + return this._PIN_LOCKED; + } + + return this._PIN_INCORRECT; + }, + + _lockPINEntry: function() { this.isPINEntryLocked = true;

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 13:33:41 +0000 (Mon, 18 May 2015) New Revision: 1371 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1371 Log: Addition of methods "testGetBlockUnrated" in section "ParentalControlManager". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-05-18 13:32:43 UTC (rev 1370) +++ oipf/js/test/Test.js 2015-05-18 13:33:41 UTC (rev 1371) @@ -748,6 +748,10 @@ { label: "Call method 'setBlockUnrated' with an invalid pin.", method: "testSetBlockUnratedWithInvalidPIN10Times" + }, + { + label: "Call method 'getBlockUnrated'.", + method: "testGetBlockUnrated" } ] }],

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 13:32:43 +0000 (Mon, 18 May 2015) New Revision: 1370 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1370 Log: Addition of methods "testSetBlockUnratedWithInvalidPIN10Times" and "testGetBlockUnrated". Modified: oipf/js/test/ParentalControlManagerTest.js Modified: oipf/js/test/ParentalControlManagerTest.js =================================================================== --- oipf/js/test/ParentalControlManagerTest.js 2015-05-18 13:31:27 UTC (rev 1369) +++ oipf/js/test/ParentalControlManagerTest.js 2015-05-18 13:32:43 UTC (rev 1370) @@ -48,6 +48,28 @@ } else { reject(); } + }, + + testSetBlockUnratedWithInvalidPIN10Times: function(resolve, reject) { + for(var i = 0, li = 10; i < li; i++) { + var result = this.parentalControlManagerObject + .setBlockUnrated("toto", true); + + console.log(i+1, ":", result); + } + + if (this.assertEquals(result, 2)) { + resolve(); + } else { + reject(); + } + }, + + testGetBlockUnrated: function(resolve, reject) { + if (!this.parentalControlManagerObject.getBlockUnrated()) { + resolve(); + } else { + reject(); + } } - }); \ No newline at end of file

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 13:31:27 +0000 (Mon, 18 May 2015) New Revision: 1369 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1369 Log: Modification of method "setParentalControlPIN" which call method "_lockPINEntry". Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 13:07:23 UTC (rev 1368) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 13:31:27 UTC (rev 1369) @@ -91,12 +91,8 @@ } } - this.isPINEntryLocked = true; + this._lockPINEntry(); - //After a periode of time, the PIN entry will be unlocked. - this._timeout(this._PINLockedTime) - .then(this._setIsPINEntryLocked.bind(this, false)); - return this._PIN_LOCKED; },

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 13:07:23 +0000 (Mon, 18 May 2015) New Revision: 1368 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1368 Log: Addition of a new test for test section "ParentalControlManager". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-05-18 13:00:04 UTC (rev 1367) +++ oipf/js/test/Test.js 2015-05-18 13:07:23 UTC (rev 1368) @@ -744,6 +744,10 @@ { label: "Call method 'verifyParentalControlPIN' with a valid pin.", method: "testVerifyParentalControlPINWithValidPIN" + }, + { + label: "Call method 'setBlockUnrated' with an invalid pin.", + method: "testSetBlockUnratedWithInvalidPIN10Times" } ] }],

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 13:00:04 +0000 (Mon, 18 May 2015) New Revision: 1367 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1367 Log: Initialization of object "ParentalControlManager" in constructor and modification of method "isObjectSupported". Modified: oipf/js/impl/OipfObjectFactory.js Modified: oipf/js/impl/OipfObjectFactory.js =================================================================== --- oipf/js/impl/OipfObjectFactory.js 2015-05-18 12:57:51 UTC (rev 1366) +++ oipf/js/impl/OipfObjectFactory.js 2015-05-18 13:00:04 UTC (rev 1367) @@ -15,7 +15,7 @@ //this.imsObject = new IMSObecjet(); //this.mdtfObject = new MDTFObject(); //this.notifSocketObject = new NotifSocket(); - //this.parentalControlManagerObject = new ParentalControlManagerObject(); + this.parentalControlManagerObject = new ParentalControlManagerObject(); this.configurationObject = new ConfigurationObject(); this.recordingSchedulerObject = new RecordingSchedulerObject( this.configurationObject.configuration, modelFactory, dateUtils); @@ -136,7 +136,7 @@ "application/oipfDrmAgent" : false, "application/oipfGatewayInfo" : false, "application/oipfMDTF" : false, - "application/oipfParentalControlManager" : false, + "application/oipfParentalControlManager" : true, "application/oipfRecordingScheduler" : true, "application/oipfRemoteControlFunction" : false, "application/oipfRemoteManagement" : false,

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 12:57:51 +0000 (Mon, 18 May 2015) New Revision: 1366 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1366 Log: Modification of first method condition. Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 12:34:08 UTC (rev 1365) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 12:57:51 UTC (rev 1366) @@ -101,7 +101,7 @@ }, verifyParentalControlPIN: function(pcPIN) { - if (this._currentPIN != pcPIN) { + if (this._currentPIN == pcPIN) { return this._PIN_CORRECT; } this._currentInvalidPINAttempts++;

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 12:34:08 +0000 (Mon, 18 May 2015) New Revision: 1365 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1365 Log: Change default value of property "_currentPIN". Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 12:32:28 UTC (rev 1364) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 12:34:08 UTC (rev 1365) @@ -42,7 +42,7 @@ this.isPINEntryLocked = false; - this._currentPIN = "0000"; + this._currentPIN = "1234"; this._invalidPINAttemptsMax = 4; this._currentInvalidPINAttempts = 0; this._PINLockedTime = 2000;

1 0