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

r825 - oipf/js/test
by ygrego＠users.nuiton.org Feb. 18, 2015

Feb. 18, 2015

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

r824 - oipf/js/test
by ygrego＠users.nuiton.org Feb. 18, 2015

Feb. 18, 2015

Author: ygrego Date: 2015-02-18 17:18:18 +0000 (Wed, 18 Feb 2015) New Revision: 824 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/824 Log: Addition of return for each method. Modified: oipf/js/test/TestCase.js Modified: oipf/js/test/TestCase.js =================================================================== --- oipf/js/test/TestCase.js 2015-02-18 17:15:33 UTC (rev 823) +++ oipf/js/test/TestCase.js 2015-02-18 17:18:18 UTC (rev 824) @@ -13,11 +13,13 @@ 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; } @@ -28,11 +30,13 @@ 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; } }, @@ -42,12 +46,13 @@ 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; } }

1 0

r823 - oipf/js/test
by ygrego＠users.nuiton.org Feb. 18, 2015

Feb. 18, 2015

Author: ygrego Date: 2015-02-18 17:15:33 +0000 (Wed, 18 Feb 2015) New Revision: 823 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/823 Log: Usage of method resolve and reject in tests methods to set promises and return information in asynchrone method. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-02-18 17:13:47 UTC (rev 822) +++ oipf/js/test/SearchManagerTest.js 2015-02-18 17:15:33 UTC (rev 823) @@ -4,43 +4,47 @@ * */ var SearchManagerTest = TestCase.extend({ - - searchManagerTest: null, - - init: function() { - - }, - - testInstanceCreation: function() { - var state = "Pending"; - console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: "+state); - this.searchManagerTest = oipfObjectFactory.createSearchManagerObject(); - - this.assertNotNull(this.searchManagerTest); - this.assertNotUndefined(this.searchManagerTest); - - state = "Finished"; - console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: "+state); - - return true; - }, - - testGetCurrentProgram: function(searchTarget, channel, startTime, offset, count) { - var searchManagerObject = oipfObjectFactory.createSearchManagerObject(); - var stat = "Pending"; - console.log("[TEST-RUNNING][Info] "+"Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: "+stat); - searchManagerObject.onMetadataSearch = function(search, state) { + searchManagerTest: null, + init: function () { + }, + testInstanceCreation: function (resolve, reject) { + var state = "Pending"; + 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))) { + state = "Successfull"; + console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state); + resolve(state); + } else { + state = "Failure"; + console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state); + reject(new Error(state)); + } + }, + testGetCurrentProgram: function (resolve, reject) { + var searchManagerObject = oipfObjectFactory.createSearchManagerObject(); + var stat = "Pending"; + console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat); + var self = this; + + searchManagerObject.onMetadataSearch = function (search, state) { + console.log("[INFO]: onMetadataSearch called"); - switch(state) { + switch (state) { case 0: - - console.log("[INFO] Result found."); - //console.log(search.result[0]); - stat = "Finished"; - console.log("[TEST-RUNNING][Info] "+"Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: "+stat); + if (self.assertNotNull(search.result[0]) === true) { + stat = "Success"; + console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat); + resolve("Success"); + } else { + stat = "Failed"; + console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat); + reject(new Error("Failed")); + } break; case 3: @@ -59,13 +63,17 @@ console.log("Unknow state"); } - return true; }; + var channelConfig = oipfObjectFactory.createChannelConfig(); + var searchTarget = 1; var metaDataSearch = searchManagerObject.createSearch(searchTarget); + var startTime = null; metaDataSearch.findProgrammesFromStream(channelConfig.currentChannel, startTime); + var offset = 0; + var count = 1; metaDataSearch.result.getResults(offset, count); - //metaDataSearch.result[0];Must return undefined else wrong behaviour of this method + //metaDataSearch.result[0];Must return undefined else wrong behaviour of this method } - + }); \ No newline at end of file

1 0

r822 - oipf/js/test
by ygrego＠users.nuiton.org Feb. 18, 2015

Feb. 18, 2015

Author: ygrego Date: 2015-02-18 17:13:47 +0000 (Wed, 18 Feb 2015) New Revision: 822 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/822 Log: Addition of promise interface to manage display of tests results. Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-02-17 17:12:23 UTC (rev 821) +++ oipf/js/test/Test.js 2015-02-18 17:13:47 UTC (rev 822) @@ -4,119 +4,124 @@ * 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: "Yes" - }, - { - id : "vbTestBindToCurrentChannel", - label : "Bind the current channel stream with a video broadcast object.", - method :"bindToCurrentChannel", - impl: "Yes" - }, - { - id : "vbTestPrevChannel", - label : "Switch to precedent channel in channel list.", - method :"testPrevChannel", - impl: "No" - }, - { - id : "vbTestNextChannel", - label : "Switch to next channel in channel list.", - method :"testNextChannel", - impl: "No" + testsObjects: [/*{ + name : "VideoBroadcastTest", + object: new VideoBroadcastTest(), + tests: [ + { + id: "vbTestInstanceCreation", + label: "Object creation.", + method: "testInstanceCreation", + impl: "Yes" + }, + { + id: "vbTestBindToCurrentChannel", + label: "Bind the current channel stream with a video broadcast object.", + method:"bindToCurrentChannel", + impl: "Yes" + }, + { + id: "vbTestPrevChannel", + label: "Switch to precedent channel in channel list.", + method: "testPrevChannel", + impl: "No" + }, + { + id: "vbTestNextChannel", + label: "Switch to next channel in channel list.", + method:"testNextChannel", + impl: "No" + } + ] + },*/ + { + name: "SearchManagerTest", + object: new SearchManagerTest(), + tests: [ + { + id: "smTestInstanceCreation", + label: "Object creation.", + method: "testInstanceCreation", + impl: "Yes" + }, + { + id: "smTestGetCurrentProgram", + label: "Obtain current program according to oipf norm.", + method: "testGetCurrentProgram", + impl: "Yes" + } + ] + }], + init: function () { + + }, + runAll: function () { + for (var i = 0; i < this.testsObjects.length; i++) { + var element = this.testsObjects[i]; + + var object = element["object"]; + + var tests = element["tests"]; + + 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; + }); + } } - ] - },*/ - { - name : "SearchManagerTest", - object : new SearchManagerTest(), - tests : [ - { - id : "smTestInstanceCreation", - label : "Object creation.", - method : "testInstanceCreation", - impl : "Yes" - }/*, - { - id : "smTestGetCurrentProgram", - label : "Obtain current program according to oipf norm.", - method :"testGetCurrentProgram", - impl : "Yes" - }*/ - ] - }], - - init: function() { + } + }, + //Use the innerHTML property to achieve display + display: function () { + var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button></div>"; + var testsObjects = this.testsObjects; + for (var i = 0; i < testsObjects.length; i++) { - }, - - runAll: function() { - - console.log("Result", this); - for (var i = 0; i<this.testsObjects.length; i++) { - var element = this.testsObjects[i]; - var object = element["object"]; - var tests = element["tests"]; - for(var j = 0; j<tests.length; j++) { - - var currentTest = tests[j]; - if (currentTest["impl"] === "Yes") { - if (object[currentTest["method"]]() === true) { - document.getElementById(currentTest["id"]+"Res").innerHTML = "Result: Successful"; - } else { - document.getElementById(currentTest["id"]+"Res").innerHTML = "Result: Failure"; - } - } - - } - - - - } - }, - - //Use the innerHTML property to achieve display - display: function() { - var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button></div>"; - var testsObjects = this.testsObjects; - for (var i = 0; i<testsObjects.length; i++) { - - var currentObject = testsObjects[i]; - var sectionName = currentObject["name"]; - content += "<div id='"+sectionName+"'>"; - var tests = currentObject["tests"]; - for (var j = 0; j<tests.length; j++) { - - var currentTest = tests[j]; - content += "<div id='"+currentTest["id"]+"'>"; - content += "<div>Label: "+currentTest["label"]+"</div>"; - content += "<div>Tested method: "+currentTest["method"]+"</div>"; - var impl = currentTest["impl"]; - content += "<div>Implementation State: "+impl+"</div>"; - - if (impl === "Yes") { - 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 { - content += "<div id='"+currentTest["id"]+"Res"+"'>Result: Any result will be available for the moment, test has not been implemented.</div>"; - content += "<div><button id='"+currentTest["id"]+"Btn"+"' disabled>Run</button></div>"; - } - content += "</div>"; - } - content += "</div>"; - } - content += "</div>"; - document.body.innerHTML = content; - } - + var currentObject = testsObjects[i]; + var sectionName = currentObject["name"]; + content += "<div id='" + sectionName + "'>"; + var tests = currentObject["tests"]; + for (var j = 0; j < tests.length; j++) { + + var currentTest = tests[j]; + content += "<div id='" + currentTest["id"] + "'>"; + content += "<div>Label: " + currentTest["label"] + "</div>"; + content += "<div>Tested method: " + currentTest["method"] + "</div>"; + var impl = currentTest["impl"]; + content += "<div>Implementation State: " + impl + "</div>"; + + if (impl === "Yes") { + 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 { + content += "<div id='" + currentTest["id"] + "Res" + "'>Result: Any result will be available for the moment, test has not been implemented.</div>"; + content += "<div><button id='" + currentTest["id"] + "Btn" + "' disabled>Run</button></div>"; + } + content += "</div>"; + } + content += "</div>"; + } + content += "</div>"; + document.body.innerHTML = content; + }, + updateTestResult: function (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; + }); + } + });

