--- a/RegressionTests__TimeAndDateTest.st Fri May 11 01:09:49 2018 +0200
+++ b/RegressionTests__TimeAndDateTest.st Fri May 11 01:09:59 2018 +0200
@@ -138,21 +138,24 @@
self assert:(t := Timestamp readFrom:'March 7 2009 2:30am ' format:'%monthName %day %year %u:%m%a' language:#en onError:[self error]
) = (Timestamp year:2009 month:3 day:7 hour:2 minute:30 second:0 millisecond:0). "/ EST is 5hrs behind
- self assert:(t := Timestamp readFrom:'March 7 2009 2:30pm EST' format:'%monthName %day %year %u:%m%a %tz' language:#en onError:[self error]
- ) = (UtcTimestamp year:2009 month:3 day:7 hour:19 minute:30 second:0 millisecond:0). "/ EST is 5hrs behind
+ "/ Timestamp readIso8601FormatFrom:'20090307T183000-05'
+ "/ Timestamp readIso8601FormatFrom:'20090307T233000Z'
+ self assert:(t := Timestamp readFrom:'March 7 2009 6:30pm EST' format:'%monthName %day %year %u:%m%a %tz' language:#en onError:[self error]
+ ) = (UtcTimestamp year:2009 month:3 day:7 hour:23 minute:30 second:0 millisecond:0). "/ EST is 5hrs behind
self assert:(t := Timestamp readFrom:'March 7 2009 7:30pm UTC' format:'%monthName %day %year %u:%m%a %tz' language:#en onError:[self error]
- ) = (Timestamp year:2009 month:3 day:7 hour:19 minute:30 second:0 millisecond:0).
+ ) = (UtcTimestamp year:2009 month:3 day:7 hour:19 minute:30 second:0 millisecond:0).
self assert:(t := Timestamp readFrom:'2015103' format:'%4y%3dayOfYear' onError:[self error]
- ) = (Timestamp year:2015 month:3 day:10 hour:0 minute:0 second:0 millisecond:0).
+ ) = (Timestamp year:2015 month:4 day:13 hour:0 minute:0 second:0 millisecond:0).
+ self assert:t asDate dayOfYear == 103.
self assert:(t := Timestamp readFrom:'20-2-1995 13:11:06.999' format:'%day-%month-%year %h:%m:%s.%i' language:nil onError:[self error]
) = (Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6 millisecond:999).
self assert:(t := Timestamp readFrom:'20-2-1995 13:11:06.100' format:'%day-%month-%year %h:%m:%s.%i' language:nil onError:[self error]
) = (Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6 millisecond:100).
self assert:(t := Timestamp readFrom:'20-2-1995 13:11:06.010' format:'%day-%month-%year %h:%m:%s.%i' language:nil onError:[self error]
- ) = (Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6 millisecond:100).
+ ) = (Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6 millisecond:10).
self assert:(t := Timestamp readFrom:'20-2-1995 13:11:06.1' format:'%day-%month-%year %h:%m:%s.%f' language:nil onError:[self error]
) = (Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6 millisecond:100).
@@ -160,9 +163,25 @@
) = (Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6 millisecond:10).
self assert:(t := Timestamp readFrom:'20-2-1995 13:11:06.001' format:'%day-%month-%year %h:%m:%s.%f' language:nil onError:[self error]
) = (Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6 millisecond:1).
+
self assert:(t := Timestamp readFrom:'20-2-1995 13:11:06.12345' format:'%day-%month-%year %h:%m:%s.%f' language:nil onError:[self error]
+ ) = (Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6 microsecond:123000).
+
+ self assert:(t := Timestamp readFrom:'20-2-1995 13:11:06.12345' format:'%day-%month-%year %h:%m:%s.%F' language:nil onError:[self error]
) = (Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6 microsecond:123450).
+ self assert:(t := Timestamp readFrom:'20-2-1995 13:11:06.12345678' format:'%day-%month-%year %h:%m:%s.%F' language:nil onError:[self error]
+ ) = ((Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6)+123456780 nanoseconds).
+
+ self assert:(t := Timestamp readFrom:'20-2-1995 13:11:06.123456' format:'%day-%month-%year %h:%m:%s.%F' language:nil onError:[self error]
+ ) = ((Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6)+123456 microseconds).
+
+ self assert:(t := Timestamp readFrom:'20-2-1995 13:11:06.123456789' format:'%day-%month-%year %h:%m:%s.%F' language:nil onError:[self error]
+ ) = ((Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6)+123456789 nanoseconds).
+
+ self assert:(t := Timestamp readFrom:'20-2-1995 13:11:06.123456789012' format:'%day-%month-%year %h:%m:%s.%F' language:nil onError:[self error]
+ ) = ((Timestamp year:1995 month:2 day:20 hour:13 minute:11 second:6)+123456789012 picoseconds).
+
"
self new test_01c_ReadingTimeStamps
"