From ccf3c9dbcffd4e1271406887a1a651823946a6ee Mon Sep 17 00:00:00 2001
From: Lars Eckart <lars.eckart@hey.com>
Date: Mon, 13 Jan 2025 19:05:40 +0200
Subject: [PATCH] - F support for Date format reported by helgewessels, Jan
 2025

Co-authored-by: Jay Bazuzi <jay@bazuzi.com>
Co-authored-by: Llewellyn Falco <llewellyn.falco@gmail.com>
---
 .../DateScrubberTest.supportedFormats.approved.md    |  2 +-
 ...DateScrubberTest.testGetDateScrubber.approved.txt | 12 +++++++++++-
 .../org/approvaltests/scrubbers/DateScrubber.java    |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.supportedFormats.approved.md b/approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.supportedFormats.approved.md
index 76e437a1..69479587 100644
--- a/approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.supportedFormats.approved.md
+++ b/approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.supportedFormats.approved.md
@@ -15,4 +15,4 @@
 | 2020-09-10T01:23:45.678Z | \d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}\:\d{2}\.\d{3}Z |
 | 20210505T091112Z | \d{8}T\d{6}Z |
 | 2024-12-17 | \d{4}-\d{2}-\d{2} |
-| 2024-12-18T14:04:46.746130Z | \d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}:\d{2}.\d{1,6}Z |
+| 2024-12-18T14:04:46.746130Z | \d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}:\d{2}(\.\d{1,9})?Z |
diff --git a/approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.testGetDateScrubber.approved.txt b/approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.testGetDateScrubber.approved.txt
index 76b39f29..e8b17bd4 100644
--- a/approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.testGetDateScrubber.approved.txt
+++ b/approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.testGetDateScrubber.approved.txt
@@ -92,7 +92,17 @@ Example: {'date':"[Date1]"}
 
 
 Scrubbing for 2024-12-18T14:04:46.746130Z:
-RegExScrubber[\d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}:\d{2}.\d{1,6}Z]
+RegExScrubber[\d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}:\d{2}(\.\d{1,9})?Z]
+Example: {'date':"[Date1]"}
+
+
+Scrubbing for 2024-12-18T14:04:46Z:
+RegExScrubber[\d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}:\d{2}Z]
+Example: {'date':"[Date1]"}
+
+
+Scrubbing for 2024-12-18T14:04:46.746130834Z:
+RegExScrubber[\d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}:\d{2}(\.\d{1,9})?Z]
 Example: {'date':"[Date1]"}
 
 
diff --git a/approvaltests/src/main/java/org/approvaltests/scrubbers/DateScrubber.java b/approvaltests/src/main/java/org/approvaltests/scrubbers/DateScrubber.java
index 89c93415..d0e89df0 100644
--- a/approvaltests/src/main/java/org/approvaltests/scrubbers/DateScrubber.java
+++ b/approvaltests/src/main/java/org/approvaltests/scrubbers/DateScrubber.java
@@ -41,8 +41,8 @@ public static SupportedFormat[] getSupportedFormats()
                                      "2020-09-10T01:23:45.678Z"),
                                  __("\\d{8}T\\d{6}Z", "20210505T091112Z"),
                                  __("\\d{4}-\\d{2}-\\d{2}", "2024-12-17"),
-                                 __("\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{2}:\\d{2}.\\d{1,6}Z",
-                                     "2024-12-18T14:04:46.746130Z")};
+                                 __("\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{2}:\\d{2}(\\.\\d{1,9})?Z",
+                                     "2024-12-18T14:04:46.746130Z", "2024-12-18T14:04:46Z", "2024-12-18T14:04:46.746130834Z")};
   }
   private static SupportedFormat __(String regex, String... examples)
   {