1 0

r821 - oipf/view
by ygrego＠users.nuiton.org Feb. 17, 2015

Feb. 17, 2015

Author: ygrego Date: 2015-02-17 17:12:23 +0000 (Tue, 17 Feb 2015) New Revision: 821 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/821 Log: Addition of js files necessary to well working of html page. Modified: oipf/view/test.html Modified: oipf/view/test.html =================================================================== --- oipf/view/test.html 2015-02-17 17:07:37 UTC (rev 820) +++ oipf/view/test.html 2015-02-17 17:12:23 UTC (rev 821) @@ -10,28 +10,34 @@ <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link rel="stylesheet" type="text/css" href="css/test.css"/> + <script src="../js/lib/Class.js" type="text/javascript"></script> + <script src="../js/lib/Collection.js" type="text/javascript"></script> + <script src="../data/data.js" type="text/javascript"></script> + <script src="../js/impl/model/Query.js" type="text/javascript"></script> + <script src="../js/impl/model/constants/VideoBroadcastConstants.js" type="text/javascript"></script> + <script src="../js/impl/model/Channel.js" type="text/javascript"></script> + <script src="../js/impl/model/ChannelList.js" type="text/javascript"></script> + <script src="../js/impl/model/MetadataSearch.js" type="text/javascript"></script> + <script src="../js/impl/model/SearchResults.js" type="text/javascript"></script> + <script src="../js/impl/OipfObjectFactory.js" type="text/javascript"></script> + <script src="../js/impl/ChannelConfig.js" type="text/javascript"></script> + <script src="../js/lib/Class.js" type="text/javascript"></script> + <script src="../js/impl/VideoBroadcastObject.js" type="text/javascript"></script> + <script src="../js/impl/SearchManagerObject.js" type="text/javascript"></script> + <script src="../js/test/TestCase.js" type="text/javascript"></script> + <script src="../js/test/SearchManagerTest.js" type="text/javascript"></script> + <script src="../js/test/VideoBroadcastTest.js" type="text/javascript"></script> + <script src="../js/test/Test.js" type="text/javascript"></script> + <script src="../js/initObj/init.js" type="text/javascript"></script> + + <script> + function start() { + var tests = new Test(); + tests.display(); + document.getElementById("runAllBtn").addEventListener("click",tests.runAll.bind(tests),false); + } + </script> </head> - <body> - <h1 id="mainTitle">Testing Page</h1> - - <div id="implState"> - <hr/> - <h2>OIPF Implementation State</h2> - <hr/> - </div> - <div id="vidBroadTest"> - <hr/> - <h2>Video Broadcast Test</h2> - <hr/> - <br/> - </div> - <div id="searchManagerTest"> - <hr/> - <h2>Search Manager Tests</h2> - <hr/> - <br/> - </div> - - <div>TODO write content</div> + <body onload="start()"> </body> </html> \ No newline at end of file

