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

r1023 - oipf/js/test
by ygrego＠users.nuiton.org 01 Apr '15

01 Apr '15

Author: ygrego Date: 2015-04-01 13:53:09 +0000 (Wed, 01 Apr 2015) New Revision: 1023 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1023 Log: Reviewing of transitions states in this test method. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 13:49:05 UTC (rev 1022) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 13:53:09 UTC (rev 1023) @@ -773,21 +773,19 @@ testSetChannelInStoppedWithNull: function(resolve, reject) { var self = this; - this.addTransition(this.PRESENTING, this.CONNECTING); - this.addTransition(this.CONNECTING, this.PRESENTING); - - this.vidBroadObj.onChannelChangeSucceeded = function(channel) { + this.addTransition(this.UNREALIZED, this.CONNECTING); - if (self.assertNotNull(channel) && self.assertEquals(self.vidBroadObj.playState, self.PRESENTING)) { - logTest("State: Successful"); - resolve("Success"); - } else { - logTest("State: Failure"); - reject("Failure : The channel is null for a unknown reason or wrong play state."); - } - }; + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + self.vidBroadObj.stop(); + }); - this.vidBroadObj.setChannel(null); + this.addTransition(this.PRESENTING, this.STOPPED, function() { + self.vidBroadObj.setChannel(null); + }); + + this.addTransition(this.STOPPED, this.UNREALIZED, resolve); + + this.vidBroadObj.bindToCurrentChannel(); } }); \ No newline at end of file

1 0

r1022 - oipf/js/test
by ygrego＠users.nuiton.org 01 Apr '15

01 Apr '15

Author: ygrego Date: 2015-04-01 13:49:05 +0000 (Wed, 01 Apr 2015) New Revision: 1022 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1022 Log: Deletion of transition and the last one targets the UNREALIZED state. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 13:46:13 UTC (rev 1021) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 13:49:05 UTC (rev 1022) @@ -693,7 +693,6 @@ this.vidBroadObj.bindToCurrentChannel(); }, - testSetChannelInConnectingWithNull: function(resolve, reject) { var self = this; @@ -701,8 +700,7 @@ self.vidBroadObj.setChannel(null); }); - this.addTransition(this.CONNECTING, this.CONNECTING); - this.addTransition(this.CONNECTING, this.PRESENTING, resolve); + this.addTransition(this.CONNECTING, this.UNREALIZED, resolve); this.vidBroadObj.bindToCurrentChannel(); },

1 0

r1021 - oipf/js/test
by ygrego＠users.nuiton.org 01 Apr '15

01 Apr '15

Author: ygrego Date: 2015-04-01 13:46:13 +0000 (Wed, 01 Apr 2015) New Revision: 1021 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1021 Log: Call of method "setChannel" after PRESENTING state in second transition. And the final transition, take resolve as callback. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 13:41:10 UTC (rev 1020) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 13:46:13 UTC (rev 1021) @@ -735,21 +735,15 @@ testSetChannelInPresentingWithNull: function(resolve, reject) { var self = this; - this.addTransition(this.PRESENTING, this.CONNECTING); - this.addTransition(this.CONNECTING, this.PRESENTING); - - this.vidBroadObj.onChannelChangeSucceeded = function(channel) { + this.addTransition(this.UNREALIZED, this.CONNECTING); - if (self.assertNotNull(channel) && self.assertEquals(self.vidBroadObj.playState, self.PRESENTING)) { - logTest("State: Successful"); - resolve("Success"); - } else { - logTest("State: Failure"); - reject("Failure : The channel is null for a unknown reason or wrong play state."); - } - }; + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + self.vidBroadObj.setChannel(null); + }); - this.vidBroadObj.setChannel(null); + this.addTransition(this.PRESENTING, this.UNREALIZED, resolve); + + this.vidBroadObj.bindToCurrentChannel(); },

1 0

r1020 - oipf/js/test
by ygrego＠users.nuiton.org 01 Apr '15

01 Apr '15

Author: ygrego Date: 2015-04-01 13:41:10 +0000 (Wed, 01 Apr 2015) New Revision: 1020 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1020 Log: Additon of a new transition, and callback for the last one. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 13:32:25 UTC (rev 1019) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 13:41:10 UTC (rev 1020) @@ -701,19 +701,9 @@ self.vidBroadObj.setChannel(null); }); - this.addTransition(this.CONNECTING, this.PRESENTING); + this.addTransition(this.CONNECTING, this.CONNECTING); + this.addTransition(this.CONNECTING, this.PRESENTING, resolve); - this.vidBroadObj.onChannelChangeSucceeded = function(channel) { - - if (self.assertNotNull(channel) && self.assertEquals(self.vidBroadObj.playState, self.PRESENTING)) { - logTest("State: Successful"); - resolve("Success"); - } else { - logTest("State: Failure"); - reject("Failure : The channel is null for a unknown reason or wrong play state."); - } - }; - this.vidBroadObj.bindToCurrentChannel(); },

