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

r1044 - oipf/js/test
by ygrego＠users.nuiton.org 02 Apr '15

02 Apr '15

Author: ygrego Date: 2015-04-02 07:59:59 +0000 (Thu, 02 Apr 2015) New Revision: 1044 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1044 Log: Put argument "resolve" in call of method "addTransitionWithError" in method "testBindToCurrentChannelInStoppedWhenNoTuner". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-02 07:57:07 UTC (rev 1043) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-02 07:59:59 UTC (rev 1044) @@ -232,7 +232,7 @@ self.vidBroadObj.bindToCurrentChannel(); }); - this.addTransitionWithError(this.STOPPED, this.STOPPED, 0); + this.addTransitionWithError(this.STOPPED, this.STOPPED, 0, resolve); this.vidBroadObj.bindToCurrentChannel(); },

1 0

r1043 - oipf/js/test
by ygrego＠users.nuiton.org 02 Apr '15

02 Apr '15

Author: ygrego Date: 2015-04-02 07:57:07 +0000 (Thu, 02 Apr 2015) New Revision: 1043 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1043 Log: Put argument "resolve" in call of method "addTransitionWithError" in method "testBindToCurrentChannelWhenNoChannelPresentation". Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-02 07:50:27 UTC (rev 1042) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-02 07:57:07 UTC (rev 1043) @@ -134,7 +134,7 @@ //Subject to modification not rigth way failed on the tv plateform. this.vidBroadObj._channelService.currentChannel = null; - this.addTransitionWithError(this.UNREALIZED, this.UNREALIZED, 100); + this.addTransitionWithError(this.UNREALIZED, this.UNREALIZED, 100, resolve); this.vidBroadObj.bindToCurrentChannel(); },

1 0

r1042 - oipf/js/test
by ygrego＠users.nuiton.org 02 Apr '15

02 Apr '15

