--- a/RegressionTests__TimeAndDateTest.st Wed Apr 08 17:50:55 2015 +0200
+++ b/RegressionTests__TimeAndDateTest.st Thu Apr 09 09:29:53 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"{ Package: 'exept:regression' }"
"{ NameSpace: RegressionTests }"
@@ -261,41 +263,41 @@
{ '1995-02-20T13:11:06' . '1995-02-20 13:11:06' } .
{ '1995-02T13:11:06' . '1995-02-01 13:11:06' } .
{ '1995T13:11:06' . '1995-01-01 13:11:06' } .
- { '1995T13:11' . '1995-01-01 13:11' } .
+ { '1995T13:11' . '1995-01-01 13:11:00' } .
{ '1995T13:11.5' . '1995-01-01 13:11:30' } .
{ '1995T13:11,5' . '1995-01-01 13:11:30' } .
- { '1995T13' . '1995-01-01 13:00' } .
- { '1995T13.25' . '1995-01-01 13:15' } .
+ { '1995T13' . '1995-01-01 13:00:00' } .
+ { '1995T13.25' . '1995-01-01 13:15:00' } .
{ '1995T13.333333' . '1995-01-01 13:19:59.999' } .
- { '1995' . '1995-01-01 00:00' } .
- { '1995-02' . '1995-02-01 00:00' } .
- { '19950204' . '1995-02-04 00:00' } .
+ { '1995' . '1995-01-01 00:00:00' } .
+ { '1995-02' . '1995-02-01 00:00:00' } .
+ { '19950204' . '1995-02-04 00:00:00' } .
"/ day in year
- { '1995-001' . '1995-01-01 00:00' } .
- { '1995-035' . '1995-02-04 00:00' } .
- { '1995035' . '1995-02-04 00:00' } .
+ { '1995-001' . '1995-01-01 00:00:00' } .
+ { '1995-035' . '1995-02-04 00:00:00' } .
+ { '1995035' . '1995-02-04 00:00:00' } .
- { '1997-01-01' . '1997-01-01 00:00' } .
+ { '1997-01-01' . '1997-01-01 00:00:00' } .
"/ week and weekday
- { '1997-W01' . '1996-12-30 00:00' } .
- { '1997W01' . '1996-12-30 00:00' } .
- { '1997W01-1' . '1996-12-30 00:00' } .
- { '1997W011' . '1996-12-30 00:00' } .
- { '1997W01' . '1996-12-30 00:00' } .
- { '1997W01-2' . '1996-12-31 00:00' } .
- { '1997-W01-2' . '1996-12-31 00:00' } .
- { '1997W012' . '1996-12-31 00:00' } .
- { '2014W40' . '2014-09-29 00:00' } .
- { '2014W44-4' . '2014-10-30 00:00' } .
- { '2014W01' . '2013-12-30 00:00' } .
- { '2014W01-1' . '2013-12-30 00:00' } .
- { '2014W01-2' . '2013-12-31 00:00' } .
- { '2014W01-3' . '2014-01-01 00:00' } .
+ { '1997-W01' . '1996-12-30 00:00:00' } .
+ { '1997W01' . '1996-12-30 00:00:00' } .
+ { '1997W01-1' . '1996-12-30 00:00:00' } .
+ { '1997W011' . '1996-12-30 00:00:00' } .
+ { '1997W01' . '1996-12-30 00:00:00' } .
+ { '1997W01-2' . '1996-12-31 00:00:00' } .
+ { '1997-W01-2' . '1996-12-31 00:00:00' } .
+ { '1997W012' . '1996-12-31 00:00:00' } .
+ { '2014W40' . '2014-09-29 00:00:00' } .
+ { '2014W44-4' . '2014-10-30 00:00:00' } .
+ { '2014W01' . '2013-12-30 00:00:00' } .
+ { '2014W01-1' . '2013-12-30 00:00:00' } .
+ { '2014W01-2' . '2013-12-31 00:00:00' } .
+ { '2014W01-3' . '2014-01-01 00:00:00' } .
- { '1995-02-20 13:11' . '1995-02-20 13:11' } .
- { '1995-02-20 1311' . '1995-02-20 13:11' } .
- { '1995-02-20 13' . '1995-02-20 13:00' } .
+ { '1995-02-20 13:11' . '1995-02-20 13:11:00' } .
+ { '1995-02-20 1311' . '1995-02-20 13:11:00' } .
+ { '1995-02-20 13' . '1995-02-20 13:00:00' } .
{ '1995-02-20 235959' . '1995-02-20 23:59:59' } .
{ '19950220 235959' . '1995-02-20 23:59:59' } .
{ '19950220 23:59:59.9942' . '1995-02-20 23:59:59.994' } .
@@ -314,7 +316,7 @@
{ '1995-02-20 13:11:06-0130' . '1995-02-20 13:11:06-01:30' } .
"/ 24 is allowed with ISO, and is 00:00 of the next day:
- { '1995-02-20 24:00:00' . '1995-02-21 00:00' } .
+ { '1995-02-20 24:00:00' . '1995-02-21 00:00:00' } .
} do:[:eachPair |
|s1 t expected got|
@@ -338,41 +340,41 @@
{ '1995-02-20T13:11:06' . '1995-02-20 13:11:06Z' } .
{ '1995-02T13:11:06' . '1995-02-01 13:11:06Z' } .
{ '1995T13:11:06' . '1995-01-01 13:11:06Z' } .
- { '1995T13:11' . '1995-01-01 13:11Z' } .
+ { '1995T13:11' . '1995-01-01 13:11:00Z' } .
{ '1995T13:11.5' . '1995-01-01 13:11:30Z' } .
{ '1995T13:11,5' . '1995-01-01 13:11:30Z' } .
- { '1995T13' . '1995-01-01 13:00Z' } .
- { '1995T13.25' . '1995-01-01 13:15Z' } .
+ { '1995T13' . '1995-01-01 13:00:00Z' } .
+ { '1995T13.25' . '1995-01-01 13:15:00Z' } .
{ '1995T13.333333' . '1995-01-01 13:19:59.999Z' } .
- { '1995' . '1995-01-01 00:00Z' } .
- { '1995-02' . '1995-02-01 00:00Z' } .
- { '19950204' . '1995-02-04 00:00Z' } .
+ { '1995' . '1995-01-01 00:00:00Z' } .
+ { '1995-02' . '1995-02-01 00:00:00Z' } .
+ { '19950204' . '1995-02-04 00:00:00Z' } .
"/ day in year
- { '1995-001' . '1995-01-01 00:00Z' } .
- { '1995-035' . '1995-02-04 00:00Z' } .
- { '1995035' . '1995-02-04 00:00Z' } .
+ { '1995-001' . '1995-01-01 00:00:00Z' } .
+ { '1995-035' . '1995-02-04 00:00:00Z' } .
+ { '1995035' . '1995-02-04 00:00:00Z' } .
- { '1997-01-01' . '1997-01-01 00:00Z' } .
+ { '1997-01-01' . '1997-01-01 00:00:00Z' } .
"/ week and weekday
- { '1997-W01' . '1996-12-30 00:00Z' } .
- { '1997W01' . '1996-12-30 00:00Z' } .
- { '1997W01-1' . '1996-12-30 00:00Z' } .
- { '1997W011' . '1996-12-30 00:00Z' } .
- { '1997W01' . '1996-12-30 00:00Z' } .
- { '1997W01-2' . '1996-12-31 00:00Z' } .
- { '1997-W01-2' . '1996-12-31 00:00Z' } .
- { '1997W012' . '1996-12-31 00:00Z' } .
- { '2014W40' . '2014-09-29 00:00Z' } .
- { '2014W44-4' . '2014-10-30 00:00Z' } .
- { '2014W01' . '2013-12-30 00:00Z' } .
- { '2014W01-1' . '2013-12-30 00:00Z' } .
- { '2014W01-2' . '2013-12-31 00:00Z' } .
- { '2014W01-3' . '2014-01-01 00:00Z' } .
+ { '1997-W01' . '1996-12-30 00:00:00Z' } .
+ { '1997W01' . '1996-12-30 00:00:00Z' } .
+ { '1997W01-1' . '1996-12-30 00:00:00Z' } .
+ { '1997W011' . '1996-12-30 00:00:00Z' } .
+ { '1997W01' . '1996-12-30 00:00:00Z' } .
+ { '1997W01-2' . '1996-12-31 00:00:00Z' } .
+ { '1997-W01-2' . '1996-12-31 00:00:00Z' } .
+ { '1997W012' . '1996-12-31 00:00:00Z' } .
+ { '2014W40' . '2014-09-29 00:00:00Z' } .
+ { '2014W44-4' . '2014-10-30 00:00:00Z' } .
+ { '2014W01' . '2013-12-30 00:00:00Z' } .
+ { '2014W01-1' . '2013-12-30 00:00:00Z' } .
+ { '2014W01-2' . '2013-12-31 00:00:00Z' } .
+ { '2014W01-3' . '2014-01-01 00:00:00Z' } .
- { '1995-02-20 13:11' . '1995-02-20 13:11Z' } .
- { '1995-02-20 1311' . '1995-02-20 13:11Z' } .
- { '1995-02-20 13' . '1995-02-20 13:00Z' } .
+ { '1995-02-20 13:11' . '1995-02-20 13:11:00Z' } .
+ { '1995-02-20 1311' . '1995-02-20 13:11:00Z' } .
+ { '1995-02-20 13' . '1995-02-20 13:00:00Z' } .
{ '1995-02-20 235959' . '1995-02-20 23:59:59Z' } .
{ '19950220 235959' . '1995-02-20 23:59:59Z' } .
{ '19950220 23:59:59.9942' . '1995-02-20 23:59:59.994Z' } .
@@ -391,7 +393,7 @@
{ '1995-02-20 13:11:06-0130' . '1995-02-20 14:41:06Z' } .
"/ 24 is allowed with ISO, and is 00:00 of the next day:
- { '1995-02-20 24:00:00' . '1995-02-21 00:00Z' } .
+ { '1995-02-20 24:00:00' . '1995-02-21 00:00:00Z' } .
} do:[:eachPair |
|s1 t expected got|
@@ -626,7 +628,7 @@
"/ local time vs. utc time
local := Timestamp newDay:1 month:1 year:1940.
utc := UtcTimestamp newDay:1 month:1 year:1940.
- self assert:(local asUtcTimestamp - utc asUtcTimestamp) asSeconds = Timestamp now utcOffset.
+ self assert:(local asUtcTimestamp - utc asUtcTimestamp) asSeconds = local utcOffset.
"/ tz time vs. utc time
utc := Timestamp readFrom:'20000102T123000Z'.