Print GregorianCalendars as #inst literals

Author: nwjsmith

src/lambdaisland/deep_diff/printer.clj

@@ -60,6 +60,15 @@
     #(str (.format ^SimpleDateFormat (.get thread-local-utc-timestamp-format) %)
           (format ".%09d-00:00" (.getNanos ^Timestamp %)))))
 
+(def ^:private print-calendar
+  (puget/tagged-handler
+    'inst
+    #(let [formatted (format "%1$tFT%1$tT.%1$tL%1$tz" %)
+           offset-minutes (- (.length formatted) 2)]
+       (str (subs formatted 0 offset-minutes)
+            ":"
+            (subs formatted offset-minutes)))))
+
 (def ^:private print-handlers
   {'lambdaisland.deep_diff.diff.Deletion
    print-deletion
@@ -103,6 +112,9 @@
    'java.util.Date
    print-date
 
+   'java.util.GregorianCalendar
+   print-calendar
+
    'java.sql.Timestamp
    print-timestamp
 

test/lambdaisland/deep_diff/printer_test.clj

@@ -2,7 +2,10 @@
   (:require [clojure.test :refer :all]
             [lambdaisland.deep-diff.diff :as diff]
             [lambdaisland.deep-diff.printer :as printer])
-  (:import (java.sql Timestamp)))
+  (:import (java.sql Timestamp)
+           (java.util Date
+                      GregorianCalendar
+                      TimeZone)))
 
 (defn- printed
   [diff]
@@ -11,6 +14,11 @@
                       (printer/format-doc printer)
                       (printer/print-doc printer)))))
 
+(defn- calendar
+  [date]
+  (doto (GregorianCalendar. (TimeZone/getTimeZone "GMT"))
+    (.setTime date)))
+
 (deftest print-doc-test
   (testing "date"
     (is (= "\u001B[31m-#inst \"2019-04-09T14:57:46.128-00:00\"\u001B[0m \u001B[32m+#inst \"2019-04-10T14:57:46.128-00:00\"\u001B[0m\n"
@@ -22,6 +30,10 @@
            (printed (diff/diff (Timestamp. 0)
                                (doto (Timestamp. 1000) (.setNanos 101)))))))
 
+  (testing "calendar"
+    (is (= "\u001B[31m-#inst \"1970-01-01T00:00:00.000+00:00\"\u001B[0m \u001B[32m+#inst \"1970-01-01T00:00:01.001+00:00\"\u001B[0m\n"
+           (printed (diff/diff (calendar (Date. 0)) (calendar (Date. 1001)))))))
+
   (testing "uuid"
     (is (= "\u001B[31m-#uuid \"e41b325a-ce9d-4fdd-b51d-280d9c91314d\"\u001B[0m \u001B[32m+#uuid \"0400be9a-619f-4c6a-a735-6245e4955995\"\u001B[0m\n"
            (printed (diff/diff #uuid "e41b325a-ce9d-4fdd-b51d-280d9c91314d"