[Sandbox-commits] r996 - oipf/js/test

31 Mar 2015

Author: ygrego
Date: 2015-03-31 08:43:55 +0000 (Tue, 31 Mar 2015)
New Revision: 996

Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/996

Log:
Deletion of block "try catch" and method "testSearchManagerInit". Use of method "addEventListener" and current channel of a video-broadcast object compared with Channel config's.

Modified:
   oipf/js/test/SearchManagerTest.js

Modified: oipf/js/test/SearchManagerTest.js
===================================================================

--- oipf/js/test/SearchManagerTest.js	2015-03-31 08:33:00 UTC (rev 995)
+++ oipf/js/test/SearchManagerTest.js	2015-03-31 08:43:55 UTC (rev 996)
@@ -5,74 +5,47 @@
  */
 var SearchManagerTest = TestCase.extend({
     
+    searchManagerObj: null,
+    
     init: function () {
 
     },
     
-    testInstanceCreation: function (resolve, reject) {
+    beforeTest: function() {
+        this.searchManagerObj = oipfObjectFactory.createSearchManagerObject();
+    },
+    
+    afterTest: function(resolve, reject) {
         
-        var state = "Pending";
-        console.log("***************************************************************************************************************************");
-        console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state);
-        
-        try {
-            
-            var searchManagerTest = oipfObjectFactory.createSearchManagerObject();
-            
-        } catch (error) {
-            console.log(error.message);
-            throw error;
-        }
-        
-        if (this.assertNotNull(searchManagerTest) && this.assertNotUndefined(searchManagerTest)) {
-            state = "Successfull";
-            console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state);
-            resolve(state);
-        } else {
-            state = "Failure";
-            console.log("[TEST-RUNNING][Info] Id: smTestInstanceCreation, Label: Object creation, State: " + state);
-            reject(new Error(state));
-        }
-        console.log("***************************************************************************************************************************");
-
     },
     
     testGetCurrentProgram: function (resolve, reject) {
-        
         var stat = "Pending";
-        console.log("***************************************************************************************************************************");
-        console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat);
+        console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: " + stat);
         
-        try {
-            var searchManagerObject = oipfObjectFactory.createSearchManagerObject();
-            var channelConfig = oipfObjectFactory.createChannelConfig();
-            var searchTarget = 1;
-            var metaDataSearch = searchManagerObject.createSearch(searchTarget);
-            var startTime = null;
-            metaDataSearch.findProgrammesFromStream(channelConfig.currentChannel, startTime);
-            var offset = 0;
-            var count = 1;
-            metaDataSearch.result.getResults(offset, count);
-            //metaDataSearch.result[0];Must return undefined else wrong behaviour of this method
-            
-        } catch (error) {
-            console.log(error.message);
-            throw error;
-        }
-        
+        var searchTarget = 1;
+        var metaDataSearch = this.searchManagerObj.createSearch(searchTarget);
+        var startTime = null;
+        metaDataSearch.findProgrammesFromStream(oipfObjectFactory.createVideoBroadcastObject().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;
-        searchManagerObject.onMetadataSearch = function (search, state) {
-
+        function onMetadataSearch (search, state) {
+           
             console.log("[INFO]: onMetadataSearch called");
 
             switch (state) {
 
                 case 0:
                     if (self.assertNotNull(search.result[0])) {
-                        console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat);
+                        console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: " + stat);
                         resolve("Successfull");
                     } else {
-                        console.log("[TEST-RUNNING][Info] " + "Id: smTestGetCurrentProgram, Label: Obtain current program according to oipf norm, State: " + stat);
+                        console.log("[TEST-RUNNING][Info] Label: Obtain current program according to oipf norm, State: " + stat);
                         reject(new Error("Failure"));
                     }
                     break;
@@ -91,10 +64,8 @@
                     console.log("Unknow state");
 
             }
-            console.log("***************************************************************************************************************************");
-
-        };
-
+        }
+        this.searchManagerObj.addEventListener("MetadataSearch", onMetadataSearch, false);
     }
 
 });
\ No newline at end of file

    

[Sandbox-commits] r996 - oipf/js/test

ygrego＠users.nuiton.org