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

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

18 May '15

Author: ygrego Date: 2015-05-18 12:32:28 +0000 (Mon, 18 May 2015) New Revision: 1364 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1364 Log: Implementation of methods "verifyParentalControlPIN" and "_lockPINEntry". Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 12:20:36 UTC (rev 1363) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 12:32:28 UTC (rev 1364) @@ -100,6 +100,29 @@ return this._PIN_LOCKED; }, + verifyParentalControlPIN: function(pcPIN) { + if (this._currentPIN != pcPIN) { + 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; + + //After a periode of time, the PIN entry will be unlocked. + this._timeout(this._PINLockedTime) + .then(this._setIsPINEntryLocked.bind(this, false)); + }, + _setIsPINEntryLocked: function(enable) { this.isPINEntryLocked = enable; this._currentInvalidPINAttempts = 0;

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 12:20:36 +0000 (Mon, 18 May 2015) New Revision: 1363 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1363 Log: Rename the method of a test in section "ParentalControlManagerTest" Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-05-18 12:19:07 UTC (rev 1362) +++ oipf/js/test/Test.js 2015-05-18 12:20:36 UTC (rev 1363) @@ -738,8 +738,8 @@ object: new ParentalControlManagerTest(), tests: [ { - label: "Call method 'verifyParentalControlPIN' with an invalid pin 4 times.", - method: "testVerifyParentalControlPIN4Times" + label: "Call method 'verifyParentalControlPIN' with an invalid pin 10 times.", + method: "testVerifyParentalControlPIN10Times" }, { label: "Call method 'verifyParentalControlPIN' with a valid pin.",

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 12:19:07 +0000 (Mon, 18 May 2015) New Revision: 1362 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1362 Log: Addition of a condition in order to verify the test result. Modified: oipf/js/test/ParentalControlManagerTest.js Modified: oipf/js/test/ParentalControlManagerTest.js =================================================================== --- oipf/js/test/ParentalControlManagerTest.js 2015-05-18 11:45:58 UTC (rev 1361) +++ oipf/js/test/ParentalControlManagerTest.js 2015-05-18 12:19:07 UTC (rev 1362) @@ -22,15 +22,19 @@ }, - testVerifyParentalControlPIN4Times: function(resolve, reject) { - for(var i = 0, li = 4; i < li; i++) { + testVerifyParentalControlPIN10Times: function(resolve, reject) { + for(var i = 0, li = 10; i < li; i++) { var result = this.parentalControlManagerObject .verifyParentalControlPIN("0000"); - console.log(result); + console.log(i+1, ":", result); } - resolve(); + if (this.assertEquals(result, 2)) { + resolve(); + } else { + reject(); + } }, testVerifyParentalControlPINWithValidPIN: function(resolve, reject) {

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 11:45:58 +0000 (Mon, 18 May 2015) New Revision: 1361 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1361 Log: Addition of a new test in test section "ParentalControlManager". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-05-18 11:44:37 UTC (rev 1360) +++ oipf/js/test/Test.js 2015-05-18 11:45:58 UTC (rev 1361) @@ -740,6 +740,10 @@ { label: "Call method 'verifyParentalControlPIN' with an invalid pin 4 times.", method: "testVerifyParentalControlPIN4Times" + }, + { + label: "Call method 'verifyParentalControlPIN' with a valid pin.", + method: "testVerifyParentalControlPINWithValidPIN" } ] }],

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 11:44:37 +0000 (Mon, 18 May 2015) New Revision: 1360 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1360 Log: Addition of a new test section about "ParentalControlManager". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-05-18 11:43:15 UTC (rev 1359) +++ oipf/js/test/Test.js 2015-05-18 11:44:37 UTC (rev 1360) @@ -733,6 +733,14 @@ label: "Call method 'hasCapability' to verify if the TV support the feature recording(UI profile name fragment: 'VIDEOTELEPHONY').", method: "testHasCapabilityVIDEOTELEPHONY" } + ]},{ + name: "ParentalControlManagerTest", + object: new ParentalControlManagerTest(), + tests: [ + { + label: "Call method 'verifyParentalControlPIN' with an invalid pin 4 times.", + method: "testVerifyParentalControlPIN4Times" + } ] }],

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 11:43:15 +0000 (Mon, 18 May 2015) New Revision: 1359 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1359 Log: Addition of method "testVerifyParentalControlPINWithValidPIN" and severals constants in constructor. Modified: oipf/js/test/ParentalControlManagerTest.js Modified: oipf/js/test/ParentalControlManagerTest.js =================================================================== --- oipf/js/test/ParentalControlManagerTest.js 2015-05-18 11:08:59 UTC (rev 1358) +++ oipf/js/test/ParentalControlManagerTest.js 2015-05-18 11:43:15 UTC (rev 1359) @@ -8,6 +8,9 @@ init: function() { this.super.init(); + this.PIN_CORRECT = 0; + this.PIN_INCORRECT = 1; + this.PIN_LOCKED = 2; }, beforeTest: function() { @@ -28,6 +31,19 @@ } resolve(); + }, + + testVerifyParentalControlPINWithValidPIN: function(resolve, reject) { + var result = this.parentalControlManagerObject + .verifyParentalControlPIN("1234"); + + console.log(result); + + if (this.assertEquals(result, this.PIN_CORRECT)) { + resolve(); + } else { + reject(); + } } }); \ No newline at end of file

1 0

r1358 - oipf/view
by ygrego＠users.nuiton.org 18 May '15

