sv week tests

diff --git a/lang/sv.js b/lang/sv.js
index cb32ae8fdadc1d3a14362410a20afd1c5f1b0c71..381c0fb01472cd5a525b5a794a827120c699a7d5 100644 (file)
--- a/lang/sv.js
+++ b/lang/sv.js
@@ -44,6 +44,10 @@
                     (b === 1) ? 'a' :
                     (b === 2) ? 'a' :
                     (b === 3) ? 'e' : 'e';
+            },
+            week : {
+                dow : 1, // Monday is the first day of the week.
+                doy : 4  // The week that contains Jan 4th is the first week of the year.
             }
         };
 

diff --git a/test/lang/sv.js b/test/lang/sv.js
index 49a11210ef2f9bc61078aeb969354607f4c6a7ec..9288f47e174d81bca8c1f8c02f501cf13e825fd2 100644 (file)
--- a/test/lang/sv.js
+++ b/test/lang/sv.js
@@ -1,14 +1,22 @@
 var moment = require("../../moment");
 
-
-    /**************************************************
-      English
-     *************************************************/
+/**************************************************
+  Swedish
+ *************************************************/
 
 exports["lang:sv"] = {
+    setUp : function (cb) {
+        moment.lang('sv');
+        cb();
+    },
+
+    tearDown : function (cb) {
+        moment.lang('en');
+        cb();
+    },
+
     "parse" : function(test) {
         test.expect(96);
-        moment.lang('sv');
         var tests = 'januari jan_februari feb_mars mar_april apr_maj maj_juni jun_juli jul_augusti aug_september sep_oktober okt_november nov_december dec'.split("_");
         var i;
         function equalTest(input, mmm, i) {
@@ -30,7 +38,6 @@ exports["lang:sv"] = {
 
     "format" : function(test) {
         test.expect(18);
-        moment.lang('sv');
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss a',      'söndag, februari 14e 2010, 3:25:50 pm'],
                 ['ddd, hA',                            'sön, 3PM'],
@@ -39,7 +46,7 @@ exports["lang:sv"] = {
                 ['D Do DD',                            '14 14e 14'],
                 ['d do dddd ddd dd',                   '0 0e söndag sön sö'],
                 ['DDD DDDo DDDD',                      '45 45e 045'],
-                ['w wo ww',                            '8 8e 08'],
+                ['w wo ww',                            '6 6e 06'],
                 ['h hh',                               '3 03'],
                 ['H HH',                               '15 15'],
                 ['m mm',                               '25 25'],
@@ -61,7 +68,6 @@ exports["lang:sv"] = {
 
     "format ordinal" : function(test) {
         test.expect(31);
-        moment.lang('sv');
         test.equal(moment([2011, 0, 1]).format('DDDo'), '1a', '1a');
         test.equal(moment([2011, 0, 2]).format('DDDo'), '2a', '2a');
         test.equal(moment([2011, 0, 3]).format('DDDo'), '3e', '3e');
@@ -101,7 +107,6 @@ exports["lang:sv"] = {
 
     "format month" : function(test) {
         test.expect(12);
-        moment.lang('sv');
        var expected = 'januari jan_februari feb_mars mar_april apr_maj maj_juni jun_juli jul_augusti aug_september sep_oktober okt_november nov_december dec'.split("_");
         var i;
         for (i = 0; i < expected.length; i++) {
@@ -112,7 +117,6 @@ exports["lang:sv"] = {
 
     "format week" : function(test) {
         test.expect(7);
-        moment.lang('sv');
         var expected = 'söndag sön sö_måndag mån må_tisdag tis ti_onsdag ons on_torsdag tor to_fredag fre fr_lördag lör lö'.split("_");
         var i;
         for (i = 0; i < expected.length; i++) {
@@ -123,7 +127,6 @@ exports["lang:sv"] = {
 
     "from" : function(test) {
         test.expect(30);
-        moment.lang('sv');
         var start = moment([2007, 1, 28]);
         test.equal(start.from(moment([2007, 1, 28]).add({s:44}), true),  "några sekunder", "44 sekunder = a few seconds");
         test.equal(start.from(moment([2007, 1, 28]).add({s:45}), true),  "en minut",      "45 seconds = a minute");
@@ -160,7 +163,6 @@ exports["lang:sv"] = {
 
     "suffix" : function(test) {
         test.expect(2);
-        moment.lang('sv');
         test.equal(moment(30000).from(0), "om några sekunder",  "prefix");
         test.equal(moment(0).from(30000), "för några sekunder sen", "suffix");
         test.done();
@@ -168,14 +170,12 @@ exports["lang:sv"] = {
 
     "now from now" : function(test) {
         test.expect(1);
-        moment.lang('sv');
         test.equal(moment().fromNow(), "för några sekunder sen",  "now from now should display as in the past");
         test.done();
     },
 
     "fromNow" : function(test) {
         test.expect(2);
-        moment.lang('sv');
         test.equal(moment().add({s:30}).fromNow(), "om några sekunder", "in a few seconds");
         test.equal(moment().add({d:5}).fromNow(), "om 5 dagar", "in 5 days");
         test.done();
@@ -183,7 +183,6 @@ exports["lang:sv"] = {
 
     "calendar day" : function(test) {
         test.expect(6);
-        moment.lang('sv');
 
         var a = moment().hours(2).minutes(0).seconds(0);
 
@@ -198,7 +197,6 @@ exports["lang:sv"] = {
 
     "calendar next week" : function(test) {
         test.expect(15);
-        moment.lang('sv');
 
         var i;
         var m;
@@ -216,7 +214,9 @@ exports["lang:sv"] = {
 
     "calendar last week" : function(test) {
         test.expect(15);
-        moment.lang('sv');
+
+        var i;
+        var m;
 
         for (i = 2; i < 7; i++) {
             m = moment().subtract({ d: i });
@@ -231,7 +231,6 @@ exports["lang:sv"] = {
 
     "calendar all else" : function(test) {
         test.expect(4);
-        moment.lang('sv');
         var weeksAgo = moment().subtract({ w: 1 });
         var weeksFromNow = moment().add({ w: 1 });
 
@@ -243,6 +242,111 @@ exports["lang:sv"] = {
 
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "2 weeks ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 2 weeks");
-    test.done();
+
+        test.done();
+    },
+
+    // Monday is the first day of the week.
+    // The week that contains Jan 4th is the first week of the year.
+
+    "weeks year starting sunday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2012, 0, 1]).week(), 52, "Jan  1 2012 should be week 52");
+        test.equal(moment([2012, 0, 2]).week(),  1, "Jan  2 2012 should be week 1");
+        test.equal(moment([2012, 0, 8]).week(),  1, "Jan  8 2012 should be week 1");
+        test.equal(moment([2012, 0, 9]).week(),  2, "Jan  9 2012 should be week 2");
+        test.equal(moment([2012, 0, 15]).week(), 2, "Jan 15 2012 should be week 2");
+
+        test.done();
+    },
+
+    "weeks year starting monday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2007, 0, 1]).week(),  1, "Jan  1 2007 should be week 1");
+        test.equal(moment([2007, 0, 7]).week(),  1, "Jan  7 2007 should be week 1");
+        test.equal(moment([2007, 0, 8]).week(),  2, "Jan  8 2007 should be week 2");
+        test.equal(moment([2007, 0, 14]).week(), 2, "Jan 14 2007 should be week 2");
+        test.equal(moment([2007, 0, 15]).week(), 3, "Jan 15 2007 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting tuesday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2007, 11, 31]).week(), 1, "Dec 31 2007 should be week 1");
+        test.equal(moment([2008,  0,  1]).week(), 1, "Jan  1 2008 should be week 1");
+        test.equal(moment([2008,  0,  6]).week(), 1, "Jan  6 2008 should be week 1");
+        test.equal(moment([2008,  0,  7]).week(), 2, "Jan  7 2008 should be week 2");
+        test.equal(moment([2008,  0, 13]).week(), 2, "Jan 13 2008 should be week 2");
+        test.equal(moment([2008,  0, 14]).week(), 3, "Jan 14 2008 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting wednesday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2002, 11, 30]).week(), 1, "Dec 30 2002 should be week 1");
+        test.equal(moment([2003,  0,  1]).week(), 1, "Jan  1 2003 should be week 1");
+        test.equal(moment([2003,  0,  5]).week(), 1, "Jan  5 2003 should be week 1");
+        test.equal(moment([2003,  0,  6]).week(), 2, "Jan  6 2003 should be week 2");
+        test.equal(moment([2003,  0, 12]).week(), 2, "Jan 12 2003 should be week 2");
+        test.equal(moment([2003,  0, 13]).week(), 3, "Jan 13 2003 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting thursday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2008, 11, 29]).week(), 1, "Dec 29 2008 should be week 1");
+        test.equal(moment([2009,  0,  1]).week(), 1, "Jan  1 2009 should be week 1");
+        test.equal(moment([2009,  0,  4]).week(), 1, "Jan  4 2009 should be week 1");
+        test.equal(moment([2009,  0,  5]).week(), 2, "Jan  5 2009 should be week 2");
+        test.equal(moment([2009,  0, 11]).week(), 2, "Jan 11 2009 should be week 2");
+        test.equal(moment([2009,  0, 13]).week(), 3, "Jan 12 2009 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting friday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53");
+        test.equal(moment([2010,  0,  1]).week(), 53, "Jan  1 2010 should be week 53");
+        test.equal(moment([2010,  0,  3]).week(), 53, "Jan  3 2010 should be week 53");
+        test.equal(moment([2010,  0,  4]).week(),  1, "Jan  4 2010 should be week 1");
+        test.equal(moment([2010,  0, 10]).week(),  1, "Jan 10 2010 should be week 1");
+        test.equal(moment([2010,  0, 11]).week(),  2, "Jan 11 2010 should be week 2");
+
+        test.done();
+    },
+
+    "weeks year starting saturday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52");
+        test.equal(moment([2011,  0,  1]).week(), 52, "Jan  1 2011 should be week 52");
+        test.equal(moment([2011,  0,  2]).week(), 52, "Jan  2 2011 should be week 52");
+        test.equal(moment([2011,  0,  3]).week(),  1, "Jan  3 2011 should be week 1");
+        test.equal(moment([2011,  0,  9]).week(),  1, "Jan  9 2011 should be week 1");
+        test.equal(moment([2011,  0, 10]).week(),  2, "Jan 10 2011 should be week 2");
+
+        test.done();
+    },
+
+    "weeks year starting sunday formatted" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52a', "Jan  1 2012 should be week 52");
+        test.equal(moment([2012, 0,  2]).format('w ww wo'),  '1 01 1a' , "Jan  2 2012 should be week 1");
+        test.equal(moment([2012, 0,  8]).format('w ww wo'),  '1 01 1a' , "Jan  8 2012 should be week 1");
+        test.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2a' , "Jan  9 2012 should be week 2");
+        test.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2a' , "Jan 15 2012 should be week 2");
+
+        test.done();
     }
 };