From 13028bcde7bdd4aeb31259b3da18fb7a2b961a34 Mon Sep 17 00:00:00 2001 From: B~Vladi Date: Thu, 15 May 2014 00:09:21 +0400 Subject: [PATCH] Fixed code style --- test/test.js | 216 +++++++++++++++++++++++++-------------------------- 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/test/test.js b/test/test.js index 195187f..7f509ac 100755 --- a/test/test.js +++ b/test/test.js @@ -12,43 +12,43 @@ var assert = require('assert') , lib = require(libFilename) // Tue, 07 Jun 2011 18:51:45 GMT - , Time = new Date(1307472705067) + , Time = new Date(1307472705067); assert.fn = function(value, msg) { assert.equal('function', typeof value, msg) -} +}; assert.format = function(format, expected, expectedUTC, time) { - time = time || Time + time = time || Time; function _assertFmt(expected, name) { - name = name || 'strftime' - var actual = lib[name](format, time) + name = name || 'strftime'; + var actual = lib[name](format, time); assert.equal(expected, actual, name + '("' + format + '", ' + time + ') is ' + JSON.stringify(actual) + ', expected ' + JSON.stringify(expected)) } - if (expected) _assertFmt(expected, 'strftime') + if (expected) _assertFmt(expected, 'strftime'); _assertFmt(expectedUTC || expected, 'strftimeUTC') -} +}; /// check exports -assert.fn(lib.strftime) -assert.fn(lib.strftimeUTC) -assert.fn(lib.localizedStrftime) -ok('Exports') +assert.fn(lib.strftime); +assert.fn(lib.strftimeUTC); +assert.fn(lib.localizedStrftime); +ok('Exports'); /// time zones if (process.env.TZ == 'America/Vancouver') { - testTimezone('P[DS]T') - assert.format('%C', '01', '01', new Date(100, 0, 1)) - assert.format('%j', '097', '098', new Date(1365390736236)) + testTimezone('P[DS]T'); + assert.format('%C', '01', '01', new Date(100, 0, 1)); + assert.format('%j', '097', '098', new Date(1365390736236)); ok('Time zones (' + process.env.TZ + ')') } else if (process.env.TZ == 'CET') { - testTimezone('CES?T') - assert.format('%C', '01', '00', new Date(100, 0, 1)) - assert.format('%j', '098', '098', new Date(1365390736236)) + testTimezone('CES?T'); + assert.format('%C', '01', '00', new Date(100, 0, 1)); + assert.format('%j', '098', '098', new Date(1365390736236)); ok('Time zones (' + process.env.TZ + ')') } else { @@ -56,56 +56,56 @@ else { } /// check all formats in GMT, most coverage -assert.format('%A', 'Tuesday') -assert.format('%a', 'Tue') -assert.format('%B', 'June') -assert.format('%b', 'Jun') -assert.format('%C', '20') -assert.format('%D', '06/07/11') -assert.format('%d', '07') -assert.format('%-d', '7') -assert.format('%_d', ' 7') -assert.format('%0d', '07') -assert.format('%e', '7') -assert.format('%F', '2011-06-07') -assert.format('%H', null, '18') -assert.format('%h', 'Jun') -assert.format('%I', null, '06') -assert.format('%-I', null, '6') -assert.format('%_I', null, ' 6') -assert.format('%0I', null, '06') -assert.format('%j', null, '158') -assert.format('%k', null, '18') -assert.format('%L', '067') -assert.format('%l', null, ' 6') -assert.format('%-l', null, '6') -assert.format('%_l', null, ' 6') -assert.format('%0l', null, '06') -assert.format('%M', null, '51') -assert.format('%m', '06') -assert.format('%n', '\n') -assert.format('%o', '7th') -assert.format('%P', null, 'pm') -assert.format('%p', null, 'PM') -assert.format('%R', null, '18:51') -assert.format('%r', null, '06:51:45 PM') -assert.format('%S', '45') -assert.format('%s', '1307472705') -assert.format('%T', null, '18:51:45') -assert.format('%t', '\t') -assert.format('%U', '23') -assert.format('%U', '24', null, new Date(+Time + 5 * 86400000)) -assert.format('%u', '2') -assert.format('%v', '7-Jun-2011') -assert.format('%W', '23') -assert.format('%W', '23', null, new Date(+Time + 5 * 86400000)) -assert.format('%w', '2') -assert.format('%Y', '2011') -assert.format('%y', '11') -assert.format('%Z', null, 'GMT') -assert.format('%z', null, '+0000') -assert.format('%%', '%') // any other char -ok('GMT') +assert.format('%A', 'Tuesday'); +assert.format('%a', 'Tue'); +assert.format('%B', 'June'); +assert.format('%b', 'Jun'); +assert.format('%C', '20'); +assert.format('%D', '06/07/11'); +assert.format('%d', '07'); +assert.format('%-d', '7'); +assert.format('%_d', ' 7'); +assert.format('%0d', '07'); +assert.format('%e', '7'); +assert.format('%F', '2011-06-07'); +assert.format('%H', null, '18'); +assert.format('%h', 'Jun'); +assert.format('%I', null, '06'); +assert.format('%-I', null, '6'); +assert.format('%_I', null, ' 6'); +assert.format('%0I', null, '06'); +assert.format('%j', null, '158'); +assert.format('%k', null, '18'); +assert.format('%L', '067'); +assert.format('%l', null, ' 6'); +assert.format('%-l', null, '6'); +assert.format('%_l', null, ' 6'); +assert.format('%0l', null, '06'); +assert.format('%M', null, '51'); +assert.format('%m', '06'); +assert.format('%n', '\n'); +assert.format('%o', '7th'); +assert.format('%P', null, 'pm'); +assert.format('%p', null, 'PM'); +assert.format('%R', null, '18:51'); +assert.format('%r', null, '06:51:45 PM'); +assert.format('%S', '45'); +assert.format('%s', '1307472705'); +assert.format('%T', null, '18:51:45'); +assert.format('%t', '\t'); +assert.format('%U', '23'); +assert.format('%U', '24', null, new Date(+Time + 5 * 86400000)); +assert.format('%u', '2'); +assert.format('%v', '7-Jun-2011'); +assert.format('%W', '23'); +assert.format('%W', '23', null, new Date(+Time + 5 * 86400000)); +assert.format('%w', '2'); +assert.format('%Y', '2011'); +assert.format('%y', '11'); +assert.format('%Z', null, 'GMT'); +assert.format('%z', null, '+0000'); +assert.format('%%', '%'); // any other char +ok('GMT'); /// locales @@ -127,54 +127,54 @@ var it_IT = , T: 'it$%H:%M:%S' , v: 'it$%e-%b-%Y' } -} +}; assert.format_it = function(format, expected, expectedUTC) { function _assertFmt(expected, name) { - name = name || 'strftime' - var actual = lib[name](format, Time, it_IT) + name = name || 'strftime'; + var actual = lib[name](format, Time, it_IT); assert.equal(expected, actual, name + '("' + format + '", Time) is ' + JSON.stringify(actual) + ', expected ' + JSON.stringify(expected)) } - if (expected) _assertFmt(expected, 'strftime') + if (expected) _assertFmt(expected, 'strftime'); _assertFmt(expectedUTC || expected, 'strftimeUTC') -} +}; -assert.format_it('%A', 'martedi') -assert.format_it('%a', 'mar') -assert.format_it('%B', 'giugno') -assert.format_it('%b', 'giu') -assert.format_it('%D', 'it$06/07/11') -assert.format_it('%F', 'it$2011-06-07') -assert.format_it('%p', null, 'it$PM') -assert.format_it('%P', null, 'it$pm') -assert.format_it('%R', null, 'it$18:51') -assert.format_it('%r', null, 'it$06:51:45 it$PM') -assert.format_it('%T', null, 'it$18:51:45') -assert.format_it('%v', 'it$7-giu-2011') -ok('Localization') +assert.format_it('%A', 'martedi'); +assert.format_it('%a', 'mar'); +assert.format_it('%B', 'giugno'); +assert.format_it('%b', 'giu'); +assert.format_it('%D', 'it$06/07/11'); +assert.format_it('%F', 'it$2011-06-07'); +assert.format_it('%p', null, 'it$PM'); +assert.format_it('%P', null, 'it$pm'); +assert.format_it('%R', null, 'it$18:51'); +assert.format_it('%r', null, 'it$06:51:45 it$PM'); +assert.format_it('%T', null, 'it$18:51:45'); +assert.format_it('%v', 'it$7-giu-2011'); +ok('Localization'); /// timezones assert.formatTZ = function(format, expected, tz, time) { time = time || Time; - var actual = lib.strftimeTZ(format, time, tz) + var actual = lib.strftimeTZ(format, time, tz); assert.equal( expected, actual, ('strftime("' + format + '", ' + time + ') is ' + JSON.stringify(actual) + ', expected ' + JSON.stringify(expected)) ) -} +}; -assert.formatTZ('%F %r %z', '2011-06-07 06:51:45 PM +0000', 0) -assert.formatTZ('%F %r %z', '2011-06-07 06:51:45 PM +0000', '+0000') -assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', 120) -assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', '+0200') -assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', -420) -assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', '-0700') -ok('Time zone offset') +assert.formatTZ('%F %r %z', '2011-06-07 06:51:45 PM +0000', 0); +assert.formatTZ('%F %r %z', '2011-06-07 06:51:45 PM +0000', '+0000'); +assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', 120); +assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', '+0200'); +assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', -420); +assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', '-0700'); +ok('Time zone offset'); /// helpers @@ -187,8 +187,8 @@ function ok(s) { console.log('[ \033[32mOK\033[0m ] ' + s) } // Don't pass GMT! Every date includes it and it will fail. // Be careful if you pass a regex, it has to quack like the default one. function testTimezone(regex) { - regex = typeof regex === 'string' ? RegExp('\\((' + regex + ')\\)$') : regex - var match = Time.toString().match(regex) + regex = typeof regex === 'string' ? new RegExp('\\((' + regex + ')\\)$') : regex; + var match = Time.toString().match(regex); if (match) { var off = Time.getTimezoneOffset() , hourOff = off / 60 @@ -207,18 +207,18 @@ function testTimezone(regex) { , ampm = hour12 == hour24 ? 'AM' : 'PM' , R = hour24 + ':' + mins , r = padZero12 + hour12 + ':' + mins + ':45 ' + ampm - , T = R + ':45' - assert.format('%H', padZero24 + hour24, '18') - assert.format('%I', padZero12 + hour12, '06') - assert.format('%k', padSpace24 + hour24, '18') - assert.format('%l', padSpace12 + hour12, ' 6') - assert.format('%M', mins) - assert.format('%P', ampm.toLowerCase(), 'pm') - assert.format('%p', ampm, 'PM') - assert.format('%R', R, '18:51') - assert.format('%r', r, '06:51:45 PM') - assert.format('%T', T, '18:51:45') - assert.format('%Z', tz, 'GMT') + , T = R + ':45'; + assert.format('%H', padZero24 + hour24, '18'); + assert.format('%I', padZero12 + hour12, '06'); + assert.format('%k', padSpace24 + hour24, '18'); + assert.format('%l', padSpace12 + hour12, ' 6'); + assert.format('%M', mins); + assert.format('%P', ampm.toLowerCase(), 'pm'); + assert.format('%p', ampm, 'PM'); + assert.format('%R', R, '18:51'); + assert.format('%r', r, '06:51:45 PM'); + assert.format('%T', T, '18:51:45'); + assert.format('%Z', tz, 'GMT'); assert.format('%z', sign + '0' + Math.abs(hourDiff) + '00', '+0000') } }