Lwt sequence tests #536
Lwt sequence tests #536
Conversation
|
They look good :) |
|
@aantron, I have tested all the |
|
Thanks, I'm looking into the coverage issue. |
cedlemo
force-pushed
the
lwt_sequence_tests
branch
from
f58e41e to
e3e3707
Compare
|
I have rebased and pushed everything. |
|
96% coverage. It remains |
test/core/test_lwt_sequence.ml
Outdated
|
|
||
| test "fold_l" begin fun () -> | ||
| let sum = Lwt_sequence.fold_l (fun v e -> v + e) (filled_sequence ()) 0 in | ||
| Lwt.return (sum = 0) |
There was a problem hiding this comment.
Totally a nit, but I would change + to * (easiest) or change the sequence elements. Starting with zero and checking for zero could fail to catch a mistake where we accidentally forget to call f at all, and just propagate the accumulator during fold. Not that anyone is actually going to edit Lwt_sequence and do that, so feel free not to fix it :)
|
Oops, cross-posted.
This is probably because it is reporting coverage of Manually editing the test suite to filter it is pretty tedious, we have an issue in Bisect_ppx to somehow support filtering in the report aantron/bisect_ppx#131. |
|
@aantron, I have added the missing test and improved the |
|
Thanks. @cedlemo, the remaining uncovered lines are triggered in this circumstance: #405 (comment). Do you think you could get them covered also? As you can see from that issue, it was an actual bug that had to be fixed, so it would be nice to test it. Of course, please correct me if my memory is hazy. And, you don't have to add those tests. I'm happy to merge the PR as is :) |
@aantron, I will look at this tomorrow. |
|
@aantron, I tried to find a way to (re)create the possible error mentionned in #405 with the following example : edit TL;DR; I finally find an example : let fold_with_current_prev_and_next_removal () =
let s = create_filled_sequence () in
fold_r (fun v acc ->
(if v = 3 then
let n = find_node_r (fun v' -> v' = 3) s in
let _ = remove n in
let n = find_node_r (fun v' -> v' = 4) s in
let _ = remove n in
let n = find_node_r (fun v' -> v' = 2) s in
ignore(remove n));
print_endline (string_of_int v); acc * v) s 1output: exception Empty
type 'a t = {
mutable prev : 'a t;
mutable next : 'a t;
}
type 'a node = {
mutable node_prev : 'a t;
mutable node_next : 'a t;
mutable node_data : 'a;
mutable node_active : bool;
}
external seq_of_node : 'a node -> 'a t = "%identity"
external node_of_seq : 'a t -> 'a node = "%identity"
let remove node =
if node.node_active then begin
node.node_active <- false;
let seq = seq_of_node node in
seq.prev.next <- seq.next;
seq.next.prev <- seq.prev
end
let create () =
let rec seq = { prev = seq; next = seq } in
seq
let is_empty seq = seq.next == seq
let add_r data seq =
let node = { node_prev = seq.prev; node_next = seq; node_data = data; node_active = true } in
seq.prev.next <- seq_of_node node;
seq.prev <- seq_of_node node;
node
let fold_r f seq acc =
let rec loop curr acc =
if curr == seq then
acc
else
let node = node_of_seq curr in
if node.node_active then
loop node.node_prev (f node.node_data acc)
else
loop node.node_next acc
in
loop seq.prev acc
let find_node_r f seq =
let rec loop curr =
if curr != seq then
let node = node_of_seq curr in
if node.node_active then
if f node.node_data then
node
else
loop node.node_prev
else
loop node.node_prev
else
raise Not_found
in
loop seq.prev
let create_filled_sequence () =
let s = create () in
let _ = add_r 1 s in
let _ = add_r 2 s in
let _ = add_r 3 s in
let _ = add_r 4 s in
let _ = add_r 5 s in
s
let simple_fold () =
let s = create_filled_sequence () in
fold_r (fun v acc -> print_endline (string_of_int v); acc * v) s 1
let fold_with_current_removal () =
let s = create_filled_sequence () in
fold_r (fun v acc ->
(if v = 2 then
let n = find_node_r (fun v' -> v' = 2) s in
ignore(remove n)
);
print_endline (string_of_int v); acc * v) s 1
let fold_with_prev_removal () =
let s = create_filled_sequence () in
fold_r (fun v acc ->
(if v = 2 then
let n = find_node_r (fun v' -> v' = 3) s in
ignore(remove n));
print_endline (string_of_int v); acc * v) s 1
let fold_with_current_and_prev_removal () =
let s = create_filled_sequence () in
fold_r (fun v acc ->
(if v = 2 then
let n = find_node_r (fun v' -> v' = 2) s in
let _ = remove n in
let n = find_node_r (fun v' -> v' = 3) s in
ignore(remove n)
);
print_endline (string_of_int v); acc * v) s 1
let fold_with_next_removal () =
let s = create_filled_sequence () in
fold_r (fun v acc ->
(if v = 3 then
let n = find_node_r (fun v' -> v' = 2) s in
ignore(remove n));
print_endline (string_of_int v); acc * v) s 1
let fold_with_current_and_next_removal () =
let s = create_filled_sequence () in
fold_r (fun v acc ->
(if v = 3 then
let n = find_node_r (fun v' -> v' = 2) s in
let _ = remove n in
let n = find_node_r (fun v' -> v' = 3) s in
ignore(remove n));
print_endline (string_of_int v); acc * v) s 1
let _ =
let _ = print_endline "simple fold" in
let _ = simple_fold () in
let _ = print_endline "fold with current 2 removal" in
let _ = fold_with_current_removal () in
let _ = print_endline "fold with prev 3 removal" in
let _ = fold_with_prev_removal () in
let _ = print_endline "fold with current 2 and prev 3 removal" in
let _ = fold_with_current_and_prev_removal () in
let _ = print_endline "fold with next 2 removal" in
let _ = fold_with_next_removal () in
let _ = print_endline "fold with current 3 and next 2 removal" in
ignore(fold_with_current_and_next_removal ())
the ouput is : I dont see a problem here, have you got an idea on how I could trigger the error ? |
cedlemo
force-pushed
the
lwt_sequence_tests
branch
from
537d28b to
3a8d210
Compare
|
rebase done. |
|
Thanks :) |
@aantron, Just a few tests for you to see if it correspond to what you want.