F Scrubbers.scrubAll to allow scrubbing multiple things inside one string

Author: actions-user

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

@@ -10,3 +10,4 @@
 | 2020-9-10T08:07Z | \d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}Z |
 | 2020-09-10T08:07:89Z | \d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}:\d{2}Z |
 | 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 |

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

@@ -66,3 +66,8 @@ RegExScrubber[\d{4}-\d{1,2}-\d{1,2}T\d{1,2}:\d{2}\:\d{2}\.\d{3}Z]
 Example: {'date':"[Date1]"}
 
 
+Scrubbing for 20210505T091112Z:
+RegExScrubber[\d{8}T\d{6}Z]
+Example: {'date':"[Date1]"}
+
+

approvaltests-tests/src/test/java/org/approvaltests/scrubbers/ScrubberTest.groups.approved.txt

@@ -0,0 +1 @@
+http://127.0.0.1:[port]/foo/bar?Date=[Date1]&Signature=[signature]

approvaltests-tests/src/test/java/org/approvaltests/scrubbers/ScrubberTest.java

@@ -4,6 +4,7 @@
 
 import org.approvaltests.Approvals;
 import org.approvaltests.core.Options;
+import org.approvaltests.core.Scrubber;
 import org.junit.jupiter.api.Test;
 
 class ScrubberTest
@@ -39,4 +40,14 @@ void scrubGuids()
     Approvals.verifyAll("guids", guids, new Options(Scrubbers::scrubGuid));
     // end-snippet
   }
+  @Test
+  void scrubMultipleThings()
+  {
+    final Scrubber portScrubber = new RegExScrubber(":\\d+/", ":[port]/");
+    final Scrubber dateScrubber = DateScrubber.getScrubberFor("20210505T091112Z");
+    final Scrubber signatureScrubber = new RegExScrubber("Signature=.+", "Signature=[signature]");
+    Scrubber scrubber = Scrubbers.scrubAll(portScrubber, dateScrubber, signatureScrubber);
+    Approvals.verify("http://127.0.0.1:55079/foo/bar?Date=20210505T091112Z&Signature=4a7dd6f09c1e",
+        new Options(scrubber));
+  }
 }

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

@@ -1,9 +1,9 @@
 package org.approvaltests.scrubbers;
 
-import com.spun.util.ArrayUtils;
 import org.lambda.functions.Function1;
 import org.lambda.query.Query;
 
+import com.spun.util.ArrayUtils;
 import com.spun.util.FormattedException;
 
 public class DateScrubber extends RegExScrubber
@@ -34,7 +34,8 @@ public static SupportedFormat[] getSupportedFormats()
                                      "2020-09-9T08:07Z", "2020-09-10T8:07Z", "2020-09-10T08:07Z"),
                                  _("\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{2}:\\d{2}Z", "2020-09-10T08:07:89Z"),
                                  _("\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{2}\\:\\d{2}\\.\\d{3}Z",
-                                     "2020-09-10T01:23:45.678Z")};
+                                     "2020-09-10T01:23:45.678Z"),
+                                 _("\\d{8}T\\d{6}Z", "20210505T091112Z")};
   }
   private static SupportedFormat _(String regex, String... examples)
   {

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

@@ -0,0 +1,23 @@
+package org.approvaltests.scrubbers;
+
+import org.approvaltests.core.Scrubber;
+
+import com.spun.util.ArrayUtils;
+
+public class MultiScrubber implements Scrubber
+{
+  private final Scrubber[] scrubbers;
+  public MultiScrubber(Scrubber one, Scrubber[] others)
+  {
+    this.scrubbers = ArrayUtils.combine(new Scrubber[]{one}, others);
+  }
+  @Override
+  public String scrub(String input)
+  {
+    for (Scrubber scrubber : scrubbers)
+    {
+      input = scrubber.scrub(input);
+    }
+    return input;
+  }
+}

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

@@ -1,11 +1,17 @@
 package org.approvaltests.scrubbers;
 
+import org.approvaltests.core.Scrubber;
+
 public class Scrubbers
 {
   public static String scrubGuid(String input)
   {
     return new GuidScrubber().scrub(input);
   }
+  public static Scrubber scrubAll(Scrubber one, Scrubber... others)
+  {
+    return new MultiScrubber(one, others);
+  }
   /**
    * Provides methods that can be inlined as example code.
    */