18 May '15

Author: ygrego Date: 2015-05-18 11:08:59 +0000 (Mon, 18 May 2015) New Revision: 1358 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1358 Log: Addition of javascript source "ParentalControlManagerTest". Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-05-18 10:32:35 UTC (rev 1357) +++ oipf/view/test.html 2015-05-18 11:08:59 UTC (rev 1358) @@ -78,6 +78,7 @@ <script src="../js/test/TestCase.js" type="text/javascript"></script> <script src="../js/test/CapabilitiesTest.js" type="text/javascript"></script> + <script src="../js/test/ParentalControlManagerTest.js" type="text/javascript"></script> <script src="../js/test/RecordingSchedulerTest.js" type="text/javascript"></script> <script src="../js/test/ConfigurationTest.js" type="text/javascript"></script> <script src="../js/test/SearchManagerTest.js" type="text/javascript"></script>

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 10:32:35 +0000 (Mon, 18 May 2015) New Revision: 1357 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1357 Log: Addition of the class "ParentalControlManagerTest". Added: oipf/js/test/ParentalControlManagerTest.js Added: oipf/js/test/ParentalControlManagerTest.js =================================================================== --- oipf/js/test/ParentalControlManagerTest.js (rev 0) +++ oipf/js/test/ParentalControlManagerTest.js 2015-05-18 10:32:35 UTC (rev 1357) @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ + +var ParentalControlManagerTest = TestCase.extend({ + + init: function() { + this.super.init(); + }, + + beforeTest: function() { + this.parentalControlManagerObject = + oipfObjectFactory.createParentalControlManagerObject(); + }, + + afterTest: function() { + + }, + + testVerifyParentalControlPIN4Times: function(resolve, reject) { + for(var i = 0, li = 4; i < li; i++) { + var result = this.parentalControlManagerObject + .verifyParentalControlPIN("0000"); + + console.log(result); + } + + resolve(); + } + +}); \ No newline at end of file

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 10:12:08 +0000 (Mon, 18 May 2015) New Revision: 1356 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1356 Log: Initialization of technicals properties and addition of constants in constructor. Implementation of method "setParentalControlPIN" and addition of method "_setIsPINEntryLocked". Modified: oipf/js/impl/ParentalControlManagerObject.js Modified: oipf/js/impl/ParentalControlManagerObject.js =================================================================== --- oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 10:06:39 UTC (rev 1355) +++ oipf/js/impl/ParentalControlManagerObject.js 2015-05-18 10:12:08 UTC (rev 1356) @@ -23,7 +23,7 @@ _currentPIN: null, //Indicate the number of invalid PIN attemps. - _invalidPINAttempts: null, + _invalidPINAttemptsMax: null, //Contain the number of invalid entry PIN attempts. _currentInvalidPINAttempts: null, @@ -36,12 +36,73 @@ * -Yannis 18/05/2015 The properties "_currentPIN" and "_invalidPINAttemps" * don't have to be innitialized here. */ - init : function(){ + init: function() { + this._timerManager = new TimerManager(); + this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); + this.isPINEntryLocked = false; this._currentPIN = "0000"; - this._invalidPINAttempts = 4; - this._currentPINAttempts = 0; - } + this._invalidPINAttemptsMax = 4; + this._currentInvalidPINAttempts = 0; + this._PINLockedTime = 2000; + + this._PIN_CORRECT = parentalControlManagerConstants.pin.CORRECT; + this._PIN_INCORRECT = parentalControlManagerConstants.pin.INCORRECT; + this._PIN_LOCKED = parentalControlManagerConstants.pin.LOCKED; + }, + + /* + * Description: + * Set the parental control PIN. 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: + * - oldPcPIN: The current parental control PIN. + * - newPcPIN: The new value for the parental control PIN. + * + * Return: Integer + */ + setParentalControlPIN: function(oldPcPIN, newPcPIN) { + if (this._currentInvalidPINAttempts < this._invalidPINAttemptsMax) { + + if (this._currentPIN == oldPcPIN) { + + this._currentPIN = newPcPIN; + return this._PIN_CORRECT; + + } else { + + this._currentInvalidPINAttempts++; + return this._PIN_INCORRECT; + } + } + + this.isPINEntryLocked = true; + + //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; + }, + + _setIsPINEntryLocked: function(enable) { + this.isPINEntryLocked = enable; + this._currentInvalidPINAttempts = 0; + } }); \ No newline at end of file

1 0

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

18 May '15

Author: ygrego Date: 2015-05-18 10:06:39 +0000 (Mon, 18 May 2015) New Revision: 1355 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1355 Log: Modification of values for constants "INCORRECT" and "CORRECT". Modified: oipf/js/impl/model/constants/ParentalControlManagerConstants.js Modified: oipf/js/impl/model/constants/ParentalControlManagerConstants.js =================================================================== --- oipf/js/impl/model/constants/ParentalControlManagerConstants.js 2015-05-18 09:28:59 UTC (rev 1354) +++ oipf/js/impl/model/constants/ParentalControlManagerConstants.js 2015-05-18 10:06:39 UTC (rev 1355) @@ -7,6 +7,6 @@ }; parentalControlManagerConstants.pin.CORRECT = 0; -parentalControlManagerConstants.pin.INCORRECT = 0; -parentalControlManagerConstants.pin.LOCKED = 0; +parentalControlManagerConstants.pin.INCORRECT = 1; +parentalControlManagerConstants.pin.LOCKED = 2;

1 0