Mercurial Mercurial > hg > stx-goodies-regression / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
class: RegressionTests::TimeAndDateTest
authorClaus Gittinger <cg@exept.de>
Wed, 05 Nov 2014 17:48:40 +0100
changeset 1218 efecc8c6f1fe
parent 1217 ee9044742185
child 1219 369f5bac6379
class: RegressionTests::TimeAndDateTest changed: #test_05_weekDayConversion
RegressionTests__TimeAndDateTest.st file | annotate | diff | comparison | revisions 
--- a/RegressionTests__TimeAndDateTest.st	Wed Nov 05 17:44:45 2014 +0100
+++ b/RegressionTests__TimeAndDateTest.st	Wed Nov 05 17:48:40 2014 +0100
@@ -171,31 +171,38 @@
 
 test_05_weekDayConversion
     {
-        { (Date newDayInWeek:6 week:53 year:2004) "2004-W53-6" . (Date newDay:1 month:1 year:2005) }   .
-        { (Date newDayInWeek:7 week:53 year:2004) "2004-W53-7" . (Date newDay:2 month:1 year:2005) }   .
-        { (Date newDayInWeek:6 week:52 year:2005) "2005-W52-6" . (Date newDay:31 month:12 year:2005) } .
-        { (Date newDayInWeek:1 week:1  year:2007) "2007-W01-1" . (Date newDay:1 month:1 year:2007) }   .
-        { (Date newDayInWeek:7 week:52 year:2007) "2007-W52-7" . (Date newDay:30 month:12 year:2007) } .
+        { #( 6 53 2004) "2004-W53-6" . (Date newDay:1 month:1 year:2005) }   .
+        { #( 7 53 2004) "2004-W53-7" . (Date newDay:2 month:1 year:2005) }   .
+        { #( 6 52 2005) "2005-W52-6" . (Date newDay:31 month:12 year:2005) } .
+        { #( 1 1  2007) "2007-W01-1" . (Date newDay:1 month:1 year:2007) }   .
+        { #( 7 52 2007) "2007-W52-7" . (Date newDay:30 month:12 year:2007) } .
 
-        { (Date newDayInWeek:1 week:1  year:2008) "2008-W01-1" . (Date newDay:31 month:12 year:2007) } .
-        { (Date newDayInWeek:2 week:1  year:2008) "2008-W01-2" . (Date newDay:1 month:1 year:2008) }   .
-        { (Date newDayInWeek:7 week:52 year:2008) "2008-W52-7" . (Date newDay:28 month:12 year:2008) } .
+        { #( 1 1  2008) "2008-W01-1" . (Date newDay:31 month:12 year:2007) } .
+        { #( 2 1  2008) "2008-W01-2" . (Date newDay:1 month:1 year:2008) }   .
+        { #( 7 52 2008) "2008-W52-7" . (Date newDay:28 month:12 year:2008) } .
 
-        { (Date newDayInWeek:1 week:1  year:2009) "2009-W01-1" . (Date newDay:29 month:12 year:2008) }     .
-        { (Date newDayInWeek:2 week:1  year:2009) "2009-W01-2" . (Date newDay:30 month:12 year:2008) }     .
-        { (Date newDayInWeek:3 week:1  year:2009) "2009-W01-3" . (Date newDay:31 month:12 year:2008) }     .
-        { (Date newDayInWeek:4 week:1  year:2009) "2009-W01-4" . (Date newDay:1 month:1 year:2009) }       .
+        { #( 1 1  2009) "2009-W01-1" . (Date newDay:29 month:12 year:2008) }     .
+        { #( 2 1  2009) "2009-W01-2" . (Date newDay:30 month:12 year:2008) }     .
+        { #( 3 1  2009) "2009-W01-3" . (Date newDay:31 month:12 year:2008) }     .
+        { #( 4 1  2009) "2009-W01-4" . (Date newDay:1 month:1 year:2009) }       .
 
-        { (Date newDayInWeek:4 week:53 year:2009) "2009-W53-4" . (Date newDay:31 month:12 year:2009) }     .
-        { (Date newDayInWeek:5 week:53 year:2009) "2009-W53-5" . (Date newDay:1 month:1 year:2010) }       .
-        { (Date newDayInWeek:6 week:53 year:2009) "2009-W53-6" . (Date newDay:2 month:1 year:2010) }       .
-        { (Date newDayInWeek:7 week:53 year:2009) "2009-W53-7" . (Date newDay:3 month:1 year:2010) }       .
+        { #( 4 53 2009) "2009-W53-4" . (Date newDay:31 month:12 year:2009) }     .
+        { #( 5 53 2009) "2009-W53-5" . (Date newDay:1 month:1 year:2010) }       .
+        { #( 6 53 2009) "2009-W53-6" . (Date newDay:2 month:1 year:2010) }       .
+        { #( 7 53 2009) "2009-W53-7" . (Date newDay:3 month:1 year:2010) }       .
     } do:[:eachPair |
-        |d1 d2|
+        |dwy d1 d2 dayInWeek weekNr year|
 
-        d1 := eachPair first.
+        dwy := eachPair first.
+        dayInWeek := dwy first.
+        weekNr := dwy second.
+        year := dwy third.
+        d1 := Date newDayInWeek:dayInWeek week:weekNr year:year.
+
         d2 := eachPair second.
         self assert:(d1 = d2) description:'wrong: ',d1 printString, ' vs. ',d2 printString.
+        self assert:(d1 weekInYear == weekNr).
+        self assert:(d1 dayInWeek == dayInWeek).
     ]
 
     "
hg/stx-goodies-regression