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

r1103 - oipf/js/test
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 08:39:41 +0000 (Wed, 08 Apr 2015) New Revision: 1103 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1103 Log: New test added: "testCreateSearchForScheduledContent". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-08 08:07:03 UTC (rev 1102) +++ oipf/js/test/SearchManagerTest.js 2015-04-08 08:39:41 UTC (rev 1103) @@ -5,6 +5,8 @@ */ var SearchManagerTest = TestCase.extend({ + SCHEDULED_CONTENT: 1, + UNREALIZED: 0, CONNECTING: 1, @@ -137,6 +139,18 @@ } } // this.searchManagerObj.addEventListener("MetadataSearch", onMetadataSearch, false); + }, + + testCreateSearchForScheduledContent: function(resolve, reject) { + this.metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + if (this.assertNotNull(this.metadataSearch) && + this.assertEquals(this.metadataSearch.searchTarget, + this.SCHEDULED_CONTENT)) { + resolve(); + } else { + reject(); + } } - }); \ No newline at end of file

1 0

r1102 - oipf/js/impl
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 08:07:03 +0000 (Wed, 08 Apr 2015) New Revision: 1102 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1102 Log: Addition of setter and getter for property "onMetadataSearch".(According to Ecmascript 6 norm) Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-04-08 08:00:30 UTC (rev 1101) +++ oipf/js/impl/SearchManagerObject.js 2015-04-08 08:07:03 UTC (rev 1102) @@ -82,8 +82,14 @@ * | results). * ------ -------------------------------------------------------------------------------------------------------------------------------------------------------- */ - onMetadataSearch: null, + get onMetadataSearch() { + return this._getCallback("MetadataSearch"); + }, + set onMetadataSearch(callback) { + this._setCallback("MetadataSearch", callback); + }, + _getCallback : function(type) { if(this._callbacks) { return this._callbacks[type];

1 0

r1101 - oipf/js/impl
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 08:00:30 +0000 (Wed, 08 Apr 2015) New Revision: 1101 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1101 Log: Addition of setter and gette for property "_callback". Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-04-08 07:57:02 UTC (rev 1100) +++ oipf/js/impl/SearchManagerObject.js 2015-04-08 08:00:30 UTC (rev 1101) @@ -84,6 +84,18 @@ */ onMetadataSearch: null, + _getCallback : function(type) { + if(this._callbacks) { + return this._callbacks[type]; + } + }, + + _setCallback: function(type, callback){ + if(this._callbacks) { + this._callbacks[type] = callback; + } + }, + _metadata: null, _metadataManager: null,

1 0

r1100 - oipf/js/impl
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 07:57:02 +0000 (Wed, 08 Apr 2015) New Revision: 1100 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1100 Log: Addition of new properties "_listeners" and "_callback". Modified: oipf/js/impl/SearchManagerObject.js Modified: oipf/js/impl/SearchManagerObject.js =================================================================== --- oipf/js/impl/SearchManagerObject.js 2015-04-08 07:46:27 UTC (rev 1099) +++ oipf/js/impl/SearchManagerObject.js 2015-04-08 07:57:02 UTC (rev 1100) @@ -89,6 +89,8 @@ _metadataManager: null, init: function() { + this._listeners = {}; + this._callbacks = {}; this._eventManager = new EventManager(); this._metadataManager = new MetadataManager(); this._metadata = this._metadataManager.getMetadata("XML_TV");

1 0

r1099 - oipf/js/test
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 07:46:27 +0000 (Wed, 08 Apr 2015) New Revision: 1099 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1099 Log: Addition of new properties. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-08 07:37:09 UTC (rev 1098) +++ oipf/js/test/SearchManagerTest.js 2015-04-08 07:46:27 UTC (rev 1099) @@ -5,6 +5,14 @@ */ var SearchManagerTest = TestCase.extend({ + UNREALIZED: 0, + + CONNECTING: 1, + + PRESENTING: 2, + + STOPPED: 3, + searchManagerObj: null, init: function () { @@ -128,7 +136,7 @@ } } - this.searchManagerObj.addEventListener("MetadataSearch", onMetadataSearch, false); +// this.searchManagerObj.addEventListener("MetadataSearch", onMetadataSearch, false); } }); \ No newline at end of file

1 0

r1098 - oipf/js/test
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 07:37:09 +0000 (Wed, 08 Apr 2015) New Revision: 1098 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1098 Log: Addition of method "addTransitionWithError". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-07 22:22:29 UTC (rev 1097) +++ oipf/js/test/SearchManagerTest.js 2015-04-08 07:37:09 UTC (rev 1098) @@ -60,6 +60,15 @@ this.addTransitionWithError(begin, end, null, callback); }, + addTransitionWithError: function(begin, end, error, callback) { + this.transitions.push({ + begin: begin, + end: end, + error: error, + callback: callback + }); + }, + afterTest: function(resolve, reject) { this.vidBroadObj.removeEventListener("PlayStateChange", this.onPlayStateChange); },

1 0

r1097 - oipf/js/test
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 22:22:29 +0000 (Tue, 07 Apr 2015) New Revision: 1097 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1097 Log: Addition of arguments in method "beforeTest". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-07 21:34:16 UTC (rev 1096) +++ oipf/js/test/SearchManagerTest.js 2015-04-07 22:22:29 UTC (rev 1097) @@ -12,7 +12,7 @@ this.timeout = this.timerManager.createTimer.bind(this.timerManager); }, - beforeTest: function() { + beforeTest: function(resolve, reject) { this.searchManagerObj = oipfObjectFactory.createSearchManagerObject(); this.vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); this.onPlayStateChange = this.onChangeState.bind(this, resolve, reject); @@ -65,21 +65,29 @@ }, testGetCurrentProgram: function (resolve, reject) { - var stat = "Pending"; - console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: " + stat); - var videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); - var currentChannel = videoBroadcastObject.bindToCurrentChannel(); - var searchTarget = 1; - var metaDataSearch = this.searchManagerObj.createSearch(searchTarget); - var startTime = null; - metaDataSearch.findProgrammesFromStream(currentChannel - , startTime); - var offset = 0; - var count = 1; - metaDataSearch.result.getResults(offset, count); - console.log(metaDataSearch.result[0]);//Must return undefined else wrong implementation of getResults method - var self = this; + + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, resolve); + + this.vidBroadObj.bindToCurrentChannel(); + +// var stat = "Pending"; +// console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: " + stat); +// var vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); +// var currentChannel = vidBroadObj.bindToCurrentChannel(); +// var searchTarget = 1; +// var metaDataSearch = this.searchManagerObj.createSearch(searchTarget); +// var startTime = null; +// metaDataSearch.findProgrammesFromStream(currentChannel +// , startTime); +// var offset = 0; +// var count = 1; +// metaDataSearch.result.getResults(offset, count); +// console.log(metaDataSearch.result[0]);//Must return undefined else wrong implementation of getResults method +// +// var self = this; function onMetadataSearch (search, state) { console.log("[INFO]: onMetadataSearch called");

1 0

r1096 - oipf/js/test
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 21:34:16 +0000 (Tue, 07 Apr 2015) New Revision: 1096 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1096 Log: Implementation of "afterTest". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-07 21:27:59 UTC (rev 1095) +++ oipf/js/test/SearchManagerTest.js 2015-04-07 21:34:16 UTC (rev 1096) @@ -61,7 +61,7 @@ }, afterTest: function(resolve, reject) { - + this.vidBroadObj.removeEventListener("PlayStateChange", this.onPlayStateChange); }, testGetCurrentProgram: function (resolve, reject) {

1 0

r1095 - oipf/js/test
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 21:27:59 +0000 (Tue, 07 Apr 2015) New Revision: 1095 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1095 Log: Addition of method "onChangeState" and "addTransition". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-07 21:22:54 UTC (rev 1094) +++ oipf/js/test/SearchManagerTest.js 2015-04-07 21:27:59 UTC (rev 1095) @@ -24,6 +24,42 @@ logTest("State: Pending"); }, + /* + * + * @param {type} resolve + * @param {type} reject + * @param {type} newState + * @param {type} errorCode + * @returns {undefined} + * FIX-ME: Yannis - 01/04/2015 - The verification done in else clause + * could be reviewed. + */ + onChangeState: function(resolve, reject, newState, errorCode) { + var currentTransition = this.transitions[this.currentIndex]; + var begin = currentTransition.begin; + var end = currentTransition.end; + var error = currentTransition.error; + console.log(this.vidBroadObj.playState); + if (begin == this.previousState && end == newState && error == errorCode) { + currentTransition.callback && currentTransition.callback(); + this.previousState = newState; + this.currentIndex++; + } else { + // + if (begin == this.CONNECTING + && this.transitions.length == this.currentIndex + 1) { + reject("Untestable case for the moment."); + } else { + reject("Invalid state"); + } + + } + }, + + addTransition: function(begin, end, callback) { + this.addTransitionWithError(begin, end, null, callback); + }, + afterTest: function(resolve, reject) { },

1 0

r1094 - oipf/js/test
by ygrego＠users.nuiton.org 07 Apr '15

07 Apr '15

Author: ygrego Date: 2015-04-07 21:22:54 +0000 (Tue, 07 Apr 2015) New Revision: 1094 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1094 Log: Addition of object "TimerManager" and a copy of his method "createTimer". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-07 21:01:15 UTC (rev 1093) +++ oipf/js/test/SearchManagerTest.js 2015-04-07 21:22:54 UTC (rev 1094) @@ -8,7 +8,8 @@ searchManagerObj: null, init: function () { - + this.timerManager = new TimerManager(); + this.timeout = this.timerManager.createTimer.bind(this.timerManager); }, beforeTest: function() {

1 0