Author: ygrego Date: 2015-03-11 16:30:12 +0000 (Wed, 11 Mar 2015) New Revision: 940 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/940 Log: Addition of block try catch around code subject to cause errors in each test method. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-03-11 16:27:32 UTC (rev 939) +++ oipf/js/test/SearchManagerTest.js 2015-03-11 16:30:12 UTC (rev 940) @@ -4,17 +4,27 @@ * */ var SearchManagerTest = TestCase.extend({ + init: function () { }, + 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(); - - if (this.assertNotNull(this.searchManagerTest) && this.assertNotUndefined(this.searchManagerTest)) { + + try { + + var searchManagerTest = oipfObjectFactory.createSearchManagerObject(); + + } catch (error) { + console.log(error.message); + throw error; + } + + if (this.assertNotNull(searchManagerTest) && this.assertNotUndefined(searchManagerTest)) { state = "Successfull"; console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state); resolve(state); @@ -26,14 +36,31 @@ 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); + + try { + var searchManagerObject = oipfObjectFactory.createSearchManagerObject(); + 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 + + } catch (error) { + console.log(error.message); + throw error; + } + var self = this; - searchManagerObject.onMetadataSearch = function (search, state) { console.log("[INFO]: onMetadataSearch called"); @@ -42,24 +69,20 @@ case 0: 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"); + resolve("Successfull"); } else { - stat = "Failed"; console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat); - reject(new Error("Failed")); + reject(new Error("Failure")); } break; case 3: - var message = "[INFO] MetadataSearch in Idle state because of either search abort or parameters have been modified (query, constraints or search target)"; console.log(message); break; case 4: - message = "[INFO] The search cannot be complete because of lack of ressources or any other reason."; console.log(message); break; @@ -72,15 +95,6 @@ }; - 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 } }); \ No newline at end of file