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

r834 - oipf/js/impl
by ygrego＠users.nuiton.org 19 Feb '15

19 Feb '15

Author: ygrego Date: 2015-02-19 15:29:08 +0000 (Thu, 19 Feb 2015) New Revision: 834 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/834 Log: Implementation of method "getChannelConfig". Modified: oipf/js/impl/VideoBroadcastObject.js Modified: oipf/js/impl/VideoBroadcastObject.js =================================================================== --- oipf/js/impl/VideoBroadcastObject.js 2015-02-19 14:58:57 UTC (rev 833) +++ oipf/js/impl/VideoBroadcastObject.js 2015-02-19 15:29:08 UTC (rev 834) @@ -265,7 +265,7 @@ * (partially) managed by the OITF (i.e., if the channel list information is managed entirely in the network). */ getChannelConfig: function() { - + return oipfObjectFactory.createChannelConfig(); }, /*

1 0

r833 - oipf/js/test
by ygrego＠users.nuiton.org 19 Feb '15

19 Feb '15

Author: ygrego Date: 2015-02-19 14:58:57 +0000 (Thu, 19 Feb 2015) New Revision: 833 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/833 Log: Addition of delimeter in console display of running tests. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-02-19 14:55:01 UTC (rev 832) +++ oipf/js/test/SearchManagerTest.js 2015-02-19 14:58:57 UTC (rev 833) @@ -10,6 +10,8 @@ }, testInstanceCreation: function (resolve, reject) { var state = "Pending"; + console.log("***************************************************************************************************************************"); + console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state); this.searchManagerTest = oipfObjectFactory.createSearchManagerObject(); @@ -22,10 +24,14 @@ console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state); reject(new Error(state)); } + console.log("***************************************************************************************************************************"); + }, testGetCurrentProgram: function (resolve, reject) { var searchManagerObject = oipfObjectFactory.createSearchManagerObject(); var stat = "Pending"; + console.log("***************************************************************************************************************************"); + console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat); var self = this; @@ -63,6 +69,8 @@ console.log("Unknow state"); } + console.log("***************************************************************************************************************************"); + }; var channelConfig = oipfObjectFactory.createChannelConfig();

1 0

r832 - oipf/js/test
by ygrego＠users.nuiton.org 19 Feb '15

19 Feb '15

Author: ygrego Date: 2015-02-19 14:55:01 +0000 (Thu, 19 Feb 2015) New Revision: 832 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/832 Log: Deletion of operator "===" in condition test of "if instruction". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-02-19 14:44:16 UTC (rev 831) +++ oipf/js/test/SearchManagerTest.js 2015-02-19 14:55:01 UTC (rev 832) @@ -13,7 +13,7 @@ console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state); this.searchManagerTest = oipfObjectFactory.createSearchManagerObject(); - if ((this.assertNotNull(this.searchManagerTest) === true) && (this.assertNotUndefined(this.searchManagerTest))) { + if (this.assertNotNull(this.searchManagerTest) && this.assertNotUndefined(this.searchManagerTest)) { state = "Successfull"; console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state); resolve(state); @@ -36,7 +36,7 @@ switch (state) { case 0: - if (self.assertNotNull(search.result[0]) === true) { + if (self.assertNotNull(search.result[0])) { stat = "Success"; console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat); resolve("Success");

1 0

r831 - oipf/js/test
by ygrego＠users.nuiton.org 19 Feb '15

19 Feb '15

Author: ygrego Date: 2015-02-19 14:44:16 +0000 (Thu, 19 Feb 2015) New Revision: 831 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/831 Log: Deletion of operator "===" in condition test of "if instruction". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-02-19 14:41:17 UTC (rev 830) +++ oipf/js/test/Test.js 2015-02-19 14:44:16 UTC (rev 831) @@ -4,54 +4,52 @@ * and open the template in the editor. */ var Test = Class.extend({ - testsObjects: [/*{ - name : "VideoBroadcastTest", - object: new VideoBroadcastTest(), - tests: [ - { - id: "vbTestInstanceCreation", - label: "Object creation.", - method: "testInstanceCreation", - impl: true - }, - { - id: "vbTestBindToCurrentChannel", - label: "Bind the current channel stream with a video broadcast object.", - method:"bindToCurrentChannel", - impl: true - }, - { - id: "vbTestPrevChannel", - label: "Switch to precedent channel in channel list.", - method: "testPrevChannel", - impl: false - }, - { - id: "vbTestNextChannel", - label: "Switch to next channel in channel list.", - method:"testNextChannel", - impl: false - } - ] - },*/ - { - name: "SearchManagerTest", - object: new SearchManagerTest(), - tests: [ - { - id: "smTestInstanceCreation", - label: "Object creation.", - method: "testInstanceCreation", - impl: true - }, - { - id: "smTestGetCurrentProgram", - label: "Obtain current program according to oipf norm.", - method: "testGetCurrentProgram", - impl: true - } - ] - }], + testsObjects: [{ + name : "VideoBroadcastTest", + object: new VideoBroadcastTest(), + tests: [ + { + id: "vbTestInstanceCreation", + label: "Object creation.", + method: "testInstanceCreation", + impl: true + }/*, + { + id: "vbTestBindToCurrentChannel", + label: "Bind the current channel stream with a video broadcast object.", + method:"bindToCurrentChannel", + impl: true + }, + { + id: "vbTestPrevChannel", + label: "Switch to precedent channel in channel list.", + method: "testPrevChannel", + impl: false + }, + { + id: "vbTestNextChannel", + label: "Switch to next channel in channel list.", + method:"testNextChannel", + impl: false + }*/ + ]},{ + name: "SearchManagerTest", + object: new SearchManagerTest(), + tests: [ + { + id: "smTestInstanceCreation", + label: "Object creation.", + method: "testInstanceCreation", + impl: true + }, + { + id: "smTestGetCurrentProgram", + label: "Obtain current program according to oipf norm.", + method: "testGetCurrentProgram", + impl: true + } + ] + }], init: function () { }, @@ -65,7 +63,7 @@ for (var j = 0; j < tests.length; j++) { var currentTest = tests[j]; - if (currentTest["impl"] === true) { + if (currentTest["impl"]) { this.updateTestResult(currentTest, object); } } @@ -90,7 +88,7 @@ var impl = currentTest["impl"]; content += "<div>Implementation State: " + impl + "</div>"; - if (impl === true) { + if (impl) { content += "<div id='" + currentTest["id"] + "Res" + "'>Result: Test has not been launch. Click on button \"Run\" below.</div>"; content += "<div><button id='" + currentTest["id"] + "Btn" + "'>Run</button></div>"; } else {

1 0

r830 - oipf/js/test
by ygrego＠users.nuiton.org 19 Feb '15

19 Feb '15

Author: ygrego Date: 2015-02-19 14:41:17 +0000 (Thu, 19 Feb 2015) New Revision: 830 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/830 Log: The method "testGetCurrentProgram" have been modified to use it in the creation of a promise object. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-02-19 14:13:39 UTC (rev 829) +++ oipf/js/test/VideoBroadcastTest.js 2015-02-19 14:41:17 UTC (rev 830) @@ -15,15 +15,14 @@ * This method test the initialization of video broadcast object. */ testInstanceCreation: function(resolve, reject) { - var state = "Pending"; - console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: "+state); + console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Pending"); this.videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); - if ((this.assertNotNull(this.videoBroadcastObject)) && (this.assertNotUndefined(this.videoBroadcastObject))) { - console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: "+state); + if (this.assertNotNull(this.videoBroadcastObject) && this.assertNotUndefined(this.videoBroadcastObject)) { + console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Successfull"); resolve("Successfull"); } else { - console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: "+state); + console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: Failure"); reject("Failure"); } }, @@ -32,17 +31,17 @@ * Descrtiption: * This method test the binding between the video broadcast object and the current program stream. */ - testBindToCurrentChannel: function() { - var state = "Pending"; - console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: "+state); + testBindToCurrentChannel: function(resolve, reject) { + console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Pending"); var currentChann = this.videoBroadcastObject.bindToCurrentChannel(); - - this.assertEquals(this.videoBroadcastObject.currentChannel, currentChann); - - state = "Finished"; - console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: "+state); - - return true; + + if (this.assertEquals(this.videoBroadcastObject.currentChannel, currentChann)) { + console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Successfull"); + resolve("Successfull"); + } else { + console.log("[TEST-RUNNING][Info] Id: vbTestBindToCurrentChannel, Label: Bind the current channel stream with a video broadcast objectBind the current channel stream with a video broadcast object, State: Failure"); + reject("Failure"); + } } }); \ No newline at end of file

