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

r1143 - oipf/js/test
by ygrego＠users.nuiton.org 10 Apr '15

10 Apr '15

Author: ygrego Date: 2015-04-10 09:49:02 +0000 (Fri, 10 Apr 2015) New Revision: 1143 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1143 Log: A new test method: "testSearchingForASpecificProgrammeByName". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-10 08:22:46 UTC (rev 1142) +++ oipf/js/test/SearchManagerTest.js 2015-04-10 09:49:02 UTC (rev 1143) @@ -146,6 +146,70 @@ this.vidBroadObj.bindToCurrentChannel(); }, + testSearchingForASpecificProgrammeByName: function(resolve, reject) { + var self = this; + var value = "Des dinos sous la glace"; + + this.addTransition(this.UNREALIZED, this.CONNECTING); + + this.addTransition(this.CONNECTING, this.PRESENTING, function() { + + var stat = "Pending"; + logTest("State: " + stat); + var metadataSearch = self.searchManagerObj. + createSearch(self.SCHEDULED_CONTENT); + + var query = metadataSearch.createQuery("name", 0, + value); + metadataSearch.setQuery(query); + + var offset = 0; + var count = 1; + metadataSearch.result.getResults(offset, count); +// //Must return undefined else wrong implementation of getResults method +// console.log(metaDataSearch.result[0]); + }); + + this.searchManagerObj.onMetadataSearch = function(search, state) { + + console.log("[INFO]: onMetadataSearch called"); + + switch (state) { + + case 0: + if (self.assertNotNull(search.result[0]) && + self.assertEquals(search.result[0].name, value)) { + 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: 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.vidBroadObj.bindToCurrentChannel(); + + }, + testGetCurrentProgrammeFromNullStream: function (resolve, reject) { var self = this; @@ -353,5 +417,6 @@ resolve(); }); - } + }, + }); \ No newline at end of file

1 0

r1142 - oipf/js/test
by ygrego＠users.nuiton.org 10 Apr '15

10 Apr '15

Author: ygrego Date: 2015-04-10 08:22:46 +0000 (Fri, 10 Apr 2015) New Revision: 1142 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1142 Log: This test "testSearchingForASpecificProgrammeByName" has been added in "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-10 08:20:10 UTC (rev 1141) +++ oipf/js/test/Test.js 2015-04-10 08:22:46 UTC (rev 1142) @@ -345,6 +345,10 @@ method: "testGetCurrentProgrammeFromNullStream" }, { + label: "Try to obtain a programme by its name.", + method: "testSearchingForASpecificProgrammeByName" + }, + { label: "Create a query with well parameters.", method: "testCreateQueryWithWellArguments" },

1 0

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

10 Apr '15

Author: ygrego Date: 2015-04-10 08:20:10 +0000 (Fri, 10 Apr 2015) New Revision: 1141 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1141 Log: The method "getResults" has been modified totally. The property "_cachedResults" is now initialized in constructor "init". Modified: oipf/js/impl/model/SearchResults.js Modified: oipf/js/impl/model/SearchResults.js =================================================================== --- oipf/js/impl/model/SearchResults.js 2015-04-09 21:25:05 UTC (rev 1140) +++ oipf/js/impl/model/SearchResults.js 2015-04-10 08:20:10 UTC (rev 1141) @@ -56,10 +56,11 @@ _search: null, init: function(search) { + this._cachedResults = []; this._timerManager = new TimerManager(); this._timeout = this._timerManager.createTimer.bind(this._timerManager, 0); this._search = search; - this.lentgh = 0; + this.length = 0; this.totalSize = 0; this._fireEvent = this._search._searchManager ._fireEvent.bind(this._search._searchManager); @@ -77,50 +78,52 @@ * - offset: The number of items at the start of the result set to be skipped before data is retrieved. * * - count: The number of results to retrieve. - * + * FIX-ME: Yannis - 08/04/2015 - Verification about results ordering constraint */ getResults: function(offset, count) { this.offset = offset; - + var self = this; var programmes = this._search._searchManager._metadata.programmes; /* * Verify some conditions before beginning of * search. */ - if (this._currentQuery && programmes && offset && count) { + if (this._search._currentQuery && programmes && offset != null && count != null) { + var getResultFromInterval = function(count) { + self.length = 0; + if (self._cachedResults) { + + for (var i = self.offset, l = count; i < l; i++) { + var programme = self._cachedResults[i]; + if (programme) { + self.push(programme); + } else { + self._fireEvent(createCustomEvent("MetadataSearch", + [self._search, + self.SEARCH_CANNOT_BE_COMPLETED])); + break; + } + } + } + }; /* * A verification must be done on the presence of cached results * in order to not restart a complete search when * that's not necessary. */ - if (this._cachedResults) { + if (this._cachedResults.length != 0) { - var getResultFromInterval = function(count) { - this.length = 0; - - for (var i = this.offset, l = count; i < l; i++) { - var programme = this._cachedResults[i]; - if (programme) { - this.push(programme); - } else { - this.fireEvent(createCustomEvent("MetadataSearch", - [this._search, - this.SEARCH_CANNOT_BE_COMPLETED])); - break; - } - } - }; - - this._timeout + this._timeout() .then(getResultFromInterval.bind(null, count)); } else { - if (this.isValidField(this._search._currentQuery.field) && + var time = new Date().getTime(); + if (this.isValidField(this._search._currentQuery._field) && this.isValidComparator( - this._search._currentQuery.comparison)) { + this._search._currentQuery._comparison)) { for (var i = 0; i< programmes.length; i++) { @@ -132,12 +135,12 @@ 3: "superiorOrEquals", 4: "inferior", 5: "inferiorOrEquals", - 6: "constains" + 6: "contains" }; - var field = this._search._currentQuery.field; - var comparison = this._search._currentQuery.comparison; - var value = this._search._currentQuery.value; + var field = this._search._currentQuery._field; + var comparison = this._search._currentQuery._comparison; + var value = this._search._currentQuery._value; var methodName = methodToCall[comparison]; /* @@ -145,25 +148,44 @@ * the code differs from other usual query. */ if (this._search._currentQuery._type == "current") { - var date = new Date(); - if (programme.duration) { + + var constraints = this._search. + _constraints.channels; + + if (constraints.length > 0 && + oipf.utils.isPresent(constraints, + programme.channel.name) && + programme.duration) { var stopTime = programme.startTime + - programme.duration; + programme.duration*1000; - if (date.getTime() >= programme.startTime - && date.getTime() <= stopTime) { - - this._timeout + if (time >= programme.startTime + && time <= stopTime) { + + this._timeout() .then(function() { - this._cachedResults.push(programme); - this.push(programme); - this.totalSize = this.length; + self._cachedResults.push(programme); +// self.push(programme); +// self.totalSize = self.length; console.log("[INFO] Program found."); - }); + }) + .then(this._timeout) + .then(getResultFromInterval.bind(null, count)) + .then(this._timeout) + .then(this._fireEvent.bind(this, + createCustomEvent("MetadataSearch", + [this._search, this.SEARCH_FINISHED]))); break; } + } else { + this._fireEvent( + createCustomEvent("MetadataSearch", + [this._search, + this.SEARCH_CANNOT_BE_COMPLETED])); + break; } + } else if (programme[field] && oipf.utils[methodName].call(null, programme[field], value)) { @@ -173,28 +195,34 @@ if(constraints.length > 0 && oipf.utils.isPresent(constraints, - programme.channel)) { + programme.channel.name)) { /* - * The results found are firstly put in a cache. + * The results found are firstly put in a cache, + * then gathered. */ - this._timeout + this._timeout() .then(function() { - this._cachedResults.push(programme); + self._cachedResults.push(programme); console.log("[INFO] Program found."); }); } } } - if (this._search._ordering) { - this._timeout - .then(function(){ - getResultFromInterval.bind(null, count); - }); - } else { - this._timeout - .then(getResultFromInterval.bind(null, count)); +// if (this._search._ordering) { +// this._timeout() +// .then(function(){ +// getResultFromInterval(count); +// }); +// } + if (this._search._currentQuery._type == "undifferent") { + this._timeout() + .then(getResultFromInterval.bind(null, count)) + .then(this._timeout) + .then(this._fireEvent.bind(this, + createCustomEvent("MetadataSearch", + [this._search, this.SEARCH_FINISHED]))); } } else {

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 21:25:05 +0000 (Thu, 09 Apr 2015) New Revision: 1140 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1140 Log: Addition of a new test "testCreateSearchWithZero". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-09 21:23:27 UTC (rev 1139) +++ oipf/js/test/SearchManagerTest.js 2015-04-09 21:25:05 UTC (rev 1140) @@ -242,6 +242,17 @@ } }, + testCreateSearchWithZero: function(resolve, reject) { + this.metadataSearch = this.searchManagerObj. + createSearch(0); + + if (!this.assertNotNull(this.metadataSearch)) { + resolve(); + } else { + reject(); + } + }, + testCreateQueryWithWellArguments: function(resolve, reject) { var metadataSearch = this.searchManagerObj. createSearch(this.SCHEDULED_CONTENT);

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 21:23:27 +0000 (Thu, 09 Apr 2015) New Revision: 1139 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1139 Log: Addition of a new test in "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-09 21:04:52 UTC (rev 1138) +++ oipf/js/test/Test.js 2015-04-09 21:23:27 UTC (rev 1139) @@ -333,6 +333,10 @@ method: "testCreateSearchWithString" }, { + label: "Call method 'createSearch' with parameter equals to 0.", + method: "testCreateSearchWithZero" + }, + { label: "Obtain current program according to oipf norm.", method: "testGetCurrentProgrammeFromStream" },

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 21:04:52 +0000 (Thu, 09 Apr 2015) New Revision: 1138 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1138 Log: Deletion of parameters of "createQuery" in method "testCreateQueryWithoutParameters". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-09 20:44:06 UTC (rev 1137) +++ oipf/js/test/SearchManagerTest.js 2015-04-09 21:04:52 UTC (rev 1138) @@ -260,13 +260,13 @@ var metadataSearch = this.searchManagerObj. createSearch(this.SCHEDULED_CONTENT); - var query = metadataSearch.createQuery("name", 0, "X:ENIUS"); - - if (this.assertNotNull(query)) { - resolve(); - } else { - reject(); - } + new Promise(function (resolve, reject) { + var query = metadataSearch.createQuery(); + }) + .catch(function(val) { + console.log(val); + resolve(); + }); },

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 20:44:06 +0000 (Thu, 09 Apr 2015) New Revision: 1137 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1137 Log: Additon of a new test in object "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-09 19:21:44 UTC (rev 1136) +++ oipf/js/test/Test.js 2015-04-09 20:44:06 UTC (rev 1137) @@ -345,6 +345,10 @@ method: "testCreateQueryWithWellArguments" }, { + label: "Create a query with well parameters.", + method: "testCreateQueryWithoutParameters" + }, + { label: "Create a query with its first parameters null.", method: "testCreateQueryWithFieldArgumentNull" },

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 19:21:44 +0000 (Thu, 09 Apr 2015) New Revision: 1136 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1136 Log: The method "createQuery" verify the maximum number of parameter. Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-09 19:19:50 UTC (rev 1135) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-09 19:21:44 UTC (rev 1136) @@ -271,6 +271,11 @@ * into their string representation, if necessary. */ createQuery: function(field, comparison, value) { + var parameters = arguments; + if (parameters.length > 3) { + throw new TypeError + ("Excessive number of arguments."); + } if (!(typeof field === "string") || !Number.isInteger(comparison) ||

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 19:19:50 +0000 (Thu, 09 Apr 2015) New Revision: 1135 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1135 Log: New test "testCreateQueryWithoutParameters". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-09 15:46:54 UTC (rev 1134) +++ oipf/js/test/SearchManagerTest.js 2015-04-09 19:19:50 UTC (rev 1135) @@ -256,6 +256,20 @@ }, + testCreateQueryWithoutParameters: function(resolve, reject) { + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + var query = metadataSearch.createQuery("name", 0, "X:ENIUS"); + + if (this.assertNotNull(query)) { + resolve(); + } else { + reject(); + } + + }, + testCreateQueryWithFieldArgumentNull: function(resolve, reject) { var metadataSearch = this.searchManagerObj. createSearch(this.SCHEDULED_CONTENT); @@ -307,7 +321,7 @@ new Promise(function (resolve, reject) { - metadataSearch.createQuery("name", null, "X:ENIUS"); + metadataSearch.createQuery("name", "null", "X:ENIUS"); }) .catch(function(val) { console.log(val);

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 15:46:54 +0000 (Thu, 09 Apr 2015) New Revision: 1134 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1134 Log: New tests have been added. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-09 15:43:04 UTC (rev 1133) +++ oipf/js/test/SearchManagerTest.js 2015-04-09 15:46:54 UTC (rev 1134) @@ -271,6 +271,21 @@ }, + testCreateQueryWithIntegerFieldArgument: function(resolve, reject) { + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + + new Promise(function (resolve, reject) { + var query = metadataSearch.createQuery(10, 0, "X:ENIUS"); + }) + .catch(function(val) { + console.log(val); + resolve(); + }); + + }, + testCreateQueryWithComparisonArgumentNull: function(resolve, reject) { var metadataSearch = this.searchManagerObj. createSearch(this.SCHEDULED_CONTENT); @@ -286,6 +301,21 @@ }, + testCreateQueryWithStringComparisonArgument: function(resolve, reject) { + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + + new Promise(function (resolve, reject) { + metadataSearch.createQuery("name", null, "X:ENIUS"); + }) + .catch(function(val) { + console.log(val); + resolve(); + }); + + }, + testCreateQueryWithValueArgumentNull: function(resolve, reject) { var metadataSearch = this.searchManagerObj. createSearch(this.SCHEDULED_CONTENT);

1 0