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

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

09 Apr '15

Author: ygrego Date: 2015-04-09 15:43:04 +0000 (Thu, 09 Apr 2015) New Revision: 1133 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1133 Log: New tests are added to "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-09 15:31:26 UTC (rev 1132) +++ oipf/js/test/Test.js 2015-04-09 15:43:04 UTC (rev 1133) @@ -349,10 +349,18 @@ method: "testCreateQueryWithFieldArgumentNull" }, { + label: "Create a query with a Integer as first parameter.", + method: "testCreateQueryWithIntegerFieldArgument" + }, + { label: "Create a query with its second parameters.", method: "testCreateQueryWithComparisonArgumentNull" }, { + label: "Create a query with a String as second parameters.", + method: "testCreateQueryWithStringComparisonArgument" + }, + { label: "Create a query with its last parameters.", method: "testCreateQueryWithValueArgumentNull" }

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 15:31:26 +0000 (Thu, 09 Apr 2015) New Revision: 1132 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1132 Log: Verification on parameters is necessary for method "createQuery". Modified: oipf/js/impl/model/MetadataSearch.js Modified: oipf/js/impl/model/MetadataSearch.js =================================================================== --- oipf/js/impl/model/MetadataSearch.js 2015-04-09 15:28:25 UTC (rev 1131) +++ oipf/js/impl/model/MetadataSearch.js 2015-04-09 15:31:26 UTC (rev 1132) @@ -271,6 +271,15 @@ * into their string representation, if necessary. */ createQuery: function(field, comparison, value) { + + if (!(typeof field === "string") || + !Number.isInteger(comparison) || + (!Number.isInteger(value) && !(typeof value === "string"))) { + + throw new TypeError + ("This function cannot be called with these arguments."); + + } return new Query(field, comparison, value); }

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 15:28:25 +0000 (Thu, 09 Apr 2015) New Revision: 1131 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1131 Log: Refactoring of methods in order to manage error. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-09 13:23:11 UTC (rev 1130) +++ oipf/js/test/SearchManagerTest.js 2015-04-09 15:28:25 UTC (rev 1131) @@ -260,13 +260,14 @@ var metadataSearch = this.searchManagerObj. createSearch(this.SCHEDULED_CONTENT); - var query = metadataSearch.createQuery(null, 0, "X:ENIUS"); - if (this.assertNotNull(query)) { - resolve(); - } else { - reject(); - } + new Promise(function (resolve, reject) { + var query = metadataSearch.createQuery(null, 0, "X:ENIUS"); + }) + .catch(function(val) { + console.log(val); + resolve(); + }); }, @@ -274,13 +275,14 @@ var metadataSearch = this.searchManagerObj. createSearch(this.SCHEDULED_CONTENT); - var query = metadataSearch.createQuery("name", null, "X:ENIUS"); - if (this.assertNotNull(query)) { - resolve(); - } else { - reject(); - } + new Promise(function (resolve, reject) { + metadataSearch.createQuery("name", null, "X:ENIUS"); + }) + .catch(function(val) { + console.log(val); + resolve(); + }); }, @@ -288,13 +290,13 @@ var metadataSearch = this.searchManagerObj. createSearch(this.SCHEDULED_CONTENT); - var query = metadataSearch.createQuery("name", 0, null); - - if (this.assertNotNull(query)) { - resolve(); - } else { - reject(); - } + new Promise(function (resolve, reject) { + metadataSearch.createQuery("name", 0, null); + }) + .catch(function(val) { + console.log(val); + resolve(); + }); } }); \ No newline at end of file

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 13:23:11 +0000 (Thu, 09 Apr 2015) New Revision: 1130 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1130 Log: Addition of three new methods. Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-09 13:20:34 UTC (rev 1129) +++ oipf/js/test/Test.js 2015-04-09 13:23:11 UTC (rev 1130) @@ -343,6 +343,18 @@ { label: "Create a query with well parameters.", method: "testCreateQueryWithWellArguments" + }, + { + label: "Create a query with its first parameters null.", + method: "testCreateQueryWithFieldArgumentNull" + }, + { + label: "Create a query with its second parameters.", + method: "testCreateQueryWithComparisonArgumentNull" + }, + { + label: "Create a query with its last parameters.", + method: "testCreateQueryWithValueArgumentNull" } ] }],

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 13:20:34 +0000 (Thu, 09 Apr 2015) New Revision: 1129 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1129 Log: Addition of new methods. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-09 12:56:54 UTC (rev 1128) +++ oipf/js/test/SearchManagerTest.js 2015-04-09 13:20:34 UTC (rev 1129) @@ -244,7 +244,7 @@ testCreateQueryWithWellArguments: function(resolve, reject) { var metadataSearch = this.searchManagerObj. - createSearch("1"); + createSearch(this.SCHEDULED_CONTENT); var query = metadataSearch.createQuery("name", 0, "X:ENIUS"); @@ -254,5 +254,47 @@ reject(); } + }, + + testCreateQueryWithFieldArgumentNull: function(resolve, reject) { + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + var query = metadataSearch.createQuery(null, 0, "X:ENIUS"); + + if (this.assertNotNull(query)) { + resolve(); + } else { + reject(); + } + + }, + + testCreateQueryWithComparisonArgumentNull: function(resolve, reject) { + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + var query = metadataSearch.createQuery("name", null, "X:ENIUS"); + + if (this.assertNotNull(query)) { + resolve(); + } else { + reject(); + } + + }, + + testCreateQueryWithValueArgumentNull: function(resolve, reject) { + var metadataSearch = this.searchManagerObj. + createSearch(this.SCHEDULED_CONTENT); + + var query = metadataSearch.createQuery("name", 0, null); + + if (this.assertNotNull(query)) { + resolve(); + } else { + reject(); + } + } }); \ No newline at end of file

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 12:56:54 +0000 (Thu, 09 Apr 2015) New Revision: 1128 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1128 Log: Addition of new method "testCreateQueryWithWellArguments" in "testsObjects". Modified: oipf/js/test/Test.js Modified: oipf/js/test/Test.js =================================================================== --- oipf/js/test/Test.js 2015-04-09 12:55:13 UTC (rev 1127) +++ oipf/js/test/Test.js 2015-04-09 12:56:54 UTC (rev 1128) @@ -339,6 +339,10 @@ { label: "Try to obtain current program with a null stream.", method: "testGetCurrentProgrammeFromNullStream" + }, + { + label: "Create a query with well parameters.", + method: "testCreateQueryWithWellArguments" } ] }],

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 12:55:13 +0000 (Thu, 09 Apr 2015) New Revision: 1127 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1127 Log: Addition of new method "testCreateQueryWithWellArguments". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-09 12:05:58 UTC (rev 1126) +++ oipf/js/test/SearchManagerTest.js 2015-04-09 12:55:13 UTC (rev 1127) @@ -240,5 +240,19 @@ } else { reject(); } + }, + + testCreateQueryWithWellArguments: function(resolve, reject) { + var metadataSearch = this.searchManagerObj. + createSearch("1"); + + var query = metadataSearch.createQuery("name", 0, "X:ENIUS"); + + if (this.assertNotNull(query)) { + resolve(); + } else { + reject(); + } + } }); \ No newline at end of file

