- B DateScrubber.getScrubberFor now handles timestamps with sub second precision

Co-authored-by: Jay Bazuzi <jay@bazuzi.com>
Co-authored-by: Llewellyn Falco <llewellyn.falco@gmail.com>

Author: 3 people

approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.supportedFormats.approved.md

@@ -19,6 +19,6 @@
 | 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,9})?Z                                                                              |
 | 13/05/2014 23:50:49            | \d{2}[-/.]\d{2}[-/.]\d{4}\s\d{2}:\d{2}(:\d{2})?( (?:pm\|am\|PM\|AM))?                                                               |
-| 2025-05-15 16:57:04.599        | \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}                                                                                          |
+| 2025-05-15 16:57:04.599        | \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+                                                                                            |
 
 

approvaltests-tests/src/test/java/org/approvaltests/scrubbers/DateScrubberTest.testGetDateScrubber.approved.txt

@@ -137,7 +137,12 @@ Example: {'date':"[Date1]"}
 
 
 Scrubbing for 2025-05-15 16:57:04.599:
-RegExScrubber[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}]
+RegExScrubber[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+]
+Example: {'date':"[Date1]"}
+
+
+Scrubbing for 2025-05-19 19:45:04.99:
+RegExScrubber[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+]
 Example: {'date':"[Date1]"}
 
 

approvaltests/src/main/java/org/approvaltests/scrubbers/DateScrubber.java

@@ -47,8 +47,8 @@ public static SupportedFormat[] getSupportedFormats()
                                  __("\\d{2}[-/.]\\d{2}[-/.]\\d{4}\\s\\d{2}:\\d{2}(:\\d{2})?( (?:pm|am|PM|AM))?",
                                      "13/05/2014 23:50:49", "13.05.2014 23:50:49", "13-05-2014 23:50:49",
                                      "13.05.2014 23:50", "05/13/2014 11:50:49 PM"),
-                                 __("\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3}",
-                                     "2025-05-15 16:57:04.599"),};
+                                 __("\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d+", "2025-05-15 16:57:04.599",
+                                     "2025-05-19 19:45:04.99")};
   }
   private static SupportedFormat __(String regex, String... examples)
   {