Simplify tests

mysqljs · Aug 31, 2010 · c61d471 · c61d471
1 parent 3406bc6
commit c61d471
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 34 deletions.
diff --git a/lib/mysql/client.js b/lib/mysql/client.js
@@ -19,7 +19,7 @@ function Client(config) {
   this.port = 3306;
   this.user = null;
   this.password = null;
-  this.database = null;
+  this.database = '';
 
   this.flags = Client.defaultFlags;
   this.maxPacketSize = 0x01000000;

diff --git a/test/common.js b/test/common.js
@@ -3,12 +3,12 @@ var path = require('path')
 
 require.paths.unshift(path.dirname(__dirname)+'/lib');
 
+global.TEST_DB = 'node_mysql_test';
 global.TEST_CONFIG = {
   host: 'localhost',
   port: 3306,
   user: 'root',
-  password: 'root',
-  database: 'node_mysql_test',
+  password: 'root'
 };
 
 global.TEST_TABLE = 'posts';

diff --git a/test/simple/test-client.js b/test/simple/test-client.js
@@ -26,7 +26,7 @@ test(function constructor() {
       assert.strictEqual(client.port, 3306);
       assert.strictEqual(client.user, null);
       assert.strictEqual(client.password, null);
-      assert.strictEqual(client.database, null);
+      assert.strictEqual(client.database, '');
 
       assert.strictEqual(client.debug, false);
 

diff --git a/test/system/.test-client-connect.js.un~ b/test/system/.test-client-connect.js.un~
diff --git a/test/system/.test-client-query-calculated-fields.js.un~ b/test/system/.test-client-query-calculated-fields.js.un~
diff --git a/test/system/.test-client-query-empty.js.un~ b/test/system/.test-client-query-empty.js.un~
diff --git a/test/system/.test-client-query-long-fields.js.un~ b/test/system/.test-client-query-long-fields.js.un~
diff --git a/test/system/.test-client-query-null.js.un~ b/test/system/.test-client-query-null.js.un~
diff --git a/test/system/.test-client-query.js.un~ b/test/system/.test-client-query.js.un~
diff --git a/test/system/.test-client-sequential-query.js.un~ b/test/system/.test-client-sequential-query.js.un~
diff --git a/test/system/test-client-connect.js b/test/system/test-client-connect.js
@@ -1,13 +1,10 @@
 require('../common');
-var client = require('mysql').Client(TEST_CONFIG)
-  , gently = new Gently();
-
-// our test db does not exist yet, so don't try to connect to it
-client.database = '';
+var client = require('mysql').Client(TEST_CONFIG),
+    gently = new Gently();
 
 client.connect(gently.expect(function connectCb(err, result) {
   if (err) throw err;
 
   assert.strictEqual(result.affectedRows, 0);
   client.end();
-}));
+}));
diff --git a/test/system/test-client-query-calculated-fields.js b/test/system/test-client-query-calculated-fields.js
@@ -1,10 +1,7 @@
 require('../common');
-var Client = require('mysql').Client,
-    client = Client(TEST_CONFIG),
+var client = require('mysql').Client(TEST_CONFIG),
     gently = new Gently();
 
-// our test db might not exist yet, so don't try to connect to it
-client.database = '';
 client.connect();
 
 client.query('SELECT 1 as field_a, 2 as field_b', function(err, results) {

diff --git a/test/system/test-client-query-empty.js b/test/system/test-client-query-empty.js
@@ -1,10 +1,7 @@
 require('../common');
-var Client = require('mysql').Client,
-    client = Client(TEST_CONFIG),
+var client = require('mysql').Client(TEST_CONFIG),
     gently = new Gently();
 
-// our test db might not exist yet, so don't try to connect to it
-client.database = '';
 client.connect();
 
 client.query('SELECT "" as field_a', function(err, results) {

diff --git a/test/system/test-client-query-long-fields.js b/test/system/test-client-query-long-fields.js
@@ -1,9 +1,7 @@
 require('../common');
-var Client = require('mysql').Client,
-    client = Client(TEST_CONFIG),
+var client = require('mysql').Client(TEST_CONFIG),
     gently = new Gently();
 
-// our test db might not exist yet, so don't try to connect to it
 client.connect();
 
 function makeString(length) {

diff --git a/test/system/test-client-query-null.js b/test/system/test-client-query-null.js
@@ -1,10 +1,7 @@
 require('../common');
-var Client = require('mysql').Client,
-    client = Client(TEST_CONFIG),
+var client = require('mysql').Client(TEST_CONFIG),
     gently = new Gently();
 
-// our test db might not exist yet, so don't try to connect to it
-client.database = '';
 client.connect();
 
 client.query('SELECT NULL as field_a, NULL as field_b', function(err, results) {

diff --git a/test/system/test-client-query.js b/test/system/test-client-query.js
@@ -3,13 +3,10 @@ var Client = require('mysql').Client,
     client = Client(TEST_CONFIG),
     gently = new Gently();
 
-// our test db might not exist yet, so don't try to connect to it
-client.database = '';
-
 client.connect();
 
 client.query(
-  'CREATE DATABASE '+TEST_CONFIG.database,
+  'CREATE DATABASE '+TEST_DB,
   gently.expect(function createDbCb(err) {
     if (err && err.number != Client.ERROR_DB_CREATE_EXISTS) {
       throw err;
@@ -18,7 +15,7 @@ client.query(
 );
 
 client.query(
-  'USE '+TEST_CONFIG.database,
+  'USE '+TEST_DB,
   gently.expect(function useDbCb(err) {
     if (err) {
       throw err;

diff --git a/test/system/test-client-sequential-query.js b/test/system/test-client-sequential-query.js
@@ -1,10 +1,7 @@
 require('../common');
-var Client = require('mysql').Client,
-    client = Client(TEST_CONFIG),
+var client = require('mysql').Client(TEST_CONFIG),
     gently = new Gently();
 
-// our test db might not exist yet, so don't try to connect to it
-client.database = '';
 client.connect();
 
 client.query('SELECT 1 as field_a, 2 as field_b', function(err, results) {