more linting

flush-on-exit
Gareth Jones 11 years ago
parent 913c748ee0
commit 87dc7cf5aa

@ -1,131 +1,134 @@
var assert = require('assert'), "use strict";
vows = require('vows'), var assert = require('assert')
sandbox = require('sandboxed-module'); , vows = require('vows')
, sandbox = require('sandboxed-module');
function makeTestAppender() { function makeTestAppender() {
return { return {
configure: function(config, options) { configure: function(config, options) {
this.configureCalled = true; this.configureCalled = true;
this.config = config; this.config = config;
this.options = options; this.options = options;
return this.appender(); return this.appender();
}, },
appender: function() { appender: function() {
var self = this; var self = this;
return function(logEvt) { self.logEvt = logEvt; } return function(logEvt) { self.logEvt = logEvt; };
} }
}; };
} }
vows.describe('log4js configure').addBatch({ vows.describe('log4js configure').addBatch({
'appenders': { 'appenders': {
'when specified by type': { 'when specified by type': {
topic: function() { topic: function() {
var testAppender = makeTestAppender(), var testAppender = makeTestAppender(),
log4js = sandbox.require( log4js = sandbox.require(
'../lib/log4js', '../lib/log4js',
{ {
requires: { requires: {
'./appenders/cheese': testAppender './appenders/cheese': testAppender
}
}
);
log4js.configure(
{
appenders: [
{ type: "cheese", flavour: "gouda" }
]
},
{ pants: "yes" }
);
return testAppender;
},
'should load appender': function(testAppender) {
assert.ok(testAppender.configureCalled);
},
'should pass config to appender': function(testAppender) {
assert.equal(testAppender.config.flavour, 'gouda');
},
'should pass log4js options to appender': function(testAppender) {
assert.equal(testAppender.options.pants, 'yes');
} }
}, }
'when core appender loaded via loadAppender': { );
topic: function() { log4js.configure(
var testAppender = makeTestAppender(), {
log4js = sandbox.require( appenders: [
'../lib/log4js', { type: "cheese", flavour: "gouda" }
{ requires: { './appenders/cheese': testAppender } } ]
); },
{ pants: "yes" }
log4js.loadAppender('cheese'); );
return log4js; return testAppender;
}, },
'should load appender from ../lib/appenders': function(log4js) { 'should load appender': function(testAppender) {
assert.ok(log4js.appenders.cheese); assert.ok(testAppender.configureCalled);
}, },
'should add appender configure function to appenderMakers' : function(log4js) { 'should pass config to appender': function(testAppender) {
assert.isFunction(log4js.appenderMakers.cheese); assert.equal(testAppender.config.flavour, 'gouda');
},
'should pass log4js options to appender': function(testAppender) {
assert.equal(testAppender.options.pants, 'yes');
}
},
'when core appender loaded via loadAppender': {
topic: function() {
var testAppender = makeTestAppender(),
log4js = sandbox.require(
'../lib/log4js',
{ requires: { './appenders/cheese': testAppender } }
);
log4js.loadAppender('cheese');
return log4js;
},
'should load appender from ../lib/appenders': function(log4js) {
assert.ok(log4js.appenders.cheese);
},
'should add appender configure function to appenderMakers' : function(log4js) {
assert.isFunction(log4js.appenderMakers.cheese);
}
},
'when appender in node_modules loaded via loadAppender': {
topic: function() {
var testAppender = makeTestAppender(),
log4js = sandbox.require(
'../lib/log4js',
{ requires: { 'some/other/external': testAppender } }
);
log4js.loadAppender('some/other/external');
return log4js;
},
'should load appender via require': function(log4js) {
assert.ok(log4js.appenders['some/other/external']);
},
'should add appender configure function to appenderMakers': function(log4js) {
assert.isFunction(log4js.appenderMakers['some/other/external']);
}
},
'when configuration file loaded via LOG4JS_CONFIG environment variable': {
topic: function() {
process.env.LOG4JS_CONFIG = 'some/path/to/mylog4js.json';
var fileRead = 0,
modulePath = 'some/path/to/mylog4js.json',
pathsChecked = [],
mtime = new Date(),
fakeFS = {
config: { appenders: [ { type: 'console', layout: { type: 'messagePassThrough' } } ],
levels: { 'a-test' : 'INFO' } },
readdirSync: function(dir) {
return require('fs').readdirSync(dir);
},
readFileSync: function (file, encoding) {
fileRead += 1;
assert.isString(file);
assert.equal(file, modulePath);
assert.equal(encoding, 'utf8');
return JSON.stringify(fakeFS.config);
},
statSync: function (path) {
pathsChecked.push(path);
if (path === modulePath) {
return { mtime: mtime };
} else {
throw new Error("no such file");
} }
}
}, },
'when appender in node_modules loaded via loadAppender': { log4js = sandbox.require(
topic: function() { '../lib/log4js',
var testAppender = makeTestAppender(), {
log4js = sandbox.require( requires: {
'../lib/log4js', 'fs': fakeFS,
{ requires: { 'some/other/external': testAppender } }
);
log4js.loadAppender('some/other/external');
return log4js;
},
'should load appender via require': function(log4js) {
assert.ok(log4js.appenders['some/other/external']);
},
'should add appender configure function to appenderMakers': function(log4js) {
assert.isFunction(log4js.appenderMakers['some/other/external']);
} }
},
'when configuration file loaded via LOG4JS_CONFIG environment variable': {
topic: function() {
process.env.LOG4JS_CONFIG = 'some/path/to/mylog4js.json';
var fileRead = 0,
modulePath = 'some/path/to/mylog4js.json',
pathsChecked = [],
mtime = new Date(),
fakeFS = {
config: { appenders: [ { type: 'console', layout: { type: 'messagePassThrough' } } ],
levels: { 'a-test' : 'INFO' } },
readdirSync: function(dir) {
return require('fs').readdirSync(dir);
},
readFileSync: function (file, encoding) {
fileRead += 1;
assert.isString(file);
assert.equal(file, modulePath);
assert.equal(encoding, 'utf8');
return JSON.stringify(fakeFS.config);
},
statSync: function (path) {
pathsChecked.push(path);
if (path === modulePath) {
return { mtime: mtime };
} else {
throw new Error("no such file");
}
}
},
log4js = sandbox.require('../lib/log4js',
{
requires: {
'fs': fakeFS,
}
});
delete process.env.LOG4JS_CONFIG;
return fileRead;
},
'should load the specified local configuration file' : function(fileRead) {
assert.equal(fileRead, 1);
} }
} );
delete process.env.LOG4JS_CONFIG;
return fileRead;
},
'should load the specified local configuration file' : function(fileRead) {
assert.equal(fileRead, 1);
}
} }
}
}).exportTo(module); }).exportTo(module);

Loading…
Cancel
Save