Skip to content

Commit 0441f92

Browse files
committed
r Rename "_" to "__" for reserved word issues
1 parent 7df4c6a commit 0441f92

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,28 @@ public DateScrubber(String pattern, Function1<Integer, String> replacement)
1717
}
1818
public static SupportedFormat[] getSupportedFormats()
1919
{
20-
return new SupportedFormat[]{_("[a-zA-Z]{3} [a-zA-Z]{3} \\d{2} \\d{2}:\\d{2}:\\d{2}", "Tue May 13 16:30:00"),
21-
_("[a-zA-Z]{3} [a-zA-Z]{3} \\d{2} \\d{2}:\\d{2}:\\d{2} [a-zA-Z]{3,4} \\d{4}",
20+
return new SupportedFormat[]{__("[a-zA-Z]{3} [a-zA-Z]{3} \\d{2} \\d{2}:\\d{2}:\\d{2}", "Tue May 13 16:30:00"),
21+
__("[a-zA-Z]{3} [a-zA-Z]{3} \\d{2} \\d{2}:\\d{2}:\\d{2} [a-zA-Z]{3,4} \\d{4}",
2222
"Wed Nov 17 22:28:33 EET 2021"),
23-
_("[a-zA-Z]{3} [a-zA-Z]{3} \\d{2} \\d{4} \\d{2}:\\d{2}:\\d{2}.\\d{3}",
23+
__("[a-zA-Z]{3} [a-zA-Z]{3} \\d{2} \\d{4} \\d{2}:\\d{2}:\\d{2}.\\d{3}",
2424
"Tue May 13 2014 23:30:00.789"),
25-
_("[a-zA-Z]{3} [a-zA-Z]{3} \\d{2} \\d{2}:\\d{2}:\\d{2} -\\d{4} \\d{4}",
25+
__("[a-zA-Z]{3} [a-zA-Z]{3} \\d{2} \\d{2}:\\d{2}:\\d{2} -\\d{4} \\d{4}",
2626
"Tue May 13 16:30:00 -0800 2014"),
27-
_("\\d{2} [a-zA-Z]{3} \\d{4} \\d{2}:\\d{2}:\\d{2},\\d{3}",
27+
__("\\d{2} [a-zA-Z]{3} \\d{4} \\d{2}:\\d{2}:\\d{2},\\d{3}",
2828
"13 May 2014 23:50:49,999"),
29-
_("[a-zA-Z]{3} \\d{2}, \\d{4} \\d{2}:\\d{2}:\\d{2} [a-zA-Z]{2} [a-zA-Z]{3}",
29+
__("[a-zA-Z]{3} \\d{2}, \\d{4} \\d{2}:\\d{2}:\\d{2} [a-zA-Z]{2} [a-zA-Z]{3}",
3030
"May 13, 2014 11:30:00 PM PST"),
31-
_("\\d{2}:\\d{2}:\\d{2}", "23:30:00"),
32-
_("\\d{4}/\\d{2}/\\d{2} \\d{2}:\\d{2}:\\d{2}.\\d{2}\\d",
31+
__("\\d{2}:\\d{2}:\\d{2}", "23:30:00"),
32+
__("\\d{4}/\\d{2}/\\d{2} \\d{2}:\\d{2}:\\d{2}.\\d{2}\\d",
3333
"2014/05/13 16:30:59.786"),
34-
_("\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{2}Z", "2020-9-10T08:07Z",
34+
__("\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{2}Z", "2020-9-10T08:07Z",
3535
"2020-09-9T08:07Z", "2020-09-10T8:07Z", "2020-09-10T08:07Z"),
36-
_("\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{2}:\\d{2}Z", "2020-09-10T08:07:89Z"),
37-
_("\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{2}\\:\\d{2}\\.\\d{3}Z",
36+
__("\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{2}:\\d{2}Z", "2020-09-10T08:07:89Z"),
37+
__("\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{2}\\:\\d{2}\\.\\d{3}Z",
3838
"2020-09-10T01:23:45.678Z"),
39-
_("\\d{8}T\\d{6}Z", "20210505T091112Z")};
39+
__("\\d{8}T\\d{6}Z", "20210505T091112Z")};
4040
}
41-
private static SupportedFormat _(String regex, String... examples)
41+
private static SupportedFormat __(String regex, String... examples)
4242
{
4343
return new SupportedFormat(regex, examples);
4444
}

todo.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
* Update koans
66
* Approvals.options.forName.asMachineNameSpecificTest().onlyForEnvironments("Larss-Air.lan", "macbook13").run(this::extracted);
77
* NamedEnvironment with execute around pattern?
8-
* Add Verify Multiple things using NamerFactory.withParameters() (like Python)
9-
108
* easier API for custom file name & location?! (issue 2, 51)
119
** Options for file path
1210
** update mrunit and fix tests
@@ -30,6 +28,3 @@
3028
* Documentation for Story Board
3129
* Docs for Query
3230
* Docs for Query.GroupBy
33-
34-
# Other
35-
* Add Take and Skip to Query

0 commit comments

Comments
 (0)