Fix date<=.

3 files changed, 53 insertions, 39 deletions

diff --git a/tests/run-tests.scm b/tests/run-tests.scm
index 4ffe6d4e..8d99eef7 100755
--- a/tests/run-tests.scm
+++ b/tests/run-tests.scm
@@ -57,7 +57,7 @@
               (let ((modules (read)))
                 (eval-in-sandbox
                  `(begin ,@(read-multiple))
-                 #:time-limit 5          ; larger than should be needed
+                 #:time-limit 60          ; larger than should be needed
                  #:module (make-sandbox-module
                            (append modules
                                    '(((srfi srfi-64) test-assert test-equal test-error)
diff --git a/tests/srfi-19-alt-compare.scm b/tests/srfi-19-alt-compare.scm
new file mode 100644
index 00000000..fb88361b
--- /dev/null
+++ b/tests/srfi-19-alt-compare.scm
@@ -0,0 +1,44 @@
+(((srfi srfi-19 alt)
+  date
+  date< date<=
+  date> date>=
+  ))
+
+(test-assert "date< empty"
+  (date<))
+
+(test-assert "date< single"
+  (date< #2020-01-10))
+
+(test-assert "date< double"
+  (date< #2020-01-10 #2020-01-11))
+
+(test-assert "date< tripple"
+  (date< #2020-01-10 #2020-01-11 #2020-01-12))
+
+(test-assert "date< tripple negate"
+  (not (date< #2020-01-10 #2020-01-12 #2020-01-11)))
+
+(test-assert "date<= empty"
+  (date<=))
+
+(test-assert "date<= single"
+  (date<= #2020-01-10))
+
+(test-assert "date<= double"
+  (date<= #2020-01-10 #2020-01-11))
+
+(test-assert "date<="
+  (not (date<= #2020-01-01 #2018-05-15 #2020-01-31)))
+
+(test-assert "date<= equal"
+  (date<= #2018-05-15 #2018-05-15))
+
+(test-assert "date<"
+  (not (date< #2020-01-01 #2018-05-15 #2020-01-31)))
+
+(test-assert "date>"
+  (not (date> #2020-01-31 #2018-05-15 #2020-01-01 )))
+
+(test-assert "date>="
+  (not (date>=  #2020-01-31  #2018-05-15 #2020-01-01)))
diff --git a/tests/srfi-19-alt.scm b/tests/srfi-19-alt.scm
index 887af4fa..bebd104d 100644
--- a/tests/srfi-19-alt.scm
+++ b/tests/srfi-19-alt.scm
@@ -1,7 +1,6 @@
 (((srfi srfi-19 alt) date+ date-
   year month day
   date time
-  date<
   datetime
   datetime+
   datetime-
@@ -16,7 +15,7 @@
 (test-assert "Test year type"
   (integer? (year (date year: 2020))))
 
-(test-assert "Test month type"
+(test-assert "Test mmnth type"
   (integer? (month (date month: 1))))
 
 (test-assert "Test day type"
@@ -87,43 +86,14 @@
          (date day: 5)))
 
 
-(test-assert "date< empty"
-  (date<))
 
-(test-assert "date< single"
-  (date< #2020-01-10))
+;; (test-assert
+;;     (datetime- #2018-01-17T10:00:00
+;;                #2018-01-17T08:00:00))
 
-(test-assert "date< double"
-  (date< #2020-01-10 #2020-01-11))
 
-(test-assert "date< tripple"
-  (date< #2020-01-10 #2020-01-11 #2020-01-12))
-
-(test-assert "date< tripple negate"
-  (not (date< #2020-01-10 #2020-01-12 #2020-01-11)))
-
-(test-assert "date<="
-  (not (date<= #2020-01-01 #2018-05-15 #2020-01-31)))
-
-(test-assert "date<= equal"
-  (date<= #2018-05-15 #2020-01-01))
-
-(test-assert "date<"
-  (not (date< #2020-01-01 #2018-05-15 #2020-01-31)))
-
-(test-assert "date>"
-  (not (date> #2020-01-31 #2018-05-15 #2020-01-01 )))
-
-(test-assert "date>="
-  (not (date>=  #2020-01-31  #2018-05-15 #2020-01-01)))
-
-(test-assert
-    (datetime- #2018-01-17T10:00:00
-               #2018-01-17T08:00:00))
-
-
-(test-assert
-    (datetime<=? (datetime time: (time hour: 24))
-                 (datetime- #2018-01-17T10:00:00
-                            #2018-01-17T08:00:00)))
+;; (test-assert
+;;     (datetime<=? (datetime time: (time hour: 24))
+;;                  (datetime- #2018-01-17T10:00:00
+;;                             #2018-01-17T08:00:00)))