From 4037112858511bd3c1ce74d1899e86fe6cafa4dc Mon Sep 17 00:00:00 2001
From: Max Neunhoeffer <max@arangodb.com>
Date: Fri, 8 Aug 2014 15:33:36 +0200
Subject: [PATCH] Make AQL2 test framework work.

---
 js/server/modules/org/arangodb/aql-helper.js | 24 ++++++++++++++------
 js/server/modules/org/arangodb/testing.js    |  4 ----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/js/server/modules/org/arangodb/aql-helper.js b/js/server/modules/org/arangodb/aql-helper.js
index 8740a71bee..b4d445b4e9 100644
--- a/js/server/modules/org/arangodb/aql-helper.js
+++ b/js/server/modules/org/arangodb/aql-helper.js
@@ -148,12 +148,20 @@ function getRawQueryResults (query, bindVars) {
 ////////////////////////////////////////////////////////////////////////////////
 
 function getRawQueryResultsAQL2 (query, bindVars) {
-  var queryResult = internal.AQL_EXECUTE(query, bindVars, { 
-    count: true, 
-    batchSize : 3000 
-  });
-
-  return queryResult.docs;
+  var queryResult;
+  if (typeof bindVars == "object") {
+    queryResult = AQL_EXECUTE(query, bindVars, { 
+      count: true, 
+      batchSize : 3000 
+    });
+  }
+  else {
+    queryResult = AQL_EXECUTE(query, {}, {
+      count: true,
+      batchSize : 3000
+    });
+  }
+  return queryResult.json;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -198,7 +206,9 @@ function getQueryResults2 (query, bindVars, recursive) {
   var result2 = getQueryResultsAQL2(query, bindVars, recursive);
 
   if (! _.isEqual(result, result2)) {
-    throw "Old and new AQL return different results!";
+    require("internal").print("Old and new AQL return different results!");
+    require("internal").print("Old result:\n", result);
+    require("internal").print("New result:\n", result2);
   }
 
   return result;
diff --git a/js/server/modules/org/arangodb/testing.js b/js/server/modules/org/arangodb/testing.js
index b54ddb62be..883f204bd2 100644
--- a/js/server/modules/org/arangodb/testing.js
+++ b/js/server/modules/org/arangodb/testing.js
@@ -331,10 +331,6 @@ function findTests () {
               return fs.join(makePath("js/server/tests"),x);
             }).sort();
 
-
-  require("internal").print(tests_shell_server_aql);
-  require("internal").print(tests_shell_server_aql_extended);
-
   tests_shell_server = tests_shell_common.concat(tests_shell_server_only);
   tests_shell_client = tests_shell_common.concat(tests_shell_client_only);
   foundTests = true;