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