Skip to content

Commit 0200c06

Browse files
LarsEckartJayBazuziisidore
committed
- F DateScrubber accepts SimpleDateFormat
Co-authored-by: Jay Bazuzi <jay@bazuzi.com> Co-authored-by: Llewellyn Falco <llewellyn.falco@gmail.com>
1 parent 81ef6b7 commit 0200c06

2 files changed

Lines changed: 22 additions & 1 deletion

File tree

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.junit.jupiter.api.Disabled;
1010
import org.junit.jupiter.api.Test;
1111

12+
import java.text.SimpleDateFormat;
1213
import java.util.Date;
1314
import java.util.List;
1415
import java.util.stream.Collectors;
@@ -239,4 +240,16 @@ void testMultipleCustomScrubbers()
239240
DateScrubber.clearCustomScrubbers();
240241
}
241242
}
242-
}
243+
244+
@Test
245+
void testForSimpleDateFormat()
246+
{
247+
var expected = """
248+
created at [Date1]
249+
""";
250+
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
251+
DateScrubber scrubber = DateScrubber.forSimpleDateFormat(sdf);
252+
String result = "created at " + sdf.format(new Date());
253+
Approvals.verify(result, new Options().inline(expected).withScrubber(scrubber));
254+
}
255+
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
import org.lambda.query.Query;
99

1010
import java.sql.Timestamp;
11+
import java.text.SimpleDateFormat;
1112
import java.util.ArrayList;
13+
import java.util.Date;
1214
import java.util.List;
1315
import java.util.regex.Pattern;
1416
import java.util.regex.PatternSyntaxException;
@@ -117,6 +119,12 @@ public static Scrubber getScrubberForDate()
117119
return DateScrubber.getScrubberFor(new java.util.Date(0).toString());
118120
}
119121

122+
public static DateScrubber forSimpleDateFormat(SimpleDateFormat simpleDateFormat)
123+
{
124+
String formattedExample = simpleDateFormat.format(new Date(0));
125+
return getScrubberFor(formattedExample);
126+
}
127+
120128
public static void addScrubber(String example, String regex)
121129
{
122130
addScrubber(example, regex, true);

0 commit comments

Comments
 (0)