cartodb4/log4js-node
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved coverage for layouts

Browse Source
This commit is contained in:
Gareth Jones 2013-06-14 08:13:16 +10:00
parent d2f30b473f
commit efc4e36317
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/layouts.js
View File

@ -10,9 +10,7 @@ var dateFormat = require('./date_format')
"colored": function() { return colouredLayout; }, "colored": function() { return colouredLayout; },
"coloured": function() { return colouredLayout; }, "coloured": function() { return colouredLayout; },
"pattern": function (config) { "pattern": function (config) {
var pattern = config.pattern || undefined; return patternLayout(config && config.pattern, config && config.tokens);
var tokens = config.tokens || undefined;
return patternLayout(pattern, tokens);
} }
} }
, colours = { , colours = {
@ -231,11 +229,7 @@ function patternLayout (pattern, tokens) {
}; };
function replaceToken(conversionCharacter, loggingEvent, specifier) { function replaceToken(conversionCharacter, loggingEvent, specifier) {
var replacer = replacers[conversionCharacter]; return replacers[conversionCharacter](loggingEvent, specifier);
if (replacer) {
return replacer(loggingEvent, specifier);
}
return null;
} }
function truncate(truncation, toTruncate) { function truncate(truncation, toTruncate) {

24
test/layouts-test.js
View File

@ -90,9 +90,8 @@ vows.describe('log4js layouts').addBatch({
}).match(/Error\s+at Object\..*\s+\((.*)test[\\\/]layouts-test\.js\:\d+\:\d+\)\s+at runTest/) }).match(/Error\s+at Object\..*\s+\((.*)test[\\\/]layouts-test\.js\:\d+\:\d+\)\s+at runTest/)
, 'regexp did not return a match'); , 'regexp did not return a match');
}, },
'with passed augmented errors': 'with passed augmented errors': {
{ topic: topic: function(layout){
function(layout){
var e = new Error("My Unique Error Message"); var e = new Error("My Unique Error Message");
e.augmented = "My Unique attribute value"; e.augmented = "My Unique attribute value";
e.augObj = { at1: "at2" }; e.augObj = { at1: "at2" };
@ -186,7 +185,8 @@ vows.describe('log4js layouts').addBatch({
}, layout = require('../lib/layouts').patternLayout }, layout = require('../lib/layouts').patternLayout
, tokens = { , tokens = {
testString: 'testStringToken', testString: 'testStringToken',
testFunction: function() { return 'testFunctionToken'; } testFunction: function() { return 'testFunctionToken'; },
fnThatUsesLogEvent: function(logEvent) { return logEvent.level.toString(); }
}; };
return [layout, event, tokens]; return [layout, event, tokens];
}, },
@ -233,6 +233,9 @@ vows.describe('log4js layouts').addBatch({
'should output anything not preceded by % as literal': function(args) { 'should output anything not preceded by % as literal': function(args) {
test(args, 'blah blah blah', 'blah blah blah'); test(args, 'blah blah blah', 'blah blah blah');
}, },
'should output the original string if no replacer matches the token': function(args) {
test(args, '%a{3}', 'a{3}');
},
'should handle complicated patterns': function(args) { 'should handle complicated patterns': function(args) {
test(args, test(args,
'%m%n %c{2} at %d{ABSOLUTE} cheese %p%n', '%m%n %c{2} at %d{ABSOLUTE} cheese %p%n',
@ -268,8 +271,21 @@ vows.describe('log4js layouts').addBatch({
'%x{doesNotExist} should output the string stored in tokens': function(args) { '%x{doesNotExist} should output the string stored in tokens': function(args) {
test(args, '%x{doesNotExist}', '%x{doesNotExist}'); test(args, '%x{doesNotExist}', '%x{doesNotExist}');
}, },
'%x{fnThatUsesLogEvent} should be able to use the logEvent': function(args) {
test(args, '%x{fnThatUsesLogEvent}', 'DEBUG');
},
'%x should output the string stored in tokens': function(args) { '%x should output the string stored in tokens': function(args) {
test(args, '%x', '%x'); test(args, '%x', '%x');
}, },
},
'layout makers': {
topic: require('../lib/layouts'),
'should have a maker for each layout': function(layouts) {
assert.ok(layouts.layout("messagePassThrough"));
assert.ok(layouts.layout("basic"));
assert.ok(layouts.layout("colored"));
assert.ok(layouts.layout("coloured"));
assert.ok(layouts.layout("pattern"));
}
} }
}).export(module); }).export(module);