1 0

r829 - oipf/js/test
by ygrego＠users.nuiton.org 19 Feb '15

19 Feb '15

Author: ygrego Date: 2015-02-19 14:13:39 +0000 (Thu, 19 Feb 2015) New Revision: 829 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/829 Log: Make the condition test of method "testInstanceCreation" simpler. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-02-19 14:05:34 UTC (rev 828) +++ oipf/js/test/VideoBroadcastTest.js 2015-02-19 14:13:39 UTC (rev 829) @@ -19,14 +19,12 @@ console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: "+state); this.videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); - if ((this.assertNotNull(this.searchManagerTest) === true) && (this.assertNotUndefined(this.searchManagerTest))) { - state = "Successfull"; + if ((this.assertNotNull(this.videoBroadcastObject)) && (this.assertNotUndefined(this.videoBroadcastObject))) { console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: "+state); - resolve(state); + resolve("Successfull"); } else { - state = "Failure"; console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: "+state); - reject(new Error(state)); + reject("Failure"); } },

1 0

r828 - oipf/js/test
by ygrego＠users.nuiton.org 19 Feb '15

19 Feb '15

Author: ygrego Date: 2015-02-19 14:05:34 +0000 (Thu, 19 Feb 2015) New Revision: 828 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/828 Log: Just return the evaluating between two elements for method "assertEquals" and the parameter for the methods "assertNotUndefined" and "assertNotNull". Modified: oipf/js/test/TestCase.js Modified: oipf/js/test/TestCase.js =================================================================== --- oipf/js/test/TestCase.js 2015-02-19 13:53:14 UTC (rev 827) +++ oipf/js/test/TestCase.js 2015-02-19 14:05:34 UTC (rev 828) @@ -9,52 +9,15 @@ }, assertNotUndefined : function(elmt) { - - try{ - if (elmt !== undefined) { - console.log("[INFO] Element are not undefined."); - return true; - } else { - throw new Error("The element is undefined."); - } - } catch (e) { - console.log(e); - return false; - - } - + return elmt; }, assertEquals: function(elmt1, elmt2) { - - try{ - if (elmt1 === elmt2) { - console.log("[INFO] Both elements are equals."); - return true; - } else { - throw new Error("Both elements are not equals."); - } - } catch (e) { - console.log(e); - return false; - - } + return elmt1 == elmt2; }, assertNotNull: function(elmt) { - - try{ - if (elmt !== null) { - console.log("[INFO] Element are not null."); - return true; - } else { - throw new Error("The element is null."); - } - } catch (e) { - console.log(e); - return false; - } - + return elmt; } });

