r958 - oipf/js/test - Sandbox-commits

19 Mar 2015

Author: ygrego
Date: 2015-03-19 13:08:38 +0000 (Thu, 19 Mar 2015)
New Revision: 958

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

Log:
Deletion of field "before" into javascript object "testsObjects".
In method "updateTestResult" don't call any more a specific method before each test, so this part have been deleted.

Modified:
   oipf/js/test/Test.js

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

--- oipf/js/test/Test.js	2015-03-19 09:55:00 UTC (rev 957)
+++ oipf/js/test/Test.js	2015-03-19 13:08:38 UTC (rev 958)
@@ -7,49 +7,43 @@
     testsObjects: [{
         name : "VideoBroadcastTest",
         object: new VideoBroadcastTest(),
+        callBeforeAnyTest : "beforeAnyTest",
         tests: [
             {
                 label: "Video broadcast creation.",
-                before: false,
                 method: "testVideoBroadcastInit"
             },
             {
                 label: "Bind the current channel stream with a video broadcast object.",
-                before: true,
                 method: "testBindToCurrentChannel"
             },
             {
                 label: "Switch to precedent channel in channel list.",
-                before: true,
                 method: "testPrevChannel"
             },
             {
                 label: "Switch to next channel in channel list.",
-                before: true,
                 method:"testNextChannel"
             },
             {
                 label: "Release any tuner and/or ressources held by a video broadcast object.",
-                before: true,
                 method: "testRelease"
             },
             {
                 label: "Stop the video and audio presentation of video broadcast object.",
-                before: true,
                 method: "testStop"
             }
         ]},{
         name: "SearchManagerTest",
         object: new SearchManagerTest(),
+        callBeforeAnyTest : "beforeAnyTest",
         tests: [
             {
                 label: "Search manager creation.",
-                before: false,
                 method: "testSearchManagerInit"
             },
             {
                 label: "Obtain current program according to oipf norm.",
-                before: true,
                 method: "testGetCurrentProgram"
             }
         ]
@@ -69,7 +63,7 @@
 
             for (var j = 0; j < tests.length; j++) {
                 var currentTest = tests[j];
-                this.updateTestResult(currentTest, object);
+                this.updateTestResult(currentTest, object, element["callBeforeAnyTest"]);
                
             }
         }
@@ -117,30 +111,29 @@
         document.body.innerHTML = content;
     },
     
-    updateTestResult: function(currentTest, object) {
+    updateTestResult: function(currentTest, object, methodToCallBeforeAnyTest) {
         console.group(currentTest["label"]);
         var timeStart = performance.now();
-        var promise = new Promise(object[currentTest["method"]].bind(object));
         var result = false;
+        object[methodToCallBeforeAnyTest]();
         
-        promise.then(function(val) {
+        new Promise(object[currentTest["method"]].bind(object))
+        .then(function(val) {
             console.groupEnd(currentTest["label"]);
             result = true;
             var timeEnd = performance.now();
             document.getElementById(currentTest["method"] + "Result").textContent = val;
             document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "limegreen";
-            document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms";
-            
-        });
-
-        promise.catch(function(val) {
+            document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms";    
+        })
+        .catch(function(val) {
+            console.log(val);
             console.groupEnd(currentTest["label"]);
             result = true;
             var timeEnd = performance.now();
             document.getElementById(currentTest["method"] + "Result").textContent = val;
             document.getElementById(currentTest["method"] + "Result").style.backgroundColor = "red";
             document.getElementById(currentTest["method"] + "Duration").textContent = (timeEnd - timeStart).toFixed(2) + " ms";
-
         });
 
         setTimeout(function() {

    

r958 - oipf/js/test

ygrego＠users.nuiton.org

tags

participants (1)