Convert testing to use fiasco instead of stefil

Author: dlowe-net

local-time.asd

@@ -14,11 +14,11 @@
   :version "1.0.6"
   :author "Daniel Lowe <dlowe@dlowe.net>"
   :description "Testing code for the local-time library"
-  :depends-on (:hu.dwim.stefil
-               :local-time)
-  :perform (test-op (o s) (uiop:symbol-call '#:hu.dwim.stefil
-                                            '#:funcall-test-with-feedback-message
-                                            (uiop:find-symbol* '#:test '#:local-time.test)))
+  :depends-on (:fiasco :local-time)
+  :perform (test-op (o s) (uiop:symbol-call '#:fiasco
+                                            '#:run-package-tests
+                                            :package
+                                            (find-package '#:local-time.test)))
   :components ((:module "test"
                 :serial t
                 :components ((:file "package")

src/local-time.lisp

@@ -13,8 +13,8 @@
   (daylight-p nil))
 
 (defstruct timezone
-  (transitions #(0) :type simple-vector)
-  (indexes #(0) :type simple-vector)
+  (transitions (coerce #(0) '(simple-array fixnum (1))) :type (simple-array fixnum (*)))
+  (indexes (coerce #(0) '(simple-array fixnum (1))) :type (simple-array fixnum (*)))
   (subzones #() :type simple-vector)
   (leap-seconds nil :type list)
   (path nil)
@@ -200,8 +200,8 @@
 (defparameter +modified-julian-date-offset+ -51604)
 
 (defun transition-position (needle haystack)
-  (declare (type integer needle)
-           (type (simple-array integer (*)) haystack)
+  (declare (type fixnum needle)
+           (type (simple-array fixnum (*)) haystack)
            (optimize (speed 3)))
   (loop
      with start fixnum = 0
@@ -274,6 +274,7 @@ found."
              (values subzone
                      transition-idx))))))
 
+(declaim (ftype (function (t t &optional t) fixnum) %read-binary-integer))
 (defun %read-binary-integer (stream byte-count &optional (signed nil))
   "Read BYTE-COUNT bytes from the binary stream STREAM, and return an integer which is its representation in network byte order (MSB).  If SIGNED is true, interprets the most significant bit as a sign indicator."
   (loop
@@ -323,15 +324,17 @@ found."
 
 (defun %tz-read-transitions (inf count)
   (make-array count
+              :element-type 'fixnum
               :initial-contents
               (loop for idx from 1 upto count
                  collect (%read-binary-integer inf 4 t))))
 
 (defun %tz-read-indexes (inf count)
   (make-array count
+              :element-type 'fixnum
               :initial-contents
               (loop for idx from 1 upto count
-                 collect (%read-binary-integer inf 1))))
+                    collect (%read-binary-integer inf 1))))
 
 (defun %tz-read-subzone (inf count)
   (loop for idx from 1 upto count
@@ -349,8 +352,8 @@ found."
     (loop for idx from 1 upto count
           collect (%read-binary-integer inf 4) into sec
           collect (%read-binary-integer inf 4) into adjustment
-          finally (return (cons (make-array count :initial-contents sec)
-                                (make-array count :initial-contents adjustment))))))
+          finally (return (cons (make-array count :element-type 'fixnum :initial-contents sec)
+                                (make-array count :element-type 'fixnum :initial-contents adjustment))))))
 
 (defun %tz-read-abbrevs (inf length)
   (let ((a (make-array length :element-type '(unsigned-byte 8))))
@@ -1598,7 +1601,8 @@ The currently supported values in local-time are:
                      (passert (%list-length= 3 parts))
                      (date-fullyear (first parts))
                      (date-month (second parts))
-                     (date-mday (third parts))))
+                     (date-mday (third parts))
+                     nil))
                  (date-fullyear (start-end)
                    (parse-integer-into start-end year))
                  (date-month (start-end)
@@ -1831,6 +1835,7 @@ See the documentation of FORMAT-TIMESTRING for the structure of FORMAT."
                             (:iso-week-year iso-year)
                             (:iso-week-number iso-week)
                             (:iso-week-day iso-weekday))))
+                 (declare (fixnum val))
                  (cond
                    ((atom fmt)
                     (princ val result))

test/comparison.lisp

@@ -1,7 +1,5 @@
 (in-package #:local-time.test)
 
-(defsuite* (comparison :in simple))
-
 (defmacro defcmptest (comparator-name &body args)
   `(deftest ,(symbolicate 'test/simple/comparison/ comparator-name) ()
     (flet ((make (day &optional (sec 0) (nsec 0))

test/formatting.lisp

@@ -1,7 +1,5 @@
 (in-package #:local-time.test)
 
-(defsuite* (formatting :in test))
-
 (deftest test/formatting/format-timestring/1 ()
   (let ((*default-timezone* local-time:+utc-zone+)
         (test-timestamp (encode-timestamp 1000 2 3 4 5 6 2008 :offset 0)))

test/package.lisp

@@ -1,13 +1,11 @@
 (cl:in-package :cl-user)
 
-(defpackage :local-time.test
-  (:use :alexandria
-        :common-lisp
-        :hu.dwim.stefil
-        :local-time))
+(fiasco:define-test-package #:local-time.test
+  (:use #:common-lisp
+        #:alexandria
+        #:fiasco
+        #:local-time))
 
-(in-package :local-time.test)
+(in-package #:local-time.test)
 
-(defsuite* (test :in root-suite) ()
-  (local-time::reread-timezone-repository)
-  (run-child-tests))
+(local-time::reread-timezone-repository)

test/parsing.lisp

@@ -1,7 +1,5 @@
 (in-package #:local-time.test)
 
-(defsuite* (parsing :in test))
-
 (deftest test/parsing/parse-format-consistency/range (&key (start-day -100000) (end-day 100000))
   (declare (optimize debug))
   (without-test-progress-printing

test/simple.lisp

@@ -1,7 +1,5 @@
 (in-package #:local-time.test)
 
-(defsuite* (simple :in test))
-
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (local-time::define-timezone eastern-tz
       (merge-pathnames #p"US/Eastern" local-time::*default-timezone-repository-path*))
@@ -101,7 +99,7 @@
   (let ((a (parse-timestring "2006-01-01T00:00:00"))
         (b (parse-timestring "2001-01-02T00:00:00")))
     (is (= 4 (timestamp-whole-year-difference a b))))
-  
+
   (let* ((local-time::*default-timezone* amsterdam-tz)
          (a (parse-timestring "1978-10-01")))
     (is (= 0 (timestamp-whole-year-difference a a)))))

test/timezone.lisp

@@ -1,6 +1,5 @@
 (in-package #:local-time.test)
 
-(defsuite* (timezone :in test))
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (local-time::define-timezone eastern-tz
       (merge-pathnames #p"EST5EDT" local-time::*default-timezone-repository-path*))
@@ -52,7 +51,7 @@
     (dolist (case cases)
       (destructuring-bind (needle haystack want)
           case
-        (let ((got (local-time::transition-position needle haystack)))
+        (let ((got (local-time::transition-position needle (coerce haystack '(simple-array fixnum (*))))))
           (is (= got want)
               "(transition-position ~a ~a) got ~a, want ~a"
               needle haystack got want))))))
@@ -73,7 +72,7 @@
      ((2008 11 2 6  1) (2008 11 2 1  1))
      ((2008 11 2 6 59) (2008 11 2 1  59)))
     (,cet-tz
-     ;; Spring forward 
+     ;; Spring forward
      ((2023 3 26 0 59) (2023 3 26 1 59))
      ((2023 3 26 1  0) (2023 3 26 3  0))
      ((2023 3 26 1  1) (2023 3 26 3  1))))
@@ -118,13 +117,13 @@ is expected instead.")
                1 6))                 ;min, ..., year and reversed year, ..., min
              (second test-case)))))))
 
-(deftest test/timzone/formatting ()
+(deftest test/timezone/formatting ()
   ;; Zone Asia/Kolkata has positive fractional hour offset;
   ;; zone Portugal has a negative fractional hour offset (in 1901).
-  (is (equal (format-timestring t (encode-timestamp 0 0 0 0 1 1 2000 :offset 0)
+  (is (equal (format-timestring nil (encode-timestamp 0 0 0 0 1 1 2000 :offset 0)
                                 :timezone ist)
              "2000-01-01T05:30:00.000000+05:30"))
-  (is (equal (format-timestring t (encode-timestamp 0 0 0 0 5 12 1901 :offset 0)
+  (is (equal (format-timestring nil (encode-timestamp 0 0 0 0 5 12 1901 :offset 0)
                                 :timezone portugal)
              "1901-12-04T23:23:15.000000-00:37")))
 
@@ -264,4 +263,3 @@ is expected instead.")
        "Etc/Greenwich"
        (local-time:zone-name
         (caar (local-time:timezones-matching-subzone "GMT" (unix-to-timestamp 1585906626)))))))
-