From 6281526d23fcd6c924de7c4b256f4483aab2f255 Mon Sep 17 00:00:00 2001
From: Jakob Hellermann <jakob.hellermann@protonmail.com>
Date: Fri, 28 Oct 2022 00:14:56 +0200
Subject: [PATCH] query entity as well

---
 crates/bevy_ecs/src/query/state.rs | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/crates/bevy_ecs/src/query/state.rs b/crates/bevy_ecs/src/query/state.rs
index f68f2492e7bc4e..a7dba6c6b6a290 100644
--- a/crates/bevy_ecs/src/query/state.rs
+++ b/crates/bevy_ecs/src/query/state.rs
@@ -1406,14 +1406,18 @@ mod tests {
         let num = 42;
 
         let component_id = world.init_component::<TestComponent>();
-        world.spawn(TestComponent(num));
+        let spawned_entity = world.spawn(TestComponent(num)).id();
 
-        let mut query_state =
-            QueryState::<Ptr<'_>, ()>::new_with_config(&mut world, component_id, ());
+        let mut query_state = QueryState::<(Entity, Ptr<'_>), ()>::new_with_config(
+            &mut world,
+            ((), component_id),
+            (),
+        );
 
         let results: Vec<_> = query_state.iter(&world).collect();
         match results.as_slice() {
-            [value] => {
+            [(entity, value)] => {
+                assert_eq!(*entity, spawned_entity);
                 // SAFETY: correct type, read access
                 let value = unsafe { value.deref::<TestComponent>() };
                 assert_eq!(value.0, num);
@@ -1432,17 +1436,20 @@ mod tests {
         let component_id_1 = world.init_component::<TestComponent>();
         let component_id_2 = world.init_component::<TestComponent2>();
 
-        world.spawn((TestComponent(num_1), TestComponent2(num_2)));
+        let spawned_entity = world
+            .spawn((TestComponent(num_1), TestComponent2(num_2)))
+            .id();
 
-        let mut query_state = QueryState::<Vec<Ptr<'_>>, ()>::new_with_config(
+        let mut query_state = QueryState::<(Entity, Vec<Ptr<'_>>), ()>::new_with_config(
             &mut world,
-            vec![component_id_1, component_id_2],
+            ((), vec![component_id_1, component_id_2]),
             (),
         );
 
         let results: Vec<_> = query_state.iter(&world).collect();
         match results.as_slice() {
-            [result] => {
+            [(entity, result)] => {
+                assert_eq!(*entity, spawned_entity);
                 match result.as_slice() {
                     [val_1, val_2] => {
                         // SAFETY: correct type, read access