Skip to content

Commit c3c925b

Browse files
committed
expand ordering test to include ordering between script systems
1 parent 6790f4f commit c3c925b

File tree

2 files changed

+33
-6
lines changed

2 files changed

+33
-6
lines changed

assets/tests/add_system/adds_system_in_correct_order.lua

+15-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ function on_test()
2020
system_builder("custom_system_before", script_id)
2121
:before(test_system)
2222
)
23+
24+
local script_system_between = world.add_system(
25+
post_update_schedule,
26+
system_builder("custom_system_between", script_id)
27+
:after(test_system)
28+
:before(system_after)
29+
)
2330
end
2431

2532

@@ -39,10 +46,16 @@ function custom_system_after()
3946
runs[#runs + 1] = "custom_system_after"
4047
end
4148

49+
function custom_system_between()
50+
print("custom_system_between")
51+
runs[#runs + 1] = "custom_system_between"
52+
end
53+
4254
-- runs in the `Last` bevy schedule
4355
function on_test_last()
44-
assert(#runs == 3, "Expected 3 runs, got: " .. #runs)
56+
assert(#runs == 4, "Expected 4 runs, got: " .. #runs)
4557
assert(runs[1] == "custom_system_before", "Expected custom_system_before to run first, got: " .. runs[1])
4658
assert(runs[2] == "on_test_post_update", "Expected on_test_post_update to run second, got: " .. runs[2])
47-
assert(runs[3] == "custom_system_after", "Expected custom_system_after to run third, got: " .. runs[3])
59+
assert(runs[3] == "custom_system_between", "Expected custom_system_between to run third, got: " .. runs[3])
60+
assert(runs[4] == "custom_system_after", "Expected custom_system_after to run second, got: " .. runs[4])
4861
end

assets/tests/add_system/adds_system_in_correct_order.rhai

+18-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,19 @@ fn on_test() {
44
let post_update_schedule = world.get_schedule_by_name.call("PostUpdate");
55
let test_system = post_update_schedule.get_system_by_name.call("on_test_post_update");
66

7-
let builder_after = system_builder.call("custom_system_after", script_id).after.call(test_system);
7+
let builder_after = system_builder.call("custom_system_after", script_id)
8+
.after.call(test_system);
89
let system_after = world.add_system.call(post_update_schedule, builder_after);
910

10-
let builder_before = system_builder.call("custom_system_before", script_id).before.call(test_system);
11+
let builder_before = system_builder.call("custom_system_before", script_id)
12+
.before.call(test_system);
1113
let system_before = world.add_system.call(post_update_schedule, builder_before);
14+
15+
let builder_between = system_builder.call("custom_system_between", script_id)
16+
.after.call(test_system)
17+
.before.call(system_after);
18+
19+
let system_between = world.add_system.call(post_update_schedule, builder_between);
1220
}
1321

1422
fn custom_system_before() {
@@ -26,9 +34,15 @@ fn custom_system_after() {
2634
runs.push("custom_system_after");
2735
}
2836

37+
fn custom_system_between() {
38+
print("custom_system_between");
39+
runs.push("custom_system_between");
40+
}
41+
2942
fn on_test_last() {
30-
assert(runs.len() == 3, "Expected 3 runs, got: " + runs.len().to_string());
43+
assert(runs.len() == 4, "Expected 4 runs, got: " + runs.len().to_string());
3144
assert(runs[0] == "custom_system_before", "Expected custom_system_before to run first, got: " + runs[0]);
3245
assert(runs[1] == "on_test_post_update", "Expected on_test_post_update to run second, got: " + runs[1]);
33-
assert(runs[2] == "custom_system_after", "Expected custom_system_after to run third, got: " + runs[2]);
46+
assert(runs[2] == "custom_system_between", "Expected custom_system_between to run third, got: " + runs[2]);
47+
assert(runs[3] == "custom_system_after", "Expected custom_system_after to run third, got: " + runs[3]);
3448
}

0 commit comments

Comments
 (0)