1 0

r820 - oipf/js/test
by ygrego＠users.nuiton.org Feb. 17, 2015

Feb. 17, 2015

Author: ygrego Date: 2015-02-17 17:07:37 +0000 (Tue, 17 Feb 2015) New Revision: 820 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/820 Log: Deletion of call to method assertNotNull. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-02-17 16:22:35 UTC (rev 819) +++ oipf/js/test/SearchManagerTest.js 2015-02-17 17:07:37 UTC (rev 820) @@ -41,7 +41,6 @@ //console.log(search.result[0]); stat = "Finished"; console.log("[TEST-RUNNING][Info] "+"Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: "+stat); - this.assertNotNull(search.result[0]); break; case 3:

1 0

r819 - oipf/js/utils
by ygrego＠users.nuiton.org Feb. 17, 2015

Feb. 17, 2015

Author: ygrego Date: 2015-02-17 16:22:35 +0000 (Tue, 17 Feb 2015) New Revision: 819 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/819 Log: Addition of method "currentProgramInfo" whose the function is to display visually the current program information. Modified: oipf/js/utils/Displayer.js Modified: oipf/js/utils/Displayer.js =================================================================== --- oipf/js/utils/Displayer.js 2015-02-17 16:13:40 UTC (rev 818) +++ oipf/js/utils/Displayer.js 2015-02-17 16:22:35 UTC (rev 819) @@ -17,6 +17,37 @@ document.getElementById(id).appendChild(p); } + }, + + currentProgramInfo : function() { + + for (var i = 0; i< search.result.length; i++) { + var obj = search.result[i]; + console.log(obj); + var keys = Object.keys(obj); + console.log(keys); + //for (var j = 0; j< keys.length; j++) { + for (keys in obj){ + if (obj[keys] instanceof Object) { + + continue; + } + ////Test kind of obj + var h2 = document.createElement("H2"); + var t = document.createTextNode(keys); + h2.appendChild(t); + document.getElementById("prog").appendChild(h2); + var hr = document.createElement("HR"); + var p = document.createElement("P"); + t = document.createTextNode(obj[keys]); + p.appendChild(t); + document.getElementById("prog").appendChild(p); + document.getElementById("prog").appendChild(hr); + //break; + } + break; + } + document.getElementById("prog").style.visibility = "visible"; } });

1 0

r818 - oipf/js/test
by ygrego＠users.nuiton.org Feb. 17, 2015

Feb. 17, 2015

Author: ygrego Date: 2015-02-17 16:13:40 +0000 (Tue, 17 Feb 2015) New Revision: 818 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/818 Log: Addition of property "testsObject" which contains description of each test for each object of oipf norm(very usefull to build the test page). Addition of method "display" to build the test page (buttons to run tests, descriptions for tests). Addition of method "runAll", launch all tests describe in propperty "testsObject". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-02-17 16:00:54 UTC (rev 817) +++ oipf/js/test/Test.js 2015-02-17 16:13:40 UTC (rev 818) @@ -4,9 +4,117 @@ * 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: "Yes" + }, + { + id : "vbTestBindToCurrentChannel", + label : "Bind the current channel stream with a video broadcast object.", + method :"bindToCurrentChannel", + impl: "Yes" + }, + { + id : "vbTestPrevChannel", + label : "Switch to precedent channel in channel list.", + method :"testPrevChannel", + impl: "No" + }, + { + id : "vbTestNextChannel", + label : "Switch to next channel in channel list.", + method :"testNextChannel", + impl: "No" + } + ] + },*/ + { + name : "SearchManagerTest", + object : new SearchManagerTest(), + tests : [ + { + id : "smTestInstanceCreation", + label : "Object creation.", + method : "testInstanceCreation", + impl : "Yes" + }/*, + { + id : "smTestGetCurrentProgram", + label : "Obtain current program according to oipf norm.", + method :"testGetCurrentProgram", + impl : "Yes" + }*/ + ] + }], init: function() { + }, + + runAll: function() { + + console.log("Result", this); + for (var i = 0; i<this.testsObjects.length; i++) { + var element = this.testsObjects[i]; + var object = element["object"]; + var tests = element["tests"]; + for(var j = 0; j<tests.length; j++) { + + var currentTest = tests[j]; + if (currentTest["impl"] === "Yes") { + if (object[currentTest["method"]]() === true) { + document.getElementById(currentTest["id"]+"Res").innerHTML = "Result: Successful"; + } else { + document.getElementById(currentTest["id"]+"Res").innerHTML = "Result: Failure"; + } + } + + } + + + + } + }, + + //Use the innerHTML property to achieve display + display: function() { + var content = "<div id='testsDisplay'>Test Page <button id='runAllBtn'>Run All</button></div>"; + var testsObjects = this.testsObjects; + for (var i = 0; i<testsObjects.length; i++) { + + var currentObject = testsObjects[i]; + var sectionName = currentObject["name"]; + content += "<div id='"+sectionName+"'>"; + var tests = currentObject["tests"]; + for (var j = 0; j<tests.length; j++) { + + var currentTest = tests[j]; + content += "<div id='"+currentTest["id"]+"'>"; + content += "<div>Label: "+currentTest["label"]+"</div>"; + content += "<div>Tested method: "+currentTest["method"]+"</div>"; + var impl = currentTest["impl"]; + content += "<div>Implementation State: "+impl+"</div>"; + + if (impl === "Yes") { + 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 { + content += "<div id='"+currentTest["id"]+"Res"+"'>Result: Any result will be available for the moment, test has not been implemented.</div>"; + content += "<div><button id='"+currentTest["id"]+"Btn"+"' disabled>Run</button></div>"; + } + content += "</div>"; + } + content += "</div>"; + } + content += "</div>"; + document.body.innerHTML = content; } });

