From 9eb0f9dbd06e6178356fbb291a9827d318be4f23 Mon Sep 17 00:00:00 2001 From: Chi Thu Le Date: Thu, 10 Nov 2016 10:33:45 +0100 Subject: [PATCH] fix for #315 - Include milliseconds in format ISO8601_WITH_TZ_OFFSET --- lib/date_format.js | 2 +- test/vows/date_format-test.js | 4 ++-- test/vows/layouts-test.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/date_format.js b/lib/date_format.js index b9e0131..109f931 100644 --- a/lib/date_format.js +++ b/lib/date_format.js @@ -1,6 +1,6 @@ "use strict"; exports.ISO8601_FORMAT = "yyyy-MM-dd hh:mm:ss.SSS"; -exports.ISO8601_WITH_TZ_OFFSET_FORMAT = "yyyy-MM-ddThh:mm:ssO"; +exports.ISO8601_WITH_TZ_OFFSET_FORMAT = "yyyy-MM-ddThh:mm:ss.SSSO"; exports.DATETIME_FORMAT = "dd MM yyyy hh:mm:ss.SSS"; exports.ABSOLUTETIME_FORMAT = "hh:mm:ss.SSS"; diff --git a/test/vows/date_format-test.js b/test/vows/date_format-test.js index 02a545a..a6fe52e 100644 --- a/test/vows/date_format-test.js +++ b/test/vows/date_format-test.js @@ -28,14 +28,14 @@ vows.describe('date_format').addBatch({ date.getTimezoneOffset = function() { return -660; }; assert.equal( dateFormat.asString(dateFormat.ISO8601_WITH_TZ_OFFSET_FORMAT, date), - "2010-01-11T14:31:30+1100" + "2010-01-11T14:31:30.005+1100" ); date = createFixedDate(); date.setMinutes(date.getMinutes() - date.getTimezoneOffset() + 120); date.getTimezoneOffset = function() { return 120; }; assert.equal( dateFormat.asString(dateFormat.ISO8601_WITH_TZ_OFFSET_FORMAT, date), - "2010-01-11T14:31:30-0200" + "2010-01-11T14:31:30.005-0200" ); }, diff --git a/test/vows/layouts-test.js b/test/vows/layouts-test.js index 7a7a606..84971a5 100644 --- a/test/vows/layouts-test.js +++ b/test/vows/layouts-test.js @@ -252,7 +252,7 @@ vows.describe('log4js layouts').addBatch({ test(args, '%d', '2010-12-05 14:18:30.045'); }, '%d should allow for format specification': function(args) { - test(args, '%d{ISO8601_WITH_TZ_OFFSET}', '2010-12-05T14:18:30-0000'); + test(args, '%d{ISO8601_WITH_TZ_OFFSET}', '2010-12-05T14:18:30.045-0000'); test(args, '%d{ISO8601}', '2010-12-05 14:18:30.045'); test(args, '%d{ABSOLUTE}', '14:18:30.045'); test(args, '%d{DATE}', '05 12 2010 14:18:30.045');