Skip to content

Commit

Permalink
Fix tests and change name to allow vows to run them all at once.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Kunkle committed Jan 11, 2012
1 parent 9e4f4a8 commit bad29fb
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 50 deletions.
4 changes: 4 additions & 0 deletions lib/driver/index.js
View file
@@ -1,4 +1,8 @@
exports.connect = function(config, callback) {
if (config.driver === undefined) {
throw new Error('config must include a driver key specifing which driver to use');
}

var driver = require('./' + config.driver);
driver.connect(config, function(err, db) {
if (err) { callback(err); return; }
Expand Down
0 test/driver/base.js → test/driver/base_test.js
View file
File renamed without changes.
88 changes: 38 additions & 50 deletions test/driver/sqlite3.js → test/driver/sqlite3_test.js
View file
@@ -1,30 +1,28 @@
var vows = require('vows');
var assert = require('assert');
var sqlite3 = require('sqlite3');
//var sqlite3 = require('sqlite3');
var dbInfo = require('db-info');
var dataType = require('../../lib/data_type');
var sqlite3Driver = require('../../lib/driver/sqlite3');
var driver = require('../../lib/driver');

vows.describe('sqlite3').addBatch({
'createTable': {
topic: function() {
sqlite3Driver.connect({filename: ':memory:'}, function(err, driver) {
driver.createTable('event', {
driver.connect({driver: 'sqlite3', filename: ':memory:'}, function(err, db) {
db.createTable('event', {
id: { type: dataType.INTEGER, primaryKey: true, autoIncrement: true },
str: { type: dataType.STRING, unique: true },
txt: { type: dataType.TEXT, notNull: true, defaultValue: "foo" },
intg: dataType.INTEGER,
rel: dataType.REAL,
dt: dataType.DATE_TIME
}, {}, function() {
this.callback(null, driver);
}.bind(this));
}, this.callback.bind(this, null, db));
}.bind(this));
},

'has resulting table': {
topic: function(driver) {
dbInfo.getInfo({db: driver.connection, driver: 'sqlite3'}, this.callback);
topic: function(db) {
dbInfo.getInfo({db: db.connection, driver: 'sqlite3'}, this.callback);
},

'with 6 columns': function(err, info) {
Expand Down Expand Up @@ -68,20 +66,18 @@ vows.describe('sqlite3').addBatch({

'dropTable': {
topic: function() {
sqlite3Driver.connect({filename: ':memory:'}, function(err, driver) {
driver.createTable('event', {
driver.connect({driver: 'sqlite3', filename: ':memory:'}, function(err, db) {
db.createTable('event', {
id: { type: dataType.INTEGER, primaryKey: true, autoIncrement: true },
}, {}, function() {
driver.dropTable('event', function() {
this.callback(null, driver);
}.bind(this));
}, function() {
db.dropTable('event', this.callback.bind(this, null, db));
}.bind(this));
}.bind(this));
},

'has resulting table': {
topic: function(driver) {
dbInfo.getInfo({db: driver.connection, driver: 'sqlite3'}, this.callback);
topic: function(db) {
dbInfo.getInfo({db: db.connection, driver: 'sqlite3'}, this.callback);
},

'that no longer exists': function(err, info) {
Expand All @@ -93,20 +89,18 @@ vows.describe('sqlite3').addBatch({

'renameTable': {
topic: function() {
sqlite3Driver.connect({filename: ':memory:'}, function(err, driver) {
driver.createTable('event', {
driver.connect({driver: 'sqlite3', filename: ':memory:'}, function(err, db) {
db.createTable('event', {
id: { type: dataType.INTEGER, primaryKey: true, autoIncrement: true },
}, {}, function() {
driver.renameTable('event', 'functions', function() {
this.callback(null, driver);
}.bind(this));
}, function() {
db.renameTable('event', 'functions', this.callback.bind(this, null, db));
}.bind(this));
}.bind(this));
},

'has resulting table': {
topic: function(driver) {
dbInfo.getInfo({db: driver.connection, driver: 'sqlite3'}, this.callback);
topic: function(db) {
dbInfo.getInfo({db: db.connection, driver: 'sqlite3'}, this.callback);
},

'that has been renamed': function(err, info) {
Expand All @@ -119,20 +113,18 @@ vows.describe('sqlite3').addBatch({

'addColumn': {
topic: function() {
sqlite3Driver.connect({filename: ':memory:'}, function(err, driver) {
driver.createTable('event', {
driver.connect({driver: 'sqlite3', filename: ':memory:'}, function(err, db) {
db.createTable('event', {
id: { type: dataType.INTEGER, primaryKey: true, autoIncrement: true },
}, {}, function() {
driver.addColumn('event', 'title', 'string', function(err) {
this.callback(null, driver);
}.bind(this));
}, function() {
db.addColumn('event', 'title', 'string', this.callback.bind(this, null, db));
}.bind(this));
}.bind(this));
},

'has resulting column': {
topic: function(driver) {
dbInfo.getInfo({db: driver.connection, driver: 'sqlite3'}, this.callback);
topic: function(db) {
dbInfo.getInfo({db: db.connection, driver: 'sqlite3'}, this.callback);
},

'with additional column': function(err, info) {
Expand All @@ -145,21 +137,19 @@ vows.describe('sqlite3').addBatch({

'addIndex': {
topic: function() {
sqlite3Driver.connect({filename: ':memory:'}, function(err, driver) {
driver.createTable('event', {
driver.connect({driver: 'sqlite3', filename: ':memory:'}, function(err, db) {
db.createTable('event', {
id: { type: dataType.INTEGER, primaryKey: true, autoIncrement: true },
title: { type: dataType.STRING },
}, {}, function() {
driver.addIndex('event', 'event_title', 'title', function(err) {
this.callback(null, driver);
}.bind(this));
}, function() {
db.addIndex('event', 'event_title', 'title', this.callback.bind(this, null, db));
}.bind(this));
}.bind(this));
},

'has resulting table': {
topic: function(driver) {
dbInfo.getInfo({db: driver.connection, driver: 'sqlite3'}, this.callback);
topic: function(db) {
dbInfo.getInfo({db: db.connection, driver: 'sqlite3'}, this.callback);
},

'with additional index': function(err, info) {
Expand All @@ -171,22 +161,20 @@ vows.describe('sqlite3').addBatch({

'removeIndex': {
topic: function() {
sqlite3Driver.connect({filename: ':memory:'}, function(err, driver) {
driver.createTable('event', {
driver.connect({driver: 'sqlite3', filename: ':memory:'}, function(err, db) {
db.createTable('event', {
id: { type: dataType.INTEGER, primaryKey: true, autoIncrement: true },
}, {}, function() {
driver.addIndex('event', 'event_title', 'title', function(err) {
driver.removeIndex('event_title', function(err) {
this.callback(null, driver);
}.bind(this));
}, function() {
db.addIndex('event', 'event_title', 'title', function(err) {
db.removeIndex('event_title', this.callback.bind(this, null, db));
}.bind(this));
}.bind(this));
}.bind(this));
},

'has resulting table': {
topic: function(driver) {
dbInfo.getInfo({db: driver.connection, driver: 'sqlite3'}, this.callback);
topic: function(db) {
dbInfo.getInfo({db: db.connection, driver: 'sqlite3'}, this.callback);
},

'without index': function(err, info) {
Expand Down
0 test/integration/create.js → test/integration/create_test.js
View file
File renamed without changes.
0 test/util.js → test/util_test.js
View file
File renamed without changes.

0 comments on commit bad29fb

Please sign in to comment.