1 0

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

09 Apr '15

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

1 0

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

09 Apr '15

Author: ygrego Date: 2015-04-09 12:05:32 +0000 (Thu, 09 Apr 2015) New Revision: 1125 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1125 Log: Deletion of method. Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-09 10:29:34 UTC (rev 1124) +++ oipf/js/test/SearchManagerTest.js 2015-04-09 12:05:32 UTC (rev 1125) @@ -193,70 +193,7 @@ 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

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

09 Apr '15

Author: ygrego Date: 2015-04-09 10:29:34 +0000 (Thu, 09 Apr 2015) New Revision: 1124 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1124 Log: New test added: "testGetCurrentProgrammeFromNullStream". Modified: oipf/js/test/SearchManagerTest.js Modified: oipf/js/test/SearchManagerTest.js =================================================================== --- oipf/js/test/SearchManagerTest.js 2015-04-09 09:58:06 UTC (rev 1123) +++ oipf/js/test/SearchManagerTest.js 2015-04-09 10:29:34 UTC (rev 1124) @@ -146,6 +146,54 @@ this.vidBroadObj.bindToCurrentChannel(); }, + testGetCurrentProgrammeFromNullStream: 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 = null; + 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.searchManagerObj.onMetadataSearch = function(search, state) { + + console.log("[INFO]: onMetadataSearch called"); + + switch (state) { + + case 4: + message = "The search cannot be complete."; + console.log(message); + if (search.result.length == 0) { + console.log("State: Ok."); + resolve(); + } else { + console.log("State: Unexpected."); + reject(); + } + break; + + default: + console.log("Unknow state"); + reject(); + + } + }; + + this.vidBroadObj.bindToCurrentChannel(); + }, + testGetCurrentProgrammeWithQuery: function (resolve, reject) { var self = this;

1 0