Simplify function arguments

chinhodado · Apr 3, 2016 · 638d30b · 638d30b
1 parent 14e23d9
commit 638d30b
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 43 deletions.
diff --git a/common.js b/common.js
@@ -117,15 +117,18 @@ function getParameterByName(name, url) {
 }
 
 function processQuery(queryId, param, executeDirectly) {
+    // TODO: clean up this ugly mess
     if (queryId == "1") {
         if (!executeDirectly) {
             query1();
         }
         else {
             executeQuery1({
-                "test": param.select2,
-                "buildRevision": param.buildRevision
-            })
+                "eq": {
+                    "test.url": param.select2,
+                    "build.revision": param.buildRevision
+                }
+            });
         }
     }
     else if (queryId == "2") {
@@ -134,9 +137,11 @@ function processQuery(queryId, param, executeDirectly) {
         }
         else {
             executeQuery2({
-                "test": param.select2,
-                "buildRevision": param.buildRevision
-            })
+                "eq": {
+                    "test.url": param.select2,
+                    "build.revision": param.buildRevision
+                }
+            });
         }
     }
     else if (queryId == "3") {
@@ -145,9 +150,11 @@ function processQuery(queryId, param, executeDirectly) {
         }
         else {
             executeQuery3({
-                "sourceFile": param.select2,
-                "buildRevision": param.buildRevision
-            })
+                "eq":{
+                    "source.file": param.select2,
+                    "build.revision": param.buildRevision
+                }
+            });
         }
     }
     else if (queryId == "4") {

diff --git a/query1.js b/query1.js
@@ -12,23 +12,18 @@ function query1() {
         var buildRevision = $("#selectBuildRevision").val();
 
         executeQuery1({
-            "test": test,
-            "buildRevision": buildRevision
+            "eq": {
+                "test.url": test,
+                "build.revision": buildRevision
+            }
         });
     });
 }
 
-function executeQuery1(param) {
-    var test = param.test;
-    var buildRevision = param.buildRevision;
+function executeQuery1(where) {
     var query = {
         "limit": 10000,
-        "where": {
-            "eq":{
-                "test.url": test,
-                "build.revision": buildRevision
-            }
-        },
+        "where": where,
         "groupby": ["source.file"],
         "from": "coverage"
     };

diff --git a/query2.js b/query2.js
@@ -12,28 +12,23 @@ function query2() {
         var buildRevision = $("#selectBuildRevision").val();
 
         executeQuery2({
-            "test": test,
-            "buildRevision": buildRevision
+            "eq": {
+                "test.url": test,
+                "build.revision": buildRevision
+            }
         });
     });
 }
 
-function executeQuery2(param) {
-    var test = param.test;
-    var buildRevision = param.buildRevision; 
+function executeQuery2(where) {
     Thread.run(function*(){
         // disable inputs while query is running
         disableAll(true);
 
         // get source files covered by test
         var sources = yield (search({
             "from": "coverage",
-            "where": {
-                "eq": {
-                    "test.url": test,
-                    "build.revision": buildRevision
-                }
-            },
+            "where": where,
             "groupby": [
                 {"name": "source", "value": "source.file"}
             ],
@@ -61,6 +56,7 @@ function executeQuery2(param) {
         siblings.data = qb.sort(siblings.data, "tests.length");
 
         // remove self
+        var test = where.eq["test.url"];
         siblings.data.forall(function(v){
             v.tests.remove(test);
         });

diff --git a/query3.js b/query3.js
@@ -12,28 +12,22 @@ function query3() {
         var buildRevision = $("#selectBuildRevision").val();
 
         executeQuery3({
-            "sourceFile": sourceFile,
-            "buildRevision": buildRevision
+            "eq":{
+                "source.file": sourceFile,
+                "build.revision": buildRevision
+            }
         });
     });
 }
 
-function executeQuery3(param) {
-    var sourceFile = param.sourceFile;
-    var buildRevision = param.buildRevision;
-
+function executeQuery3(where) {
     Thread.run(function*(){
         // disable inputs while query is running
         disableAll(true);
 
         var testFiles = yield (search({
             "limit": 10000,
-            "where": {
-                "eq":{
-                    "source.file": sourceFile,
-                    "build.revision": buildRevision
-                }
-            },
+            "where": where,
             "groupby": ["test.url"],
             "from": "coverage"
         }));