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

r1123 - oipf/js/test
by ygrego＠users.nuiton.org 09 Apr '15

09 Apr '15

Author: ygrego Date: 2015-04-09 09:58:06 +0000 (Thu, 09 Apr 2015) New Revision: 1123 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1123 Log: New test added in "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-09 09:32:05 UTC (rev 1122) +++ oipf/js/test/Test.js 2015-04-09 09:58:06 UTC (rev 1123) @@ -337,6 +337,10 @@ method: "testGetCurrentProgrammeFromStream" }, { + label: "Try to obtain current program with a null stream.", + method: "testGetCurrentProgrammeFromNullStream" + }, + { label: "Obtain current program by using a query.", method: "testGetCurrentProgrammeWithQuery" }

1 0

r1122 - oipf/js/test
by ygrego＠users.nuiton.org 09 Apr '15

09 Apr '15

Author: ygrego Date: 2015-04-09 09:32:05 +0000 (Thu, 09 Apr 2015) New Revision: 1122 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1122 Log: The test method "testGetCurrentProgrammeWithQuery" has been added. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-09 09:30:27 UTC (rev 1121) +++ oipf/js/test/SearchManagerTest.js 2015-04-09 09:32:05 UTC (rev 1122) @@ -82,7 +82,10 @@ }, afterTest: function(resolve, reject) { - this.vidBroadObj.removeEventListener("PlayStateChange", this.onPlayStateChange); + this.vidBroadObj.removeEventListener("PlayStateChange", + this.onPlayStateChange); + this.searchManagerObj.removeEventListener("MetadataSearch", + this.onPlayStateChange); }, testGetCurrentProgrammeFromStream: function (resolve, reject) { @@ -142,7 +145,70 @@ this.vidBroadObj.bindToCurrentChannel(); }, + + testGetCurrentProgrammeWithQuery: function (resolve, reject) { + var self = this; + this.addTransition(this.UNREALIZED, this.CONNECTING); + + 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; + metaDataSearch.addChannelConstraint(currentChannel); + + var startTime = null; + var query = metaDataSearch.createQuery("startTime", 0, startTime); + metaDataSearch.setQuery(query); + + 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.searchManagerObj.onMetadataSearch = function(search, state) { + + console.log("[INFO]: onMetadataSearch called"); + + switch (state) { + + case 0: + if (self.assertNotNull(search.result[0])) { + console.log("State: found"); + resolve(); + } else { + console.log("State: not found"); + reject(); + } + break; + + case 3: + var message = "In idle state."; + console.log(message); + reject(); + break; + + case 4: + message = "Search cannot be complete."; + console.log(message); + reject(); + break; + + default: + console.log("Unknow state"); + reject(); + + } + }; + + this.vidBroadObj.bindToCurrentChannel(); + }, + testCreateSearchForScheduledContent: function(resolve, reject) { this.metadataSearch = this.searchManagerObj. createSearch(this.SCHEDULED_CONTENT);

1 0

r1121 - oipf/js/test
by ygrego＠users.nuiton.org 09 Apr '15

09 Apr '15

Author: ygrego Date: 2015-04-09 09:30:27 +0000 (Thu, 09 Apr 2015) New Revision: 1121 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1121 Log: New test added in "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-08 15:55:02 UTC (rev 1120) +++ oipf/js/test/Test.js 2015-04-09 09:30:27 UTC (rev 1121) @@ -335,6 +335,10 @@ { label: "Obtain current program according to oipf norm.", method: "testGetCurrentProgrammeFromStream" + }, + { + label: "Obtain current program by using a query.", + method: "testGetCurrentProgrammeWithQuery" } ] }],

1 0

r1120 - oipf/js/test
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 15:55:02 +0000 (Wed, 08 Apr 2015) New Revision: 1120 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1120 Log: Rename the test method "testGetCurrentProgramme", which is become "testGetCurrentProgrammeFromStream". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-08 15:52:43 UTC (rev 1119) +++ oipf/js/test/SearchManagerTest.js 2015-04-08 15:55:02 UTC (rev 1120) @@ -85,7 +85,7 @@ this.vidBroadObj.removeEventListener("PlayStateChange", this.onPlayStateChange); }, - testGetCurrentProgramme: function (resolve, reject) { + testGetCurrentProgrammeFromStream: function (resolve, reject) { var self = this; this.addTransition(this.UNREALIZED, this.CONNECTING);

1 0

r1119 - oipf/js/test
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 15:52:43 +0000 (Wed, 08 Apr 2015) New Revision: 1119 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1119 Log: Rename the test method "testGetCurrentProgramme", which becomes "testGetCurrentProgrammeFromStream" in property "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-08 15:49:54 UTC (rev 1118) +++ oipf/js/test/Test.js 2015-04-08 15:52:43 UTC (rev 1119) @@ -334,7 +334,7 @@ }, { label: "Obtain current program according to oipf norm.", - method: "testGetCurrentProgramme" + method: "testGetCurrentProgrammeFromStream" } ] }],

1 0

r1118 - oipf/js/test
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 15:49:54 +0000 (Wed, 08 Apr 2015) New Revision: 1118 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1118 Log: Rename the test method "testGetCurrentProgram", which becomes "testGetCurrentProgramme" in property "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-08 15:43:02 UTC (rev 1117) +++ oipf/js/test/Test.js 2015-04-08 15:49:54 UTC (rev 1118) @@ -334,7 +334,7 @@ }, { label: "Obtain current program according to oipf norm.", - method: "testGetCurrentProgram" + method: "testGetCurrentProgramme" } ] }],

1 0

r1117 - oipf/js/test
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

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) {

1 0

r1116 - oipf/js/impl/model
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 12:54:59 +0000 (Wed, 08 Apr 2015) New Revision: 1116 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1116 Log: Modify first argument of object "Query" created in method "findProgrammesFromStream". Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-08 10:38:43 UTC (rev 1115) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-08 12:54:59 UTC (rev 1116) @@ -169,7 +169,7 @@ findProgrammesFromStream: function(channel, startTime, count) { console.log("[INFO]: findProgrammesFromStream [IN]"); this.addChannelConstraint(channel); - this._currentQuery = new Query("Programme.startTime", 0, startTime, count); + this._currentQuery = new Query("startTime", 0, startTime, count); console.log("[INFO]: findProgrammesFromStream [Out]"); },

1 0

r1115 - oipf/data
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 10:38:43 +0000 (Wed, 08 Apr 2015) New Revision: 1115 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1115 Log: Rename the class. Modified: oipf/data/XmlTvData.js Modified: oipf/data/XmlTvData.js =================================================================== --- oipf/data/XmlTvData.js 2015-04-08 10:28:28 UTC (rev 1114) +++ oipf/data/XmlTvData.js 2015-04-08 10:38:43 UTC (rev 1115) @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -var XmlTVData = Class.extend({ +var XmlTvData = Class.extend({ map: { "title": "name",

1 0

r1114 - oipf/js/impl/model
by ygrego＠users.nuiton.org 08 Apr '15

08 Apr '15

Author: ygrego Date: 2015-04-08 10:28:28 +0000 (Wed, 08 Apr 2015) New Revision: 1114 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1114 Log: Modification of variable "programmes" in method "getResults". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-08 10:27:24 UTC (rev 1113) +++ oipf/js/impl/model/SearchResults.js 2015-04-08 10:28:28 UTC (rev 1114) @@ -82,7 +82,7 @@ getResults: function(offset, count) { this.offset = offset; - var programmes = this._search._searchManager._metadata; + var programmes = this._search._searchManager._metadata.programmes; /* * Verify some conditions before beginning of

1 0