Expand gix-date baseline tests and implement missing Git date formats

gix-date/tests/fixtures/generate_git_date_baseline.sh

@@ -22,25 +22,148 @@ function baseline() {
     } >> baseline.git
 }
 
-# success
+# Relative dates use a fixed "now" timestamp for reproducibility
+# GIT_TEST_DATE_NOW sets Git's internal "now" to a specific Unix timestamp
+# We use 1000000000 (Sun Sep 9 01:46:40 UTC 2001) as our reference point
+function baseline_relative() {
+    local test_date="$1" # first argument is the relative date to test
+    local test_name="$2" # second argument is the format name (usually empty for relative dates)
 
-# date formats following to https://git-scm.com/docs/git-log#Documentation/git-log.txt---dateltformatgt
+    local status=0
+    GIT_TEST_DATE_NOW=1000000000 git -c section.key="$test_date" config --type=expiry-date section.key || status="$?"
+
+    {
+      echo "$test_date"
+      echo "$test_name"
+      echo "$status"
+      if [ "$status" = 0 ]; then
+        GIT_TEST_DATE_NOW=1000000000 git -c section.key="$test_date" config --type=expiry-date section.key
+      else
+        echo '-1'
+      fi
+    } >> baseline.git
+}
 
-# short
-# ODO
-#baseline '2022-08-22'
-# rfc2822
+# ============================================================================
+# FIXED DATE FORMATS
+# ============================================================================
+# Tests from https://github.com/git/git/blob/master/t/t0006-date.sh
+# Only including formats that gix-date currently supports.
+
+# Note: SHORT format (YYYY-MM-DD) is NOT included in baseline tests because
+# Git fills in current time-of-day, making it non-reproducible for baseline comparison.
+# SHORT format is tested separately in the unit tests.
+
+# RFC2822 format: "Day, DD Mon YYYY HH:MM:SS +/-ZZZZ"
 baseline 'Thu, 18 Aug 2022 12:45:06 +0800' 'RFC2822'
-# iso8601
+baseline 'Sat, 01 Jan 2000 00:00:00 +0000' 'RFC2822'
+baseline 'Fri, 13 Feb 2009 23:31:30 +0000' 'RFC2822'  # Unix timestamp 1234567890
+baseline 'Wed, 15 Jun 2016 16:13:20 +0200' 'RFC2822'  # from git t0006
+baseline 'Thu, 7 Apr 2005 15:14:13 -0700' ''  # from git t0006
+
+# GIT_RFC2822 format: like RFC2822 but with non-padded day
+baseline 'Thu, 1 Aug 2022 12:45:06 +0800' ''
+baseline 'Sat, 1 Jan 2000 00:00:00 +0000' ''
+
+# ISO8601 format: "YYYY-MM-DD HH:MM:SS +/-ZZZZ" from git t0006
 baseline '2022-08-17 22:04:58 +0200' 'ISO8601'
-# iso8601_strict
+baseline '2000-01-01 00:00:00 +0000' 'ISO8601'
+baseline '1970-01-01 00:00:00 +0000' 'ISO8601'
+baseline '2008-02-14 20:30:45 +0000' ''  # from git t0006
+baseline '2008-02-14 20:30:45 -0500' ''  # from git t0006
+baseline '2016-06-15 16:13:20 +0200' 'ISO8601'  # from git t0006
+
+# Note: ISO8601 with dots (2008.02.14 20:30:45 -0500) is supported by Git
+# but not yet supported by gix-date.
+
+# ISO8601_STRICT format: "YYYY-MM-DDTHH:MM:SS+ZZ:ZZ"
 baseline '2022-08-17T21:43:13+08:00' 'ISO8601_STRICT'
-# default
+baseline '2000-01-01T00:00:00+00:00' 'ISO8601_STRICT'
+baseline '2009-02-13T23:31:30+00:00' 'ISO8601_STRICT'  # Unix timestamp 1234567890
+baseline '2016-06-15T16:13:20+02:00' 'ISO8601_STRICT'  # from git t0006
+
+# Timezone edge cases from git t0006 (that gix-date supports)
+baseline '1970-01-01 00:00:00 +0000' ''
+baseline '1970-01-01 01:00:00 +0100' ''
+baseline '1970-01-02 00:00:00 +1100' ''
+
+# DEFAULT format (Git's default): "Day Mon D HH:MM:SS YYYY +/-ZZZZ"
 baseline 'Thu Sep 04 2022 10:45:06 -0400' '' # cannot round-trip, incorrect day-of-week
 baseline 'Sun Sep 04 2022 10:45:06 -0400' 'GITOXIDE'
-# unix
+baseline 'Thu Aug 18 12:45:06 2022 +0800' ''
+baseline 'Wed Jun 15 16:13:20 2016 +0200' ''  # from git t0006
+
+# UNIX timestamp format
+# Note: Git only treats numbers >= 100000000 as UNIX timestamps.
+# Smaller numbers are interpreted as date components.
 baseline '1234567890' 'UNIX'
-# raw
+baseline '100000000' 'UNIX'
+baseline '946684800' 'UNIX'  # 2000-01-01 00:00:00 UTC
+baseline '1466000000' 'UNIX'  # from git t0006
+
+# RAW format: "SECONDS +/-ZZZZ"
+# Note: Git only treats timestamps >= 100000000 as raw format.
+# Smaller numbers are interpreted as date components.
 baseline '1660874655 +0800' 'RAW'
