calendar.format: more tests.

diff --git a/basis/calendar/format/format-tests.factor b/basis/calendar/format/format-tests.factor
index faea8a2b2adc700f6fb971679b37e9302321ad6c..f502f98568bd156908572684dccdc1a6c16915f5 100644 (file)
--- a/basis/calendar/format/format-tests.factor
+++ b/basis/calendar/format/format-tests.factor
@@ -1,22 +1,75 @@
-USING: accessors calendar calendar.format kernel sequences tools.test ;
-IN: calendar.format.tests
+USING: accessors calendar calendar.format io.streams.string kernel
+sequences tools.test ;
 
-CONSTANT: testtime T{ timestamp
-    { year 2018 }
-    { month 2 }
-    { day 15 }
-    { hour 8 }
-    { minute 51 }
-    { second 44+423303/500000 }
-    { gmt-offset T{ duration { hour -8 } } }
-}
+{
+    "2018-02-15T08:51:44.846606-08:00"
+    "Thu, 15 Feb 2018 08:51:44 -0800"
+} [
+    T{ timestamp
+        { year 2018 }
+        { month 2 }
+        { day 15 }
+        { hour 8 }
+        { minute 51 }
+        { second 44+423303/500000 }
+        { gmt-offset T{ duration { hour -8 } } }
+    } [ timestamp>rfc3339 ] [ timestamp>rfc822 ] bi
+] unit-test
+
+{
+"      May 2008
+Su Mo Tu We Th Fr Sa
+             1  2  3
+ 4  5  6  7  8  9 10
+11 12 13 14 15 16 17
+18 19 20 21 22 23 24
+25 26 27 28 29 30 31
 
-{ "2018-02-15T08:51:44.846606-08:00" } [ testtime timestamp>rfc3339 ] unit-test
+" } [
+    [ 2008 <year> 5 >>month month. ] with-string-writer
+] unit-test
 
-{ "Thu, 15 Feb 2018 08:51:44 -0800" } [ testtime timestamp>rfc822 ] unit-test
+{
+"                              2008
 
-{ }
-[ { 2008 2009 } [ year. ] each ] unit-test
+      January               February               March        
+Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa
+       1  2  3  4  5                  1  2                     1
+ 6  7  8  9 10 11 12   3  4  5  6  7  8  9   2  3  4  5  6  7  8
+13 14 15 16 17 18 19  10 11 12 13 14 15 16   9 10 11 12 13 14 15
+20 21 22 23 24 25 26  17 18 19 20 21 22 23  16 17 18 19 20 21 22
+27 28 29 30 31        24 25 26 27 28 29     23 24 25 26 27 28 29
+                                            30 31               
+                                                                
+       April                  May                   June        
+Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa
+       1  2  3  4  5               1  2  3   1  2  3  4  5  6  7
+ 6  7  8  9 10 11 12   4  5  6  7  8  9 10   8  9 10 11 12 13 14
+13 14 15 16 17 18 19  11 12 13 14 15 16 17  15 16 17 18 19 20 21
+20 21 22 23 24 25 26  18 19 20 21 22 23 24  22 23 24 25 26 27 28
+27 28 29 30           25 26 27 28 29 30 31  29 30               
+                                                                
+                                                                
+        July                 August              September      
+Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa
+       1  2  3  4  5                  1  2      1  2  3  4  5  6
+ 6  7  8  9 10 11 12   3  4  5  6  7  8  9   7  8  9 10 11 12 13
+13 14 15 16 17 18 19  10 11 12 13 14 15 16  14 15 16 17 18 19 20
+20 21 22 23 24 25 26  17 18 19 20 21 22 23  21 22 23 24 25 26 27
+27 28 29 30 31        24 25 26 27 28 29 30  28 29 30            
+                      31                                        
+                                                                
+      October               November              December      
+Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa
+          1  2  3  4                     1      1  2  3  4  5  6
+ 5  6  7  8  9 10 11   2  3  4  5  6  7  8   7  8  9 10 11 12 13
+12 13 14 15 16 17 18   9 10 11 12 13 14 15  14 15 16 17 18 19 20
+19 20 21 22 23 24 25  16 17 18 19 20 21 22  21 22 23 24 25 26 27
+26 27 28 29 30 31     23 24 25 26 27 28 29  28 29 30 31         
+                      30                                        
+                                                                
+"
+} [ [ 2008 year. ] with-string-writer ] unit-test
 
 { "03:01:59" } [
     3 hours 1 >>minute 59 >>second duration>hms