From 67e5ea65b35127a53217703ee593594f414d41b5 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Thu, 24 May 2012 23:59:53 +0200 Subject: [PATCH] console is now a module --- UnitTests/HttpInterface/arangodb.rb | 1 + js/common/tests/shell-cap-constraint.js | 3 --- js/common/tests/shell-graph.js | 17 ++++++++--------- js/common/tests/shell-hash-index.js | 3 --- js/common/tests/shell-index-geo.js | 4 +--- js/common/tests/shell-index.js | 3 --- js/common/tests/shell-simple-query.js | 4 +--- js/common/tests/shell-unique-constraint.js | 3 --- js/server/modules/simple-query.js | 1 + 9 files changed, 12 insertions(+), 27 deletions(-) diff --git a/UnitTests/HttpInterface/arangodb.rb b/UnitTests/HttpInterface/arangodb.rb index 76618a4343..3a5f1f24e7 100644 --- a/UnitTests/HttpInterface/arangodb.rb +++ b/UnitTests/HttpInterface/arangodb.rb @@ -1,6 +1,7 @@ # coding: utf-8 require 'httparty' +require 'json' $address = ENV['ARANGO_SERVER'] || '127.0.0.1:8529' diff --git a/js/common/tests/shell-cap-constraint.js b/js/common/tests/shell-cap-constraint.js index 0096289fb9..dbe953eea4 100644 --- a/js/common/tests/shell-cap-constraint.js +++ b/js/common/tests/shell-cap-constraint.js @@ -4,9 +4,6 @@ /*global require, db, assertEqual, assertTrue, - print, - PRINT_OBJECT, - console, ArangoCollection, ArangoEdgesCollection */ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-graph.js b/js/common/tests/shell-graph.js index 4a2787ac85..655dc2b1f0 100644 --- a/js/common/tests/shell-graph.js +++ b/js/common/tests/shell-graph.js @@ -4,9 +4,6 @@ /*global require, db, assertEqual, assertTrue, - print, - PRINT_OBJECT, - console, ArangoCollection, ArangoEdgesCollection */ //////////////////////////////////////////////////////////////////////////////// @@ -37,6 +34,8 @@ //////////////////////////////////////////////////////////////////////////////// var jsunity = require("jsunity"); +var console = require("console"); +var internal = require("internal"); // ----------------------------------------------------------------------------- // --SECTION-- graph module @@ -115,8 +114,8 @@ function GraphBasicsSuite() { try { try { graph = new Graph(graph_name); - print("FOUND: "); - PRINT_OBJECT(graph); + internal.print("FOUND: "); + internal.printObject(graph); graph.drop(); } catch (err1) { @@ -333,8 +332,8 @@ function VertexSuite() { try { try { graph = new Graph(graph_name); - print("FOUND: "); - PRINT_OBJECT(graph); + internal.print("FOUND: "); + internal.printObject(graph); graph.drop(); } catch (err1) { @@ -467,8 +466,8 @@ function EdgeSuite() { try { try { graph = new Graph(graph_name); - print("FOUND: "); - PRINT_OBJECT(graph); + internal.print("FOUND: "); + internal.printObject(graph); graph.drop(); } catch (err1) { diff --git a/js/common/tests/shell-hash-index.js b/js/common/tests/shell-hash-index.js index 82a2414efd..5b48829c85 100644 --- a/js/common/tests/shell-hash-index.js +++ b/js/common/tests/shell-hash-index.js @@ -4,9 +4,6 @@ /*global require, db, assertEqual, assertTrue, - print, - PRINT_OBJECT, - console, ArangoCollection, ArangoEdgesCollection */ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-index-geo.js b/js/common/tests/shell-index-geo.js index 0b5d7b923b..0a903b8e72 100644 --- a/js/common/tests/shell-index-geo.js +++ b/js/common/tests/shell-index-geo.js @@ -4,9 +4,6 @@ /*global require, db, assertEqual, assertTrue, - print, - PRINT_OBJECT, - console, ArangoCollection, ArangoEdgesCollection */ //////////////////////////////////////////////////////////////////////////////// @@ -37,6 +34,7 @@ //////////////////////////////////////////////////////////////////////////////// var jsunity = require("jsunity"); +var console = require("console"); // ----------------------------------------------------------------------------- // --SECTION-- basic methods diff --git a/js/common/tests/shell-index.js b/js/common/tests/shell-index.js index 9d4c672f55..77abb19da4 100644 --- a/js/common/tests/shell-index.js +++ b/js/common/tests/shell-index.js @@ -4,9 +4,6 @@ /*global require, db, assertEqual, assertTrue, - print, - PRINT_OBJECT, - console, ArangoCollection, ArangoEdgesCollection */ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/common/tests/shell-simple-query.js b/js/common/tests/shell-simple-query.js index b74392a035..89bcf5c588 100644 --- a/js/common/tests/shell-simple-query.js +++ b/js/common/tests/shell-simple-query.js @@ -4,9 +4,6 @@ /*global require, db, assertEqual, assertTrue, - print, - PRINT_OBJECT, - console, ArangoCollection, ArangoEdgesCollection */ //////////////////////////////////////////////////////////////////////////////// @@ -38,6 +35,7 @@ var jsunity = require("jsunity"); var SQB = require("simple-query-basics"); + require("simple-query"); // ----------------------------------------------------------------------------- diff --git a/js/common/tests/shell-unique-constraint.js b/js/common/tests/shell-unique-constraint.js index 8e3cd84408..d47e0f4414 100644 --- a/js/common/tests/shell-unique-constraint.js +++ b/js/common/tests/shell-unique-constraint.js @@ -4,9 +4,6 @@ /*global require, db, assertEqual, assertTrue, - print, - PRINT_OBJECT, - console, ArangoCollection, ArangoEdgesCollection */ //////////////////////////////////////////////////////////////////////////////// diff --git a/js/server/modules/simple-query.js b/js/server/modules/simple-query.js index b59d0906ef..fb92859af3 100644 --- a/js/server/modules/simple-query.js +++ b/js/server/modules/simple-query.js @@ -26,6 +26,7 @@ //////////////////////////////////////////////////////////////////////////////// var internal = require("internal"); +var console = require("console"); var SQ = require("simple-query-basics"); // -----------------------------------------------------------------------------