Author: ygrego Date: 2015-04-08 15:43:02 +0000 (Wed, 08 Apr 2015) New Revision: 1117 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1117 Log: Global refactoring of method "testGetCurrentProgramme". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-08 12:54:59 UTC (rev 1116) +++ oipf/js/test/SearchManagerTest.js 2015-04-08 15:43:02 UTC (rev 1117) @@ -85,31 +85,27 @@ this.vidBroadObj.removeEventListener("PlayStateChange", this.onPlayStateChange); }, - testGetCurrentProgram: function (resolve, reject) { + testGetCurrentProgramme: function (resolve, reject) { var self = this; this.addTransition(this.UNREALIZED, this.CONNECTING); - this.addTransition(this.CONNECTING, this.PRESENTING, resolve); + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + + var stat = "Pending"; + logTest("State: " + stat); + var searchTarget = 1; + var metaDataSearch = self.searchManagerObj.createSearch(searchTarget); + var currentChannel = self.vidBroadObj.currentChannel; + var startTime = null; + metaDataSearch.findProgrammesFromStream(currentChannel, startTime); + var offset = 0; + var count = 1; + metaDataSearch.result.getResults(offset, count); +// console.log(metaDataSearch.result[0]);//Must return undefined else wrong implementation of getResults method + }); - this.vidBroadObj.bindToCurrentChannel(); - -// var stat = "Pending"; -// console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: " + stat); -// var vidBroadObj = oipfObjectFactory.createVideoBroadcastObject(); -// var currentChannel = vidBroadObj.bindToCurrentChannel(); -// var searchTarget = 1; -// var metaDataSearch = this.searchManagerObj.createSearch(searchTarget); -// var startTime = null; -// metaDataSearch.findProgrammesFromStream(currentChannel -// , startTime); -// var offset = 0; -// var count = 1; -// metaDataSearch.result.getResults(offset, count); -// console.log(metaDataSearch.result[0]);//Must return undefined else wrong implementation of getResults method -// -// var self = this; - function onMetadataSearch (search, state) { + this.searchManagerObj.onMetadataSearch = function(search, state) { console.log("[INFO]: onMetadataSearch called"); @@ -117,30 +113,34 @@ case 0: if (self.assertNotNull(search.result[0])) { - console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: " + stat); - resolve("Successfull"); + console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: found"); + resolve(); } else { - console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: " + stat); - reject(new Error("Failure")); + console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: not found"); + reject(); } 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); + reject(); break; case 4: message = "[INFO] The search cannot be complete because of lack of ressources or any other reason."; console.log(message); + reject(); break; default: console.log("Unknow state"); + reject(); } - } -// this.searchManagerObj.addEventListener("MetadataSearch", onMetadataSearch, false); + }; + + this.vidBroadObj.bindToCurrentChannel(); }, testCreateSearchForScheduledContent: function(resolve, reject) {