1 files changed, 28 insertions, 3 deletions

diff --git a/unit_tests/scripts/lane/tasking_cancelling.lua b/unit_tests/scripts/lane/tasking_cancelling.lua
index 8bee3a6..d153ffa 100644
--- a/unit_tests/scripts/lane/tasking_cancelling.lua
+++ b/unit_tests/scripts/lane/tasking_cancelling.lua
@@ -1,4 +1,7 @@
-local require_lanes_result_1, require_lanes_result_2 = require "lanes".configure(config).configure()
+local require_fixture_result_1, require_fixture_result_2 = require "fixture"
+local fixture = assert(require_fixture_result_1)
+
+local require_lanes_result_1, require_lanes_result_2 = require "lanes".configure{on_state_create = fixture.on_state_create}.configure()
 print("require_lanes_result:", require_lanes_result_1, require_lanes_result_2)
 local lanes = require_lanes_result_1
 
@@ -15,8 +18,30 @@ local lanes_linda = assert(lanes.linda)
 -- ##################################################################################################
 -- ##################################################################################################
 
+-- cancellation of cooperating lanes
+local cooperative = function()
+    local fixture = assert(require "fixture")
+    local which_cancel
+    repeat
+        fixture.block_for(0.2)
+        which_cancel = cancel_test()
+    until which_cancel
+    return which_cancel
+end
+-- soft and hard are behaviorally equivalent when no blocking linda operation is involved
+local cooperative_lane_soft = lanes_gen("*", { name = 'auto' }, cooperative)()
+local a, b = cooperative_lane_soft:cancel("soft", 0) -- issue request, do not wait for lane to terminate
+assert(a == false and b == "timeout", "got " .. tostring(a) .. " " .. tostring(b))
+assert(cooperative_lane_soft[1] == "soft") -- return value of the lane body is the value returned by cancel_test()
+local cooperative_lane_hard = lanes_gen("*", { name = 'auto' }, cooperative)()
+local c, d = cooperative_lane_hard:cancel("hard", 0) -- issue request, do not wait for lane to terminate
+assert(a == false and b == "timeout", "got " .. tostring(c) .. " " .. tostring(d))
+assert(cooperative_lane_hard[1] == "hard") -- return value of the lane body is the value returned by cancel_test()
+
+-- ##################################################################################################
+
 -- cancellation of lanes waiting on a linda
-local limited = lanes_linda("limited")
+local limited = lanes_linda{name = "limited"}
 assert.fails(function() limited:limit("key", -1) end)
 assert.failsnot(function() limited:limit("key", 1) end)
 -- [[################################################
@@ -61,7 +86,7 @@ PRINT "wait_receive_lane is cancelled"
 local wait_receive_batched = function()
     local k, v1, v2
     set_finalizer(function() print("wait_receive_batched", k, v1, v2) end)
-    k, v1, v2 = limited:receive(limited.batched, "dummy", 2) -- infinite timeout, returns only when lane is cancelled
+    k, v1, v2 = limited:receive_batched("dummy", 2) -- infinite timeout, returns only when lane is cancelled
 end
 
 local wait_receive_batched_lane = lanes_gen("*", { name = 'auto' }, wait_receive_batched)()