Skip to content

Regression: Revert shrinker fix #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmid merged 4 commits into from
May 19, 2023
Merged

Regression: Revert shrinker fix #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
360039e
revert-shrinker-fix
jmid May 17, 2023
4fc1283
Update expected outputs
jmid May 17, 2023
aaf575e
Add regression test case
jmid May 17, 2023
0133ea2
Add CHANGELOG entry
jmid May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

## NEXT RELEASE

- ...
- Roll back the `Shrink.list_spine` fix, as it was utilizing polymorphic
equality that can raise an exception on function comparison.

## 0.21

Expand Down
2 changes: 1 addition & 1 deletion src/core/QCheck.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ module Shrink = struct
match l with
| [] -> ()
| [_] -> yield []
| [x;y] -> yield []; yield [x]; if x <> y then yield [y]
| [x;y] -> yield []; yield [x]; yield [y]
| _::_ ->
let len = List.length l in
let xs,ys = split l ((1 + len) / 2) [] in
Expand Down
1 change: 1 addition & 0 deletions test/core/QCheck_expect_test.expected.ocaml4.32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ random seed: 1234
[1; 1]
[]
[1]
[1]
[0; 1]
[1; 0]

Expand Down
1 change: 1 addition & 0 deletions test/core/QCheck_expect_test.expected.ocaml4.64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ random seed: 1234
[1; 1]
[]
[1]
[1]
[0; 1]
[1; 0]

Expand Down
1 change: 1 addition & 0 deletions test/core/QCheck_expect_test.expected.ocaml5.32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ random seed: 1234
[2; 2]
[]
[2]
[2]
[1; 2]
[2; 1]

Expand Down
1 change: 1 addition & 0 deletions test/core/QCheck_expect_test.expected.ocaml5.64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ random seed: 1234
[2; 2]
[]
[2]
[2]
[1; 2]
[2; 1]

Expand Down
11 changes: 8 additions & 3 deletions test/core/QCheck_unit_tests.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ module Shrink = struct
List.iter (alco_check Alcotest.string (trace_false Shrink.string) "on repeated failure")
[ ("string \"\"", "", []);
("string \"a\"", "a", [""]);
("string \"aa\"", "aa", [""; "a"]);
("string \"aaaa\"", "aaaa", ["aa"; "aa"; "aaa"]);
("string \"aa\"", "aa", [""; "a"; "a"]);
("string \"aaaa\"", "aaaa", ["aa"; "aa"; "aaa"; "aaa"]);
("string \"abcd\"", "abcd", ["ab"; "cd"; "acd"; "bcd"; "aacd"; "abbd"; "abcc"]);
("string \"E'*\"", "E'*", ["E'"; "*"; "E*"; "'*"; "S'*"; "L'*"; "H'*"; "F'*"; "ED*";
"E5*"; "E.*"; "E**"; "E(*"; "E'E"; "E'7"; "E'0"; "E'-"; "E'+"]);
Expand All @@ -101,7 +101,7 @@ module Shrink = struct
"vi5x92mgG"; "vi5x92sgG"; "vi5x92vgG"; "vi5x92wgG";
"vi5x92xdG"; "vi5x92xfG";
"vi5x92xgT"; "vi5x92xgM"; "vi5x92xgJ"; "vi5x92xgH"]);
("string \"~~~~\"", "~~~~", ["~~"; "~~"; "~~~"; "p~~~"; "w~~~"; "{~~~"; "}~~~"; "~p~~";
("string \"~~~~\"", "~~~~", ["~~"; "~~"; "~~~"; "~~~"; "p~~~"; "w~~~"; "{~~~"; "}~~~"; "~p~~";
"~w~~"; "~{~~"; "~}~~"; "~~p~"; "~~w~"; "~~{~"; "~~}~";
"~~~p"; "~~~w"; "~~~{"; "~~~}"]); ];
List.iter (alco_check Alcotest.string (trace_true Shrink.string) "on repeated success")
Expand All @@ -113,6 +113,10 @@ module Shrink = struct
("string \"E'*\"", "E'*", ["E'"; ""]);
("string \"vi5x92xgG\"", "vi5x92xgG", ["vi5x9"; "vi5"; "vi"; ""]); ]

let test_list_spine_compare () =
let run_test () = QCheck.Shrink.list_spine [pred;succ] ignore in
Alcotest.(check unit) "doesn't compare elements" () @@ run_test ()

let tests = ("Shrink", Alcotest.[
test_case "int" `Quick test_int;
test_case "int32" `Quick test_int32;
Expand All @@ -121,6 +125,7 @@ module Shrink = struct
test_case "char_numeral" `Quick test_char_numeral;
test_case "char_printable" `Quick test_char_printable;
test_case "string" `Quick test_string;
test_case "list_spine" `Quick test_list_spine_compare;
])
end

Expand Down