1 0

r817 - oipf/js/test
by ygrego＠users.nuiton.org Feb. 17, 2015

Feb. 17, 2015

Author: ygrego Date: 2015-02-17 16:00:54 +0000 (Tue, 17 Feb 2015) New Revision: 817 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/817 Log: Deletion of constants in every test method and property testsDescription. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-02-17 16:00:32 UTC (rev 816) +++ oipf/js/test/SearchManagerTest.js 2015-02-17 16:00:54 UTC (rev 817) @@ -4,24 +4,6 @@ * */ var SearchManagerTest = TestCase.extend({ - - testsDescriptions: [{ - name : SearchManagerTest, - object : this, - tests : [{ - id : METH_ID_TEST_SM_INSTANCE_CREATION, - label : LABEL_TEST_SM_TEST_INSTANCE_CREATION, - method : METH_NAME_TEST_SM_INSTANCE_CREATION, - result : "" - }, - { - id : METH_ID_TEST_GET_CURRENT_PROGRAM, - label : LABEL_TEST_GET_CURRENT_PROGRAM, - method :METH_NAME_TEST_GET_CURRENT_PROGRAM, - result : "" - } - ] - }], searchManagerTest: null, @@ -31,22 +13,22 @@ testInstanceCreation: function() { var state = "Pending"; - console.log("[TEST-RUNNING][Info] "+"Id: "+METH_NAME_TEST_SM_INSTANCE_CREATION+", Label: "+LABEL_TEST_SM_TEST_INSTANCE_CREATION+", State: "+state); + console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: "+state); this.searchManagerTest = oipfObjectFactory.createSearchManagerObject(); this.assertNotNull(this.searchManagerTest); this.assertNotUndefined(this.searchManagerTest); state = "Finished"; - console.log("[TEST-RUNNING][Info] "+"Id: "+METH_NAME_TEST_SM_INSTANCE_CREATION+", Label: "+LABEL_TEST_SM_TEST_INSTANCE_CREATION+", State: "+state); + console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: "+state); return true; }, testGetCurrentProgram: function(searchTarget, channel, startTime, offset, count) { var searchManagerObject = oipfObjectFactory.createSearchManagerObject(); - var state = "Pending"; - console.log("[TEST-RUNNING][Info] "+"Id: "+METH_ID_TEST_GET_CURRENT_PROGRAM+", Label: "+LABEL_TEST_GET_CURRENT_PROGRAM+", State: "+state); + var stat = "Pending"; + console.log("[TEST-RUNNING][Info] "+"Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: "+stat); searchManagerObject.onMetadataSearch = function(search, state) { console.log("[INFO]: onMetadataSearch called"); @@ -56,35 +38,10 @@ case 0: console.log("[INFO] Result found."); - console.log(search.result[0]); - for (var i = 0; i< search.result.length; i++) { - var obj = search.result[i]; - console.log(obj); - var keys = Object.keys(obj); - console.log(keys); - //for (var j = 0; j< keys.length; j++) { - for (keys in obj){ - if (obj[keys] instanceof Object) { - - continue; - } - ////Test kind of obj - var h2 = document.createElement("H2"); - var t = document.createTextNode(keys); - h2.appendChild(t); - document.getElementById("prog").appendChild(h2); - var hr = document.createElement("HR"); - var p = document.createElement("P"); - t = document.createTextNode(obj[keys]); - p.appendChild(t); - document.getElementById("prog").appendChild(p); - document.getElementById("prog").appendChild(hr); - //break; - } - break; - } - document.getElementById("prog").style.visibility = "visible"; - + //console.log(search.result[0]); + stat = "Finished"; + console.log("[TEST-RUNNING][Info] "+"Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: "+stat); + this.assertNotNull(search.result[0]); break; case 3: @@ -103,12 +60,13 @@ console.log("Unknow state"); } + return true; }; var channelConfig = oipfObjectFactory.createChannelConfig(); var metaDataSearch = searchManagerObject.createSearch(searchTarget); metaDataSearch.findProgrammesFromStream(channelConfig.currentChannel, startTime); metaDataSearch.result.getResults(offset, count); - metaDataSearch.result[0];//Must return undefined else wrong behaviour of this method + //metaDataSearch.result[0];Must return undefined else wrong behaviour of this method } }); \ No newline at end of file

1 0

r816 - oipf/js/test
by ygrego＠users.nuiton.org Feb. 17, 2015

Feb. 17, 2015

Author: ygrego Date: 2015-02-17 16:00:32 +0000 (Tue, 17 Feb 2015) New Revision: 816 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/816 Log: Deletion of constants in every test method and property testsDescription. Modified: oipf/js/test/VideoBroadcastTest.js Modified: oipf/js/test/VideoBroadcastTest.js =================================================================== --- oipf/js/test/VideoBroadcastTest.js 2015-02-17 15:55:32 UTC (rev 815) +++ oipf/js/test/VideoBroadcastTest.js 2015-02-17 16:00:32 UTC (rev 816) @@ -4,24 +4,6 @@ * */ var VideoBroadcastTest = TestCase.extend({ - - testsDescriptions: [{ - name : VideoBroadcastObject, - object : "", - tests : [{ - id : METH_ID_TEST_VB_INSTANCE_CREATION, - label : LABEL_TEST_VB_TEST_INSTANCE_CREATION, - method : METH_NAME_TEST_VB_INSTANCE_CREATION, - result : "" - }, - { - id : METH_ID_TEST_BIND_TO_CURRENT_CHANNEL, - label : LABEL_TEST_BIND_TO_CURRENT_CHANNEL, - method :METH_NAME_TEST_BIND_TO_CURRENT_CHANNEL, - result : "" - } - ] - }], videoBroadcastObject: null, @@ -34,14 +16,14 @@ */ testInstanceCreation: function() { var state = "Pending"; - console.log("[TEST-RUNNING][Info] "+"Id: "+METH_ID_TEST_VB_INSTANCE_CREATION+", Label: "+LABEL_TEST_VB_TEST_INSTANCE_CREATION+", State: "+state); + 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: "+METH_ID_TEST_VB_INSTANCE_CREATION+", Label: "+LABEL_TEST_VB_TEST_INSTANCE_CREATION+", State: "+state); + console.log("[TEST-RUNNING][Info] Id: vbTestInstanceCreation, Label: Object creation, State: "+state); return true; }, @@ -52,13 +34,13 @@ */ testBindToCurrentChannel: function() { var state = "Pending"; - console.log("[TEST-RUNNING][Info] "+"Id: "+METH_ID_TEST_BIND_TO_CURRENT_CHANNEL+", Label: "+LABEL_TEST_BIND_TO_CURRENT_CHANNEL+", State: "+state); + 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); var currentChann = this.videoBroadcastObject.bindToCurrentChannel(); this.assertEquals(this.videoBroadcastObject.currentChannel, currentChann); state = "Finished"; - console.log("[TEST-RUNNING][Info] "+"Id: "+METH_ID_TEST_BIND_TO_CURRENT_CHANNEL+", Label: "+LABEL_TEST_BIND_TO_CURRENT_CHANNEL+", State: "+state); + 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; }

1 0