1 0

r1019 - oipf/js/impl
by ygrego＠users.nuiton.org 01 Apr '15

01 Apr '15

Author: ygrego Date: 2015-04-01 13:32:25 +0000 (Wed, 01 Apr 2015) New Revision: 1019 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1019 Log: In method "setChannel" ask a state changement when state different of UNREALIZED and channel to switch equals to null. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-04-01 13:18:04 UTC (rev 1018) +++ oipf/js/impl/VideoBroadcastObject.js 2015-04-01 13:32:25 UTC (rev 1019) @@ -651,16 +651,17 @@ .then(this.changeStateToConnectingWhenSwitching.bind(this, channel)); } else if (channel.idType == 40 || channel.idType == 41) { - this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 8]))); - } else { - this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 0]))); - } + this._timeout() + .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 8]))); + } else { + this._timeout() + .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 0]))); + } } else { - - this._timeout() - .then(this.changePlayState.bind(this, this._UNREALIZED)); + if (this.playState != this._UNREALIZED) { + this._timeout() + .then(this.changePlayState.bind(this, this._UNREALIZED)); + } } },

1 0

r1018 - oipf/js/impl
by ygrego＠users.nuiton.org 01 Apr '15

01 Apr '15

Author: ygrego Date: 2015-04-01 13:18:04 +0000 (Wed, 01 Apr 2015) New Revision: 1018 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1018 Log: In method "setChannel" addition of code in order to manage event dispathing when no suitable tuner available. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-04-01 13:06:32 UTC (rev 1017) +++ oipf/js/impl/VideoBroadcastObject.js 2015-04-01 13:18:04 UTC (rev 1018) @@ -650,11 +650,13 @@ this._timeout() .then(this.changeStateToConnectingWhenSwitching.bind(this, channel)); - } else { - this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); - } - + } else if (channel.idType == 40 || channel.idType == 41) { + this._timeout() + .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 8]))); + } else { + this._timeout() + .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 0]))); + } } else { this._timeout()

1 0

r1017 - oipf/js/test
by ygrego＠users.nuiton.org 01 Apr '15

01 Apr '15

Author: ygrego Date: 2015-04-01 13:06:32 +0000 (Wed, 01 Apr 2015) New Revision: 1017 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1017 Log: In method "testSetChannelInConnection" deletion of useless transition. In method "testSetChannelInConnectionWithNull" deletion of useless transition and addition of callback for first transition. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 12:33:31 UTC (rev 1016) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 13:06:32 UTC (rev 1017) @@ -674,13 +674,10 @@ testSetChannelInConnecting: function(resolve, reject) { var self = this; - this.addTransition(this.UNREALIZED, this.CONNECTING); - - this.addTransition(this.CONNECTING, this.PRESENTING, function() { + this.addTransition(this.UNREALIZED, this.CONNECTING, function() { self.vidBroadObj.setChannel(self.channel); }); - - this.addTransition(this.PRESENTING, this.CONNECTING); + this.addTransition(this.CONNECTING, this.PRESENTING); this.vidBroadObj.onChannelChangeSucceeded = function(channel) { @@ -696,16 +693,14 @@ this.vidBroadObj.bindToCurrentChannel(); }, + testSetChannelInConnectingWithNull: function(resolve, reject) { var self = this; - this.addTransition(this.UNREALIZED, this.CONNECTING); - - this.addTransition(this.CONNECTING, this.PRESENTING, function() { - self.vidBroadObj.setChannel(self.channel); + this.addTransition(this.UNREALIZED, this.CONNECTING, function() { + self.vidBroadObj.setChannel(null); }); - - this.addTransition(this.PRESENTING, this.CONNECTING); + this.addTransition(this.CONNECTING, this.PRESENTING); this.vidBroadObj.onChannelChangeSucceeded = function(channel) {

1 0

r1016 - oipf/js/impl
by ygrego＠users.nuiton.org 01 Apr '15

01 Apr '15

Author: ygrego Date: 2015-04-01 12:33:31 +0000 (Wed, 01 Apr 2015) New Revision: 1016 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1016 Log: Verify if playState can be equals to UNREALIZED, modification effectued in method "setChannel". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-04-01 12:28:25 UTC (rev 1015) +++ oipf/js/impl/VideoBroadcastObject.js 2015-04-01 12:33:31 UTC (rev 1016) @@ -644,7 +644,7 @@ */ setChannel: function(channel, trickplay, contentAccessDescriptorURL) { - if (this.playState >= this._CONNECTING && this.playState <= this._STOPPED && channel) { + if (this.playState >= this._UNREALIZED && this.playState <= this._STOPPED && channel) { if (channelUtils.verifyASuitableTunerAvailable(channel.idType, this) && channel.idType != 41) { this._timeout()

1 0

r1015 - oipf/js/impl
by ygrego＠users.nuiton.org 01 Apr '15

01 Apr '15

Author: ygrego Date: 2015-04-01 12:28:25 +0000 (Wed, 01 Apr 2015) New Revision: 1015 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1015 Log: Timer invocation will perform by new object "_timerManager", a copy of his method "createTimer" is saved in "_timeout", all those modifications have been done in mehtod "init". Now each timer invocation is performed by call of method "_timeout", it the main modification of this commit. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-04-01 12:12:09 UTC (rev 1014) +++ oipf/js/impl/VideoBroadcastObject.js 2015-04-01 12:28:25 UTC (rev 1015) @@ -148,7 +148,11 @@ this._listeners = {}; this._callbacks = {}; this._channelService = channelService; - this._eventManager = new EventManager; + this._eventManager = new EventManager(); + this._timerManager = new TimerManager(); + + this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); + this._timeoutLong = this._timerManager.createTimer.bind(this._timerManager, 100); }, /*! @@ -315,8 +319,6 @@ bindToCurrentChannel: function() { var channelConfig = this._channelService; var currentChannel = channelConfig.currentChannel; - - this._timer && this._timer.cancel(); switch (this.playState) { @@ -324,31 +326,32 @@ //claimed scarce resources //Call method to claim scarces resources if (currentChannel) { - this._timer = oipf.utils.timeout(0) + this._timeout() .then(this.changePlayState.bind(this, this._CONNECTING)) .then(this.setCurrentChannel.bind(this, currentChannel)) + .then(this._timeout) .then(this.changePlayState.bind(this, this._PRESENTING)); } else { - this._timer = oipf.utils.timeout(0) + this._timeout() .then(this.changePlayState.bind(this, this._UNREALIZED, 100)); } break; case this._CONNECTING: - /*if (!verifyASuitableTunerAvailable(currentChannel.idType)) { - this.timer = oipf.utils.timeout(0) - .then(this.changePlayState.bind(this, this._CONNECTING)); + if (!channelUtils.verifyASuitableTunerAvailable(currentChannel.idType)) { + this._timeout() + .then(this.changePlayState.bind(this, this._CONNECTING)); } else { - this.timer = oipf.utils.timeout(0) - .then(this.setCurrentChannel.bind(this, currentChannel)) - .then(this.changePlayState.bind(this, this._PRESENTING)); - }*/ + this._timeout() + .then(this.setCurrentChannel.bind(this, currentChannel)) + .then(this.changePlayState.bind(this, this._PRESENTING)); + } //Method documentation indicate it don't have effects in this state. break; case this._PRESENTING: /*if (!verifyASuitableTunerAvailable(currentChannel.idType)) { - this.timer = oipf.utils.timeout(0) + this.timer = oipf.utils.this._timeout() .then(this.changePlayState.bind(this, this._PRESENTING)); }*/ //Method documentation indicate it don't have effects in this state. @@ -357,18 +360,17 @@ case this._STOPPED: //FIX-ME :Make enable video and audio presentation if (!channelUtils.verifyASuitableTunerAvailable(currentChannel.idType, this)) { - this._timer = oipf.utils.timeout(0) - .then(this.changePlayState.bind(this, this._STOPPED, 0)); + this._timeout() + .then(this.changePlayState.bind(this, this._STOPPED, 0)); } else { - this._timer = oipf.utils.timeout(0) - .then(this.changePlayState.bind(this, this._CONNECTING)) - .then(this.setCurrentChannel.bind(this, currentChannel)) - .then(this.changePlayState.bind(this, this._PRESENTING)); + this._timeout() + .then(this.changePlayState.bind(this, this._CONNECTING)) + .then(this.setCurrentChannel.bind(this, currentChannel)) + .then(this._timeout) + .then(this.changePlayState.bind(this, this._PRESENTING)); } break; - } - return this.currentChannel; }, @@ -385,6 +387,7 @@ }, changePlayState: function(state, error) { + console.log("changeState", state); this.playState = state; this._fireEvent(createCustomEvent("PlayStateChange", [this.playState, error])); }, @@ -408,7 +411,7 @@ if (this.noTransientError(this._CONNECTING) && this.noPermanentError(this._CONNECTING, channel)) { this.playState = this._CONNECTING; this._fireEvent(createCustomEvent("PlayStateChange", [this.playState])); - timeout(0) + this._timeout() .then(this.changeStateToPresentingWhenSwitching.bind(this, channel)); } }, @@ -419,7 +422,7 @@ this.setCurrentChannel(channel); this.playState = this._PRESENTING; this._fireEvent(createCustomEvent("PlayStateChange", [this.playState])); - timeout(0) + this._timeout() .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeSucceeded", [channel]))); } }, @@ -644,18 +647,17 @@ if (this.playState >= this._CONNECTING && this.playState <= this._STOPPED && channel) { if (channelUtils.verifyASuitableTunerAvailable(channel.idType, this) && channel.idType != 41) { - timeout(0) + this._timeout() .then(this.changeStateToConnectingWhenSwitching.bind(this, channel)); } else { - timeout(0) + this._timeout() .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); } } else { - timeout(0) - //.then(this.release.bind(this)) + this._timeout() .then(this.changePlayState.bind(this, this._UNREALIZED)); } }, @@ -803,9 +805,9 @@ * - stop visualization of the video. * - and scarce ressources loaded previously. */ - this._timer && this._timer.cancel(); - this._timer = oipf.utils.timeout(0) + + this._timeout() .then(this.changePlayState.bind(this, this._UNREALIZED)); } }, @@ -826,9 +828,9 @@ * - stop the presentation of the video and audio. * - and scarce ressources loaded previously. */ - this._timer && this._timer.cancel(); - this._timer = oipf.utils.timeout(0) + + this._timeout() .then(this.changePlayState.bind(this, this._STOPPED)); } }, @@ -846,14 +848,14 @@ //Verify that the currentChannel exists in the channel list of channel configuration if (!channelConfig.channelList.getChannel(this.currentChannel.channelId)) { - timeout(0) + this._timeout() .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); /*setTimeout(function () { self.onChannelChangeError && self.onChannelChangeError(null, 100); }, 0);*/ if (this.playState == 1) { - timeout(0) + this._timeout() .then(this.changePlayState.bind(this, this._UNREALIZED, 100)); /*setTimeout(function () { self.playState = 0; @@ -878,14 +880,14 @@ var channelToChange = channelUtils.findChannel(channelCollection, this.currentChannel, step); if (channelUtils.verifyASuitableTunerAvailable(channelToChange.idType, this)) { - timeout(0) + this._timeout() .then(this.changeStateToConnectingWhenSwitching.bind(this, channelToChange)); } else if (channelToChange.idType == 40 || channelToChange.idType == 41) { - timeout(0) + this._timeout() .then(object._fireEvent.bind(object, createCustomEvent("ChannelChangeError", [null, 8]))); } else { - timeout(0) + this._timeout() .then(object._fireEvent.bind(object, createCustomEvent("ChannelChangeError", [null, 0]))); } @@ -893,13 +895,13 @@ } else { //When the OITF does not maintain channel list or favourite list by itself - timeout(0) + this._timeout() .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 10]))); } } else { //When this method is called in play state UNREALIZED - timeout(0) + this._timeout() .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); } }

1 0

r1014 - oipf/js/test
by ygrego＠users.nuiton.org 01 Apr '15

01 Apr '15

Author: ygrego Date: 2015-04-01 12:12:09 +0000 (Wed, 01 Apr 2015) New Revision: 1014 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1014 Log: Modification of method "onChangeState", addition of block "if else" in main block "else" method and some comments for the method. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 10:30:55 UTC (rev 1013) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 12:12:09 UTC (rev 1014) @@ -72,7 +72,17 @@ // this.vidBroadObj.release(); //Useful for test on tv plateform this.vidBroadObj.removeEventListener("PlayStateChange", this.onPlayStateChange); }, - + + /* + * + * @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; @@ -90,7 +100,14 @@ } } else { - reject("Invalid state"); + // + if (begin == this.CONNECTING + && this.transitions.length == this.currentIndex + 1) { + reject("Untestable case for the moment."); + } else { + reject("Invalid state"); + } + } },

1 0