- 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>
approvals · Jan 13, 2025 · ccf3c9d · ccf3c9d
1 parent f7c5699
commit ccf3c9d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.../java/org/approvaltests/scrubbers/DateScrubberTest.supportedFormats.approved.md b/.../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/...c/test/java/org/approvaltests/scrubbers/DateScrubberTest.testGetDateScrubber.approved.txt b/...c/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
@@ -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)
   {