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

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

01 Apr '15

Author: ygrego Date: 2015-04-01 16:08:05 +0000 (Wed, 01 Apr 2015) New Revision: 1033 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1033 Log: Start implementation of method "testSetChannelInPresentingWithUnsupportedChannel". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 16:01:22 UTC (rev 1032) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 16:08:05 UTC (rev 1033) @@ -791,5 +791,27 @@ this.vidBroadObj.bindToCurrentChannel(); + }, + + testSetChannelInPresentingWithUnsupportedChannel: function(resolve, reject) { + var self = this; + + this.channel = this.getChannel( + this.vidBroadObj.getChannelConfig().channelList); + + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + self.vidBroadObj.stop(); + }); + + this.addTransition(this.PRESENTING, this.STOPPED, function() { + self.vidBroadObj.setChannel(channel); + }); + + this.addTransition(this.STOPPED, this.UNREALIZED, resolve); + + this.vidBroadObj.bindToCurrentChannel(); + } }); \ No newline at end of file

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 16:01:22 +0000 (Wed, 01 Apr 2015) New Revision: 1032 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1032 Log: Change "object" by "this" in "_channelSwitch". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-04-01 15:47:24 UTC (rev 1031) +++ oipf/js/impl/VideoBroadcastObject.js 2015-04-01 16:01:22 UTC (rev 1032) @@ -886,13 +886,13 @@ this._timeout() .then(this.changeStateToConnectingWhenSwitching.bind(this, channelToChange)); } else if (channelToChange.idType == 40 || channelToChange.idType == 41) { - this._timeout() - .then(object._fireEvent.bind(object, createCustomEvent("ChannelChangeError", [null, 8]))); - } else { - - this._timeout() - .then(object._fireEvent.bind(object, 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]))); + } }

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 15:47:24 +0000 (Wed, 01 Apr 2015) New Revision: 1031 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1031 Log: Addition of class property "channel" in constructor and deletion of class property "errorMap". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 15:39:21 UTC (rev 1030) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 15:47:24 UTC (rev 1031) @@ -35,25 +35,6 @@ }, - errorMap: { - - 0: "Channel not supported by tuner.", - 1: "Cannot tune to given transport stream (e.g. no signal).", - 2: "Tuner locked by other object.", - 3: "Parental lock on channel.", - 4: "Encrypted channel, key/module missing.", - 5: "Unknown channel (e.g. canâ€™t resolve DVB or ISDB triplet).", - 6: "Channel switch interrupted (e.g. because another channel switch was activated before the previous one completed).", - 7: "Channel cannot be changed, because it is currently being recorded.", - 8: "Cannot resolve URI of referenced IP channel.", - 9: "Insufficient bandwidth.", - 10: "Channel cannot be changed by nextChannel()/prevChannel() methods either because the OITF does not maintain a favourites or channel list or because the video/broadcast object is in the Unrealized state.", - 11: "Insufficient resources are available to present the given channel (e.g. a lack of available codec resources).", - 12: "Specified channel not found in transport stream.", - 100: "Unidentified error." - - }, - init: function() { }, @@ -65,6 +46,7 @@ this.transitions = []; this.previousState = this.vidBroadObj.playState; this.currentIndex = 0; + this.channel = null; logTest("State: Pending"); },

1 0

r1030 - oipf/css
by ygrego＠users.nuiton.org 01 Apr '15

01 Apr '15