+baseline '1660874655 -0800' 'RAW'
+baseline '100000000 +0000' 'RAW'
+baseline '1234567890 +0000' 'RAW'
+baseline '946684800 +0000' 'RAW'
+baseline '1466000000 +0200' 'RAW'  # from git t0006
+baseline '1466000000 -0200' 'RAW'  # from git t0006
+
+# Note: Git does not support negative timestamps through --type=expiry-date
+# gix-date does support them, but they can't be tested via the baseline.
+
+# ============================================================================
+# RELATIVE DATE FORMATS from git t0006
+# ============================================================================
+# These tests use GIT_TEST_DATE_NOW=1000000000 (Sun Sep 9 01:46:40 UTC 2001)
+
+# Seconds - from git t0006 check_relative
+baseline_relative '1 second ago' ''
+baseline_relative '2 seconds ago' ''
+baseline_relative '30 seconds ago' ''
+baseline_relative '5 seconds ago' ''  # from git t0006 check_relative 5
+
+# Minutes - from git t0006 check_relative 300 = 5 minutes
+baseline_relative '1 minute ago' ''
+baseline_relative '2 minutes ago' ''
+baseline_relative '30 minutes ago' ''
+baseline_relative '5 minutes ago' ''
+baseline_relative '10 minutes ago' ''
+
+# Hours - from git t0006 check_relative 18000 = 5 hours
+baseline_relative '1 hour ago' ''
+baseline_relative '2 hours ago' ''
+baseline_relative '12 hours ago' ''
+baseline_relative '5 hours ago' ''
+
+# Days - from git t0006 check_relative 432000 = 5 days
+baseline_relative '1 day ago' ''
+baseline_relative '2 days ago' ''
+baseline_relative '7 days ago' ''
+baseline_relative '5 days ago' ''
+baseline_relative '3 days ago' ''
+
+# Weeks - from git t0006 check_relative 1728000 = 3 weeks (20 days)
+baseline_relative '1 week ago' ''
+baseline_relative '2 weeks ago' ''
+baseline_relative '4 weeks ago' ''
+baseline_relative '3 weeks ago' ''
+
+# Months - from git t0006 check_relative 13000000 ≈ 5 months
+baseline_relative '1 month ago' ''
+baseline_relative '2 months ago' ''
+baseline_relative '6 months ago' ''
+baseline_relative '5 months ago' ''
+baseline_relative '3 months ago' ''
+baseline_relative '12 months ago' ''
+
+# Years - from git t0006 check_relative 630000000 = 20 years
+baseline_relative '1 year ago' ''
+baseline_relative '2 years ago' ''
+baseline_relative '10 years ago' ''
+baseline_relative '20 years ago' ''
 
 # Note that we can't necessarily put 64bit dates here yet as `git` on the system might not yet support it.

gix-date/tests/time/baseline.rs

@@ -6,13 +6,29 @@ use gix_date::{
 };
 use gix_testtools::Result;
 use std::sync::LazyLock;
+use std::time::Duration;
 
 struct Sample {
     format_name: Option<String>,
     exit_code: usize,
     seconds: SecondsSinceUnixEpoch,
 }
 
+/// Returns true if the pattern looks like a relative date of the form "N unit ago".
+/// Note: This only covers the relative dates tested in the baseline (e.g., "1 day ago").
+/// Other relative formats like "yesterday", "last week" etc. are not included in baseline
+/// testing because they would require additional handling in the baseline script.
+fn is_relative_date(pattern: &str) -> bool {
+    pattern.ends_with(" ago")
+}
+
+/// The fixed "now" timestamp used for testing relative dates.
+/// This matches GIT_TEST_DATE_NOW=1000000000 in the baseline script.
+/// This is Sun Sep 9 01:46:40 UTC 2001.
+fn fixed_now() -> SystemTime {
+    std::time::UNIX_EPOCH + Duration::from_secs(1_000_000_000)
+}
+
 static BASELINE: LazyLock<HashMap<String, Sample>> = LazyLock::new(|| {
     (|| -> Result<_> {
         let base = gix_testtools::scripted_fixture_read_only("generate_git_date_baseline.sh")?;
@@ -53,7 +69,13 @@ fn parse_compare_format() {
         },
     ) in BASELINE.iter()
     {
-        let res = gix_date::parse(pattern.as_str(), Some(SystemTime::now()));
+        // Use fixed_now() for relative dates, current time for absolute dates
+        let now = if is_relative_date(pattern) {
+            Some(fixed_now())
+        } else {
+            Some(SystemTime::now())
+        };
+        let res = gix_date::parse(pattern.as_str(), now);
         assert_eq!(
             res.is_ok(),
             *exit_code == 0,
@@ -68,6 +90,7 @@ fn parse_compare_format() {
             if let Some(format_name) = format_name {
                 let reformatted = t
                     .format(match format_name.as_str() {
+                        "SHORT" => Format::Custom(format::SHORT),
                         "RFC2822" => Format::Custom(format::RFC2822),
                         "ISO8601" => Format::Custom(format::ISO8601),
                         "ISO8601_STRICT" => Format::Custom(format::ISO8601_STRICT),