1 0

r827 - oipf/js/test
by ygrego＠users.nuiton.org 19 Feb '15

19 Feb '15

Author: ygrego Date: 2015-02-19 13:53:14 +0000 (Thu, 19 Feb 2015) New Revision: 827 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/827 Log: Make "testInstanceCreation" acceptable to the creation of promise.(See Promise mdn) Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-02-19 13:22:19 UTC (rev 826) +++ oipf/js/test/VideoBroadcastTest.js 2015-02-19 13:53:14 UTC (rev 827) @@ -14,18 +14,20 @@ * Descrtiption: * This method test the initialization of video broadcast object. */ - testInstanceCreation: function() { + testInstanceCreation: function(resolve, reject) { var state = "Pending"; console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: "+state); this.videoBroadcastObject = oipfObjectFactory.createVideoBroadcastObject(); - this.assertNotNull(this.videoBroadcastObject); - this.assertNotUndefined(this.videoBroadcastObject); - - state = "Finished"; - console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: "+state); - - return true; + if ((this.assertNotNull(this.searchManagerTest) === true) && (this.assertNotUndefined(this.searchManagerTest))) { + state = "Successfull"; + console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: "+state); + resolve(state); + } else { + state = "Failure"; + console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: "+state); + reject(new Error(state)); + } }, /*

1 0

r826 - oipf/js/test
by ygrego＠users.nuiton.org 19 Feb '15

19 Feb '15

Author: ygrego Date: 2015-02-19 13:22:19 +0000 (Thu, 19 Feb 2015) New Revision: 826 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/826 Log: Modification of attribute "impl" into object "testsObjects". This attirbute take either true or false. Now we test on value true or false into method display. Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-02-18 17:28:54 UTC (rev 825) +++ oipf/js/test/Test.js 2015-02-19 13:22:19 UTC (rev 826) @@ -12,25 +12,25 @@ id: "vbTestInstanceCreation", label: "Object creation.", method: "testInstanceCreation", - impl: "Yes" + impl: true }, { id: "vbTestBindToCurrentChannel", label: "Bind the current channel stream with a video broadcast object.", method:"bindToCurrentChannel", - impl: "Yes" + impl: true }, { id: "vbTestPrevChannel", label: "Switch to precedent channel in channel list.", method: "testPrevChannel", - impl: "No" + impl: false }, { id: "vbTestNextChannel", label: "Switch to next channel in channel list.", method:"testNextChannel", - impl: "No" + impl: false } ] },*/ @@ -42,13 +42,13 @@ id: "smTestInstanceCreation", label: "Object creation.", method: "testInstanceCreation", - impl: "Yes" + impl: true }, { id: "smTestGetCurrentProgram", label: "Obtain current program according to oipf norm.", method: "testGetCurrentProgram", - impl: "Yes" + impl: true } ] }], @@ -65,7 +65,7 @@ for (var j = 0; j < tests.length; j++) { var currentTest = tests[j]; - if (currentTest["impl"] === "Yes") { + if (currentTest["impl"] === true) { this.updateTestResult(currentTest, object); } } @@ -90,7 +90,7 @@ var impl = currentTest["impl"]; content += "<div>Implementation State: " + impl + "</div>"; - if (impl === "Yes") { + if (impl === true) { content += "<div id='" + currentTest["id"] + "Res" + "'>Result: Test has not been launch. Click on button \"Run\" below.</div>"; content += "<div><button id='" + currentTest["id"] + "Btn" + "'>Run</button></div>"; } else {

1 0

r825 - oipf/js/test
by ygrego＠users.nuiton.org 18 Feb '15

18 Feb '15

Author: ygrego Date: 2015-02-18 17:28:54 +0000 (Wed, 18 Feb 2015) New Revision: 825 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/825 Log: Into method "runAll" call another method "updateTestResult" to avoid the closure issue about object currentTest used in call "promise.then" and "promise.catch". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-02-18 17:18:18 UTC (rev 824) +++ oipf/js/test/Test.js 2015-02-18 17:28:54 UTC (rev 825) @@ -66,14 +66,7 @@ for (var j = 0; j < tests.length; j++) { var currentTest = tests[j]; if (currentTest["impl"] === "Yes") { - //this.updateTestResult(currentTest, object); - var promise = new Promise(object[currentTest["method"]].bind(object)); - promise.then(function (val) { - document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val; - }); - promise.catch(function (val) { - document.getElementById(currentTest["id"] + "Res").textContent = "Result: " + val; - }); + this.updateTestResult(currentTest, object); } } }

1 0