From ccc04cdd0b853261d7e3caf6b73267d36db833af Mon Sep 17 00:00:00 2001
From: brianc <brian.m.carlson@gmail.com>
Date: Mon, 25 Oct 2010 01:30:14 -0500
Subject: [PATCH] add cli parsing to all tests

---
 script/create-test-tables.js               | 39 +-----------------
 test/cli.js                                | 46 ++++++++++++++++++++++
 test/integration/connection/test-helper.js |  6 +--
 test/integration/test-helper.js            |  4 +-
 test/test-helper.js                        |  6 +++
 5 files changed, 59 insertions(+), 42 deletions(-)
 create mode 100644 test/cli.js

diff --git a/script/create-test-tables.js b/script/create-test-tables.js
index bcced4fd..1e1f714b 100644
--- a/script/create-test-tables.js
+++ b/script/create-test-tables.js
@@ -1,42 +1,5 @@
-var config = {};
 var sys = require('sys');
-var args = process.argv;
-for(var i = 0; i < args.length; i++) {
-  switch(args[i].toLowerCase()) {
-  case '-u':
-  case '--user':
-    config.user = args[++i];
-    break;
-  case '--password':
-    config.password = args[++i];
-    throw new Error("Passwords not supported yet");
-    break;
-  case '-d':
-  case '--database':
-    config.database = args[++i];
-    break;
-  case '-p':
-  case '--port':
-    config.port = args[++i];
-    break;
-  case '-h':
-  case '--host':
-    config.host = args[++i];
-    break;
-  case '--down':
-    config.down = true;
-    break;
-  default:
-    break;
-  }
-}
-var log = function(keys) {
-  keys.forEach(function(key) {
-    console.log(key + ": '" + config[key] + "'");
-  });
-}
-log(['user','password','database','port','host'])
-
+var config = require(__dirname + '/../test/cli');
 var pg = require(__dirname + '/../lib');
 var con = new pg.Connection();
 var people
diff --git a/test/cli.js b/test/cli.js
new file mode 100644
index 00000000..95fae818
--- /dev/null
+++ b/test/cli.js
@@ -0,0 +1,46 @@
+var config = {
+  port: 5432,
+  host: 'localhost',
+  user: 'postgres',
+  database: 'postgres',
+  password: ''
+};
+
+var args = process.argv;
+for(var i = 0; i < args.length; i++) {
+  switch(args[i].toLowerCase()) {
+  case '-u':
+  case '--user':
+    config.user = args[++i];
+    break;
+  case '--password':
+    config.password = args[++i];
+    throw new Error("Passwords not supported yet");
+    break;
+  case '-d':
+  case '--database':
+    config.database = args[++i];
+    break;
+  case '-p':
+  case '--port':
+    config.port = args[++i];
+    break;
+  case '-h':
+  case '--host':
+    config.host = args[++i];
+    break;
+  case '--down':
+    config.down = true;
+    break;
+  default:
+    break;
+  }
+}
+
+var log = function(keys) {
+  keys.forEach(function(key) {
+    console.log(key + ": '" + config[key] + "'");
+  });
+}
+log(['user','password','database','port','host'])
+module.exports = config;
diff --git a/test/integration/connection/test-helper.js b/test/integration/connection/test-helper.js
index 7f1d0525..34baedd9 100644
--- a/test/integration/connection/test-helper.js
+++ b/test/integration/connection/test-helper.js
@@ -1,11 +1,11 @@
 var net = require('net');
-require(__dirname+'/../test-helper');
+var helper = require(__dirname+'/../test-helper');
 
 var authConnect = function(username, database, callback) {
   if(typeof username === 'function') {
     callback = username;
-    username = 'brian';
-    database = 'postgres';
+    username = helper.args.user;
+    database = helper.args.database;
   }
   var connection = new Connection({stream: new net.Stream()});
   connection.connect('5432','localhost');
diff --git a/test/integration/test-helper.js b/test/integration/test-helper.js
index 20a64141..89e1ab43 100644
--- a/test/integration/test-helper.js
+++ b/test/integration/test-helper.js
@@ -1 +1,3 @@
-require(__dirname + '/../test-helper');
+var helper = require(__dirname + '/../test-helper');
+//export parent helper stuffs
+module.exports = { args: helper.args };
diff --git a/test/test-helper.js b/test/test-helper.js
index fb18f4b3..b849b72c 100644
--- a/test/test-helper.js
+++ b/test/test-helper.js
@@ -8,6 +8,7 @@ EventEmitter = require('events').EventEmitter;
 BufferList = require('buffer-list')
 buffers = require(__dirname + '/test-buffers');
 Connection = require('connection');
+var args = require(__dirname + '/cli');
 
 assert.same = function(actual, expected) {
   for(var key in expected) {
@@ -84,6 +85,7 @@ test = function(name, action) {
     test.errors.push({name: name, e: e});
   }
 };
+
 test.assertCount = test.assertCount || 0;
 test.testCount = test.testCount || 0;
 test.ignored = test.ignored || [];
@@ -104,3 +106,7 @@ process.on('exit', function() {
     throw error.e;
   });
 });
+
+module.exports = {
+  args: args
+};