Author: ygrego Date: 2015-04-01 15:39:21 +0000 (Wed, 01 Apr 2015) New Revision: 1030 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1030 Log: Change function argument "nth-child". Modified: oipf/css/test.css Modified: oipf/css/test.css =================================================================== --- oipf/css/test.css 2015-04-01 15:36:49 UTC (rev 1029) +++ oipf/css/test.css 2015-04-01 15:39:21 UTC (rev 1030) @@ -66,7 +66,7 @@ background-color: gainsboro; } -table tbody td:nth-child(5) { +table tbody td:nth-child(1) { text-align: center; }

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 15:36:49 +0000 (Wed, 01 Apr 2015) New Revision: 1029 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1029 Log: The method "displayInLineArray" has been modified in order to column "Launching" be the first one when "test.html" will display. Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-01 15:28:17 UTC (rev 1028) +++ oipf/js/test/Test.js 2015-04-01 15:36:49 UTC (rev 1029) @@ -367,25 +367,25 @@ content += "<tbody>"; content += "<thead>"; content += "<tr>"; + content += "<th>Lauching</th>"; content += "<th>Tested Method</th>"; content += "<th>Label</th>"; content += "<th>Test duration</th>"; content += "<th>Result</th>"; - content += "<th>Lauching</th>"; content += "</tr>"; content += "</thead>"; - + var currentObject = testsObjects[i]; var tests = currentObject["tests"]; for (var j = 0; j < tests.length; j++) { var currentTest = tests[j]; content += "<tr id='" + currentTest["method"] + "'>"; + content += "<td><button id='" + currentTest["method"] + "Btn" + "'>Run</button></td>"; content += "<td>" + currentTest["method"] + "</td>"; content += "<td>" + currentTest["label"] + "</td>"; content += "<td id='" + currentTest["method"] + "Duration'>None</td>"; content += "<td id='" + currentTest["method"] + "Result'>None</td>"; - content += "<td><button id='" + currentTest["method"] + "Btn" + "'>Run</button></td>"; content += "</tr>"; } content += "</tbody>";

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 15:28:17 +0000 (Wed, 01 Apr 2015) New Revision: 1028 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1028 Log: All wanted transitions have been set in method "testSetChannelInStopped" and the variable "channel" has been initialized. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 15:08:17 UTC (rev 1027) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 15:28:17 UTC (rev 1028) @@ -702,6 +702,7 @@ this.vidBroadObj.bindToCurrentChannel(); }, + testSetChannelInConnectingWithNull: function(resolve, reject) { var self = this; @@ -742,6 +743,7 @@ this.vidBroadObj.bindToCurrentChannel(); }, + testSetChannelInPresentingWithNull: function(resolve, reject) { var self = this; @@ -760,13 +762,20 @@ testSetChannelInStopped: function(resolve, reject) { var self = this; + this.channel = this.getChannel( + this.vidBroadObj.getChannelConfig().channelList); + this.addTransition(this.UNREALIZED, this.CONNECTING); this.addTransition(this.CONNECTING, this.PRESENTING, function() { + self.vidBroadObj.stop(); + }); + + this.addTransition(this.PRESENTING, this.STOPPED, function() { self.vidBroadObj.setChannel(self.channel); }); - this.addTransition(this.PRESENTING, this.CONNECTING); + this.addTransition(this.STOPPED, this.CONNECTING); this.addTransition(this.CONNECTING, this.PRESENTING); this.vidBroadObj.onChannelChangeSucceeded = function(channel) { @@ -782,6 +791,7 @@ this.vidBroadObj.bindToCurrentChannel(); }, + testSetChannelInStoppedWithNull: function(resolve, reject) { var self = this;

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 15:08:17 +0000 (Wed, 01 Apr 2015) New Revision: 1027 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1027 Log: Setting of variable "channel". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 14:49:53 UTC (rev 1026) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 15:08:17 UTC (rev 1027) @@ -717,6 +717,9 @@ testSetChannelInPresenting: function(resolve, reject) { var self = this; + this.channel = this.getChannel( + this.vidBroadObj.getChannelConfig().channelList); + this.addTransition(this.UNREALIZED, this.CONNECTING); this.addTransition(this.CONNECTING, this.PRESENTING, function() {

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 14:49:53 +0000 (Wed, 01 Apr 2015) New Revision: 1026 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1026 Log: Addition of method "getChannel", and modification of method "testSetChannelInConnecting" which use this new method. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 14:34:56 UTC (rev 1025) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 14:49:53 UTC (rev 1026) @@ -73,6 +73,12 @@ this.vidBroadObj.removeEventListener("PlayStateChange", this.onPlayStateChange); }, + getChannel: function(channelCollection){ + if (channelCollection.length != 0) { + return channelCollection[0]; + } + return null; + }, /* * * @param {type} resolve @@ -674,6 +680,9 @@ testSetChannelInConnecting: function(resolve, reject) { var self = this; + this.channel = this.getChannel( + this.vidBroadObj.getChannelConfig().channelList); + this.addTransition(this.UNREALIZED, this.CONNECTING, function() { self.vidBroadObj.setChannel(self.channel); });

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 14:34:56 +0000 (Wed, 01 Apr 2015) New Revision: 1025 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1025 Log: Rename the method. Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-04-01 14:29:05 UTC (rev 1024) +++ oipf/js/impl/VideoBroadcastObject.js 2015-04-01 14:34:56 UTC (rev 1025) @@ -287,7 +287,7 @@ * in section 7.13.9. The method SHALL return the value null if the channel list is not * (partially) managed by the OITF (i.e., if the channel list information is managed entirely in the network). */ - getChannelConfigr: function() { + getChannelConfig: function() { return oipfObjectFactory.createChannelConfig(); },

1 0

r1024 - oipf/js/initObj
by ygrego＠users.nuiton.org 01 Apr '15

01 Apr '15

Author: ygrego Date: 2015-04-01 14:29:05 +0000 (Wed, 01 Apr 2015) New Revision: 1024 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1024 Log: Conditional declaration of global variable "oipfObjectFactory". Modified: oipf/js/initObj/init.js Modified: oipf/js/initObj/init.js =================================================================== --- oipf/js/initObj/init.js 2015-04-01 13:53:09 UTC (rev 1023) +++ oipf/js/initObj/init.js 2015-04-01 14:29:05 UTC (rev 1024) @@ -52,7 +52,8 @@ "N/A" //reserved_future_use ]; -var oipfObjectFactory = new OipfObjectFactory(); - +if (!oipfObjectFactory) { + var oipfObjectFactory = new OipfObjectFactory(); +} var metadata = data;

1 0