summaryrefslogtreecommitdiff
path: root/ecs/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ecs/tests')
-rw-r--r--ecs/tests/query.rs66
1 files changed, 50 insertions, 16 deletions
diff --git a/ecs/tests/query.rs b/ecs/tests/query.rs
index 8615e3a..7b218e3 100644
--- a/ecs/tests/query.rs
+++ b/ecs/tests/query.rs
@@ -335,14 +335,32 @@ fn query_with_wildcard_target_pair()
world.create_entity((B,));
- let ent_2_id = world.create_entity((B, Pair::new::<G>(ent_1_id)));
-
- world.create_entity((B, Pair::new::<F>(ent_1_id)));
- world.create_entity((B, A, C, Pair::new::<F>(ent_1_id)));
-
- let ent_3_id = world.create_entity((B, Pair::new::<G>(ent_2_id)));
-
- let ent_4_id = world.create_entity((B, E, Pair::new_with_comp_target::<G>(D)));
+ let ent_2_id = world.create_entity((
+ B,
+ Pair::builder().relation::<G>().target_id(ent_1_id).build(),
+ ));
+
+ world.create_entity((
+ B,
+ Pair::builder().relation::<F>().target_id(ent_1_id).build(),
+ ));
+ world.create_entity((
+ B,
+ A,
+ C,
+ Pair::builder().relation::<F>().target_id(ent_1_id).build(),
+ ));
+
+ let ent_3_id = world.create_entity((
+ B,
+ Pair::builder().relation::<G>().target_id(ent_2_id).build(),
+ ));
+
+ let ent_4_id = world.create_entity((
+ B,
+ E,
+ Pair::builder().relation::<G>().target_as_data(D).build(),
+ ));
assert_query_finds_ents(
world.query::<(&B, Pair<G, Wildcard>), ()>(),
@@ -363,14 +381,30 @@ fn query_with_component_target_pair()
world.create_entity((B,));
- world.create_entity((B, Pair::new::<G>(ent_1_id)));
-
- world.create_entity((B, Pair::new::<F>(ent_1_id)));
- world.create_entity((B, A, C, Pair::new::<F>(ent_1_id)));
-
- let ent_2_id = world.create_entity((B, Pair::new_with_comp_target::<G>(F)));
-
- let ent_3_id = world.create_entity((B, E, Pair::new_with_comp_target::<G>(F)));
+ world.create_entity((
+ B,
+ Pair::builder().relation::<G>().target_id(ent_1_id).build(),
+ ));
+
+ world.create_entity((
+ B,
+ Pair::builder().relation::<F>().target_id(ent_1_id).build(),
+ ));
+ world.create_entity((
+ B,
+ A,
+ C,
+ Pair::builder().relation::<F>().target_id(ent_1_id).build(),
+ ));
+
+ let ent_2_id = world
+ .create_entity((B, Pair::builder().relation::<G>().target_as_data(F).build()));
+
+ let ent_3_id = world.create_entity((
+ B,
+ E,
+ Pair::builder().relation::<G>().target_as_data(F).build(),
+ ));
assert_query_finds_ents(
world.query::<(&B, Pair<G, &F>), ()>(),