Author: ygrego Date: 2015-04-02 07:50:27 +0000 (Thu, 02 Apr 2015) New Revision: 1042 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1042 Log: No "reject" called in method "onchangeState" when there is a error. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 22:18:29 UTC (rev 1041) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-02 07:50:27 UTC (rev 1042) @@ -78,15 +78,9 @@ var error = currentTransition.error; console.log(this.vidBroadObj.playState); if (begin == this.previousState && end == newState && error == errorCode) { - if (this.errorMap[errorCode]) { - console.log(this.errorMap[errorCode]); - reject(this.errorMap[errorCode]); - } else { - currentTransition.callback && currentTransition.callback(); - this.previousState = newState; - this.currentIndex++; - } - + currentTransition.callback && currentTransition.callback(); + this.previousState = newState; + this.currentIndex++; } else { // if (begin == this.CONNECTING

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 22:18:29 +0000 (Wed, 01 Apr 2015) New Revision: 1041 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1041 Log: New tests "testNextChannelInUnrealized", "testNextChannelInConnecting", "testNextChannelInPresenting", "testNextChannelInStopped" have been added. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 22:15:02 UTC (rev 1040) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 22:18:29 UTC (rev 1041) @@ -353,13 +353,37 @@ // // }, - /* - * Description: - * Nominal Case - */ - testNextChannel: function(resolve, reject) { + testNextChannelInUnrealized: function(resolve, reject) { + this.vidBroadObj.nextChannel(); + }, + + testNextChannelInConnecting: function(resolve, reject) { var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING, function() { + self.vidBroadObj.nextChannel(); + }); + this.addTransition(this.CONNECTING, this.CONNECTING); + + this.addTransition(this.PRESENTING, this.CONNECTING); + + this.vidBroadObj.onChannelChangeSucceeded = function(channel) { + + if (self.assertNotNull(channel) && self.assertEquals(this.vidBroadObj, this.PRESENTING)) { + logTest("State: Successful"); + resolve("Successfull"); + } else { + logTest("State: Failure"); + reject("Failure : The channel is null for a unknown reason or wrong play state."); + } + }; + + this.vidBroadObj.bindToCurrentChannel(); + + }, + + testNextChannelInPresenting: function(resolve, reject) { + var self = this; this.addTransition(this.UNREALIZED, this.CONNECTING); this.addTransition(this.CONNECTING, this.PRESENTING, function() { @@ -380,8 +404,26 @@ reject("Failure : The channel is null for a unknown reason or wrong play state."); } }; - this.addTransition(this.PRESENTING, this.CONNECTING); + + this.vidBroadObj.bindToCurrentChannel(); + }, + + testNextChannelInStopped: function(resolve, reject) { + var self = this; + + 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.nextChannel(); + }); + + this.addTransition(this.STOPPED, this.CONNECTING); + this.addTransition(this.CONNECTING, this.PRESENTING); this.vidBroadObj.onChannelChangeSucceeded = function(channel) { @@ -395,8 +437,8 @@ } }; - this.vidBroadObj.prevChannel(); this.vidBroadObj.bindToCurrentChannel(); + }, // testNextChannel: function(resolve, reject) {

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 22:15:02 +0000 (Wed, 01 Apr 2015) New Revision: 1040 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1040 Log: New tests "testNextChannelInUnrealized", "testNextChannelInConnecting", "testNextChannelInPresenting", "testNextChannelInStopped" have been added in property "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-01 21:48:49 UTC (rev 1039) +++ oipf/js/test/Test.js 2015-04-01 22:15:02 UTC (rev 1040) @@ -217,10 +217,22 @@ method: "testPrevChannelInStopped" }, { - label: "Switch to next channel in channel list.", - method:"testNextChannel" + label: "Switch to next channel in unrealized state.", + method: "testNextChannelInUnrealized" }, { + label: "Switch to next channel in connecting state.", + method: "testNextChannelInConnecting" + }, + { + label: "Switch to next channel in presenting state.", + method: "testNextChannelInPresenting" + }, + { + label: "Switch to next channel in stopped state.", + method: "testNextChannelInStopped" + }, + { label: "Release any tuner and/or ressources held by a video broadcast object in connecting.", method: "testReleaseInConnecting" },

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 21:48:49 +0000 (Wed, 01 Apr 2015) New Revision: 1039 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1039 Log: New tests "testPrevChannelInConnecting", "testPrevChannelInPresenting", "testPrevChannelInStopped" have been added in "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-01 21:46:55 UTC (rev 1038) +++ oipf/js/test/Test.js 2015-04-01 21:48:49 UTC (rev 1039) @@ -201,14 +201,22 @@ method: "testDoubleBindToCurrentChannel" }, { - label: "Switch to precedent channel in channel list.", - method: "testPrevChannel" - }, - { label: "Switch to precedent channel in unrealized state.", method: "testPrevChannelInUnrealized" }, { + label: "Switch to precedent channel in connecting state.", + method: "testPrevChannelInConnecting" + }, + { + label: "Switch to precedent channel in presenting state.", + method: "testPrevChannelInPresenting" + }, + { + label: "Switch to precedent channel in stopped state.", + method: "testPrevChannelInStopped" + }, + { label: "Switch to next channel in channel list.", method:"testNextChannel" },

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 21:46:55 +0000 (Wed, 01 Apr 2015) New Revision: 1038 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1038 Log: New tests "testPrevChannelInConnecting", "testPrevChannelInPresenting", "testPrevChannelInStopped" have been added. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-04-01 21:17:34 UTC (rev 1037) +++ oipf/js/test/VideoBroadcastTest.js 2015-04-01 21:46:55 UTC (rev 1038) @@ -242,12 +242,38 @@ this.vidBroadObj.bindToCurrentChannel(); }, - /* - * Description: - * Nominal Case - */ - testPrevChannel: function(resolve, reject) { + + testPrevChannelInUnrealized: function(resolve, reject) { + this.vidBroadObj.prevChannel(); + }, + + testPrevChannelInConnecting: function(resolve, reject) { var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING, function() { + self.vidBroadObj.prevChannel(); + }); + + this.addTransition(this.CONNECTING, this.CONNECTING); + + this.addTransition(this.PRESENTING, this.CONNECTING); + + this.vidBroadObj.onChannelChangeSucceeded = function(channel) { + + if (self.assertNotNull(channel) && self.assertEquals(this.vidBroadObj, this.PRESENTING)) { + logTest("State: Successful"); + resolve("Successfull"); + } else { + logTest("State: Failure"); + reject("Failure : The channel is null for a unknown reason or wrong play state."); + } + }; + + this.vidBroadObj.bindToCurrentChannel(); + + }, + + testPrevChannelInPresenting: function(resolve, reject) { + var self = this; this.addTransition(this.UNREALIZED, this.CONNECTING); this.addTransition(this.CONNECTING, this.PRESENTING, function() { @@ -273,6 +299,38 @@ }, + testPrevChannelInStopped: function(resolve, reject) { + var self = this; + + 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.prevChannel(); + }); + + this.addTransition(this.STOPPED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING); + + this.vidBroadObj.onChannelChangeSucceeded = function(channel) { + + if (self.assertNotNull(channel) && self.assertEquals(this.vidBroadObj, this.PRESENTING)) { + logTest("State: Successful"); + resolve("Successfull"); + } else { + logTest("State: Failure"); + reject("Failure : The channel is null for a unknown reason or wrong play state."); + } + }; + + this.vidBroadObj.bindToCurrentChannel(); + + }, + // testPrevChannel: function(resolve, reject) { // var self = this; //

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 21:17:34 +0000 (Wed, 01 Apr 2015) New Revision: 1037 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1037 Log: New test "testPrevChannelInUnrealized" added. Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-01 20:43:06 UTC (rev 1036) +++ oipf/js/test/Test.js 2015-04-01 21:17:34 UTC (rev 1037) @@ -205,6 +205,10 @@ method: "testPrevChannel" }, { + label: "Switch to precedent channel in unrealized state.", + method: "testPrevChannelInUnrealized" + }, + { label: "Switch to next channel in channel list.", method:"testNextChannel" },

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 20:43:06 +0000 (Wed, 01 Apr 2015) New Revision: 1036 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1036 Log: Set delay to 900 milliseconds for timeout verifying if the current test has returned a result. Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-01 20:19:21 UTC (rev 1035) +++ oipf/js/test/Test.js 2015-04-01 20:43:06 UTC (rev 1036) @@ -406,7 +406,7 @@ var result = false; return new Promise(function(resolve, reject) { try { - timeout(5000) + timeout(200) .then(reject.bind(this, "No result returned.")) .then(function() { !result

1 0

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

01 Apr '15

Author: ygrego Date: 2015-04-01 20:19:21 +0000 (Wed, 01 Apr 2015) New Revision: 1035 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1035 Log: Deletion of block "else" attached with block "if" concerning verification of play state in method "_channelSwitch". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-04-01 19:44:30 UTC (rev 1034) +++ oipf/js/impl/VideoBroadcastObject.js 2015-04-01 20:19:21 UTC (rev 1035) @@ -902,10 +902,6 @@ .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 10]))); } - } else { - //When this method is called in play state UNREALIZED - this._timeout() - .then(this._fireEvent.bind(this, createCustomEvent("ChannelChangeError", [null, 100]))); - } + } } }); \ No newline at end of file

1 0