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