removed main function, now using felixge's sandboxed-module, split code into multiple files

This commit is contained in:
Gareth Jones
2011-07-12 13:02:48 +10:00
parent 8767cda15f
commit e121ca345a
5 changed files with 433 additions and 834 deletions

View File

@@ -1,16 +1,6 @@
var vows = require('vows'),
assert = require('assert');
var mockLog4js = {
levels: {
TRACE: 0,
DEBUG: 1,
INFO: 2,
WARN: 3,
ERROR: 4,
FATAL: 5
}
}
var vows = require('vows')
, assert = require('assert')
, levels = require('../lib/levels');
function MockLogger() {
@@ -22,10 +12,10 @@ function MockLogger() {
};
this.isLevelEnabled = function(level) {
return (level >= that.level);
return level.isGreaterThanOrEqualTo(that.level);
};
this.level = mockLog4js.levels.TRACE;
this.level = levels.TRACE;
}
@@ -53,7 +43,7 @@ function MockResponse(statusCode) {
vows.describe('log4js connect logger').addBatch({
'getConnectLoggerModule': {
topic: function() {
var clm = require('../lib/connect-logger')(mockLog4js);
var clm = require('../lib/connect-logger');
return clm;
},
@@ -80,14 +70,14 @@ vows.describe('log4js connect logger').addBatch({
var req = new MockRequest('my.remote.addr', 'GET', 'http://url');
var res = new MockResponse(200);
cl(req, res, function() { });
res.end('chunk', 'encoding');
return ml.messages;
res.end('chunk', 'encoding');
return ml.messages;
},
'check message': function(messages) {
assert.isArray(messages);
assert.length(messages, 1);
assert.equal(messages[0].level, mockLog4js.levels.TRACE);
assert.equal(messages[0].level, levels.INFO);
assert.include(messages[0].message, 'GET');
assert.include(messages[0].message, 'http://url');
assert.include(messages[0].message, 'my.remote.addr');
@@ -98,7 +88,7 @@ vows.describe('log4js connect logger').addBatch({
'log events with level below logging level' : {
topic: function(clm) {
var ml = new MockLogger();
ml.level = mockLog4js.levels.FATAL;
ml.level = levels.FATAL;
var cl = clm.connectLogger(ml);
var req = new MockRequest('my.remote.addr', 'GET', 'http://url');
var res = new MockResponse(200);
@@ -116,8 +106,8 @@ vows.describe('log4js connect logger').addBatch({
'log events with non-default level and custom format' : {
topic: function(clm) {
var ml = new MockLogger();
ml.level = mockLog4js.levels.INFO;
var cl = clm.connectLogger(ml, { level: mockLog4js.levels.INFO, format: ':method :url' } );
ml.level = levels.INFO;
var cl = clm.connectLogger(ml, { level: levels.INFO, format: ':method :url' } );
var req = new MockRequest('my.remote.addr', 'GET', 'http://url');
var res = new MockResponse(200);
cl(req, res, function() { });
@@ -128,7 +118,7 @@ vows.describe('log4js connect logger').addBatch({
'check message': function(messages) {
assert.isArray(messages);
assert.length(messages, 1);
assert.equal(messages[0].level, mockLog4js.levels.INFO);
assert.equal(messages[0].level, levels.INFO);
assert.equal(messages[0].message, 'GET http://url');
}
}