removed some globals from tests

brianc · brianc · commit 7d05daaf2c3f · 2011-02-23T19:50:43.000-06:00
diff --git a/lib/binding.js b/lib/binding.js
@@ -60,6 +60,7 @@ p._pulseQueryQueue = function() {
 }
 
 var ctor = function(config) {
+  console.log('creating native client');
   var connection = new Connection();
   connection._queryQueue = [];
   connection._activeQuery = null;
diff --git a/test/integration/client/api-tests.js b/test/integration/client/api-tests.js
@@ -14,7 +14,7 @@ var sink = new helper.Sink(5, 10000, function() {
 test('api', function() {
   log("connecting to %s", connectionString)
   pg.connect(connectionString, assert.calls(function(err, client) {
-    assert.equal(err, null, "Failed to connect: " + sys.inspect(err));
+    assert.equal(err, null, "Failed to connect: " + helper.sys.inspect(err));
 
     client.query('CREATE TEMP TABLE band(name varchar(100))');
 
diff --git a/test/integration/connection/test-helper.js b/test/integration/connection/test-helper.js
@@ -1,6 +1,6 @@
 var net = require('net');
 var helper = require(__dirname+'/../test-helper');
-
+var Connection = require('connection');
 var connect = function(callback) {
   var username = helper.args.user;
   var database = helper.args.database;
diff --git a/test/test-helper.js b/test/test-helper.js
@@ -1,18 +1,18 @@
 require.paths.unshift(__dirname + '/../lib/');
+//make assert a global...
+assert = require('assert');
 
-EventEmitter = require('events').EventEmitter;
+var EventEmitter = require('events').EventEmitter;
+var sys = require('sys');
+var BufferList = require(__dirname+'/buffer-list')
 
-sys = require('sys');
-assert = require('assert');
-BufferList = require(__dirname+'/buffer-list')
-buffers = require(__dirname + '/test-buffers');
-Connection = require('connection');
+var Connection = require('connection');
 var args = require(__dirname + '/cli');
 
 if(args.libpq) {
-  Client = require('binding').Client;
+Client = require('binding').Client;
 } else {
-  Client = require('client');
+Client = require('client');
 }
 
 process.on('uncaughtException', function(d) {
@@ -210,7 +210,9 @@ module.exports = {
   pg: require('index'),
   connectionString: function() {
     return "pg"+(count++)+"://"+args.user+":"+args.password+"@"+args.host+":"+args.port+"/"+args.database;
-  }
+  },
+  sys: sys,
+  Client: Client
 };
 
 
diff --git a/test/unit/client/query-queue-tests.js b/test/unit/client/query-queue-tests.js
@@ -1,4 +1,5 @@
 var helper = require(__dirname + '/test-helper');
+var Connection = require('connection');
 var con = new Connection({stream: "NO"});
 var client = new Client({connection:con});
 
diff --git a/test/unit/client/test-helper.js b/test/unit/client/test-helper.js
@@ -1,5 +1,5 @@
 require(__dirname+'/../test-helper');
-
+var Connection = require('connection');
 var makeClient = function() {
   var connection = new Connection({stream: "no"});
   connection.startup = function() {};
diff --git a/test/unit/connection/error-tests.js b/test/unit/connection/error-tests.js
@@ -1,5 +1,5 @@
 var helper = require(__dirname + '/test-helper');
-
+var Connection = require('connection');
 var con = new Connection({stream: new MemoryStream()});
 test("connection emits stream errors", function() {
   assert.emits(con, 'error', function(err) {
diff --git a/test/unit/connection/inbound-parser-tests.js b/test/unit/connection/inbound-parser-tests.js
@@ -1,5 +1,6 @@
 require(__dirname+'/test-helper');
-
+var Connection = require('connection');
+var buffers = require(__dirname + '/../../test-buffers');
 var PARSE = function(buffer) {
   return new Parser(buffer).parse();
 };
diff --git a/test/unit/connection/outbound-sending-tests.js b/test/unit/connection/outbound-sending-tests.js
@@ -1,4 +1,5 @@
 require(__dirname + "/test-helper");
+var Connection = require('connection');
 var stream = new MemoryStream();
 var con = new Connection({
   stream: stream
diff --git a/test/unit/connection/startup-tests.js b/test/unit/connection/startup-tests.js
@@ -1,5 +1,5 @@
 require(__dirname+'/test-helper');
-
+var Connection = require('connection');
 test('connection can take existing stream', function() {
   var stream = new MemoryStream();
   var con = new Connection({stream: stream});
diff --git a/test/unit/test-helper.js b/test/unit/test-helper.js
@@ -1,10 +1,12 @@
-require(__dirname+'/../test-helper');
+var helper = require(__dirname+'/../test-helper');
+var EventEmitter = require('events').EventEmitter;
+var Connection = require('connection');
 MemoryStream = function() {
   EventEmitter.call(this);
   this.packets = [];
 };
 
-sys.inherits(MemoryStream, EventEmitter);
+helper.sys.inherits(MemoryStream, EventEmitter);
 
 var p = MemoryStream.prototype;
 

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ p._pulseQueryQueue = function() {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`var ctor = function(config) {`
	`63`	`+ console.log('creating native client');`
`63`	`64`	`var connection = new Connection();`
`64`	`65`	`connection._queryQueue = [];`
`65`	`66`	`connection._activeQuery = null;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`var helper = require(__dirname + '/test-helper');`
	`2`	`+var Connection = require('connection');`
`2`	`3`	`var con = new Connection({stream: "NO"});`
`3`	`4`	`var client = new Client({connection:con});`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`require(__dirname + "/test-helper");`
	`2`	`+var Connection = require('connection');`
`2`	`3`	`var stream = new MemoryStream();`
`3`	`4`	`var con = new Connection({`
`4`	`5`	`stream: stream`