1 files changed, 100 insertions, 9 deletions

diff --git a/ecs/tests/query.rs b/ecs/tests/query.rs
index 0f02bd3..7b218e3 100644
--- a/ecs/tests/query.rs
+++ b/ecs/tests/query.rs
@@ -1,4 +1,5 @@
 use ecs::component::Component;
+use ecs::pair::{Pair, Wildcard};
 use ecs::query::term::Without;
 use ecs::query::{
     TermWithFieldTuple as QueryTermWithFieldTuple,
@@ -36,13 +37,13 @@ struct G;
 fn setup()
 {
     SETUP.call_once_force(|_| {
-        assert_eq!(A::id().id(), 1);
-        assert_eq!(B::id().id(), 2);
-        assert_eq!(C::id().id(), 3);
-        assert_eq!(D::id().id(), 4);
-        assert_eq!(E::id().id(), 5);
-        assert_eq!(F::id().id(), 6);
-        assert_eq!(G::id().id(), 7);
+        assert_eq!(A::id().id(), Uid::FIRST_UNIQUE_ID);
+        assert_eq!(B::id().id(), Uid::FIRST_UNIQUE_ID + 1);
+        assert_eq!(C::id().id(), Uid::FIRST_UNIQUE_ID + 2);
+        assert_eq!(D::id().id(), Uid::FIRST_UNIQUE_ID + 3);
+        assert_eq!(E::id().id(), Uid::FIRST_UNIQUE_ID + 4);
+        assert_eq!(F::id().id(), Uid::FIRST_UNIQUE_ID + 5);
+        assert_eq!(G::id().id(), Uid::FIRST_UNIQUE_ID + 6);
     });
 }
 
@@ -210,7 +211,7 @@ fn query_archetype_exists_with_4_comps_diff_to_next_archetype_and_opt_comp()
     let ent_2_id = world.create_entity((A, B, G));
 
     assert_query_finds_ents(
-        world.query::<(&A, &Option<E>, &G), ()>(),
+        world.query::<(&A, Option<&E>, &G), ()>(),
         vec![ent_1_id, ent_2_id],
     );
 }
@@ -249,7 +250,7 @@ fn query_archetype_nonexistant_and_opt_comp()
     world.create_entity((A, B, C, G, F));
 
     assert_query_finds_ents(
-        world.query::<(&A, &E, &Option<D>), ()>(),
+        world.query::<(&A, &E, Option<&D>), ()>(),
         vec![ent_2_id, ent_3_id],
     );
 }
@@ -320,3 +321,93 @@ fn query_without_comp_and_archetype_nonexistant()
         vec![ent_1_id, ent_2_id],
     );
 }
+
+#[test]
+fn query_with_wildcard_target_pair()
+{
+    setup();
+
+    let _test_lock = TEST_LOCK.lock();
+
+    let mut world = World::new();
+
+    let ent_1_id = world.create_entity((A, C));
+
+    world.create_entity((B,));
+
+    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>), ()>(),
+        vec![ent_2_id, ent_3_id, ent_4_id],
+    );
+}
+
+#[test]
+fn query_with_component_target_pair()
+{
+    setup();
+
+    let _test_lock = TEST_LOCK.lock();
+
+    let mut world = World::new();
+
+    let ent_1_id = world.create_entity((A, C));
+
+    world.create_entity((B,));
+
+    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>), ()>(),
+        vec![ent_2_id, ent_3_id],
+    );
+}