From 2d404435c910929abe102f74081812a50ff4a044 Mon Sep 17 00:00:00 2001
From: Giacomo Stevanato <giaco.stevanato@gmail.com>
Date: Sun, 13 Jul 2025 15:39:19 +0200
Subject: [PATCH] Remove and/or adapt invalid tests

---
 crates/bevy_ecs/src/component/required.rs | 95 +----------------------
 1 file changed, 4 insertions(+), 91 deletions(-)

diff --git a/crates/bevy_ecs/src/component/required.rs b/crates/bevy_ecs/src/component/required.rs
index e7e986d909..4193f185eb 100644
--- a/crates/bevy_ecs/src/component/required.rs
+++ b/crates/bevy_ecs/src/component/required.rs
@@ -537,15 +537,11 @@ pub(super) fn enforce_no_required_components_recursion(
 
 #[cfg(test)]
 mod tests {
-    use std::{
-        string::{String, ToString},
-        vec,
-        vec::Vec,
-    };
+    use std::string::{String, ToString};
 
     use crate::{
         bundle::Bundle,
-        component::{Component, ComponentId, RequiredComponents, RequiredComponentsError},
+        component::{Component, RequiredComponentsError},
         prelude::Resource,
         world::World,
     };
@@ -1194,90 +1190,7 @@ mod tests {
     }
 
     #[test]
-    fn required_components_inheritance_depth() {
-        // Test that inheritance depths are computed correctly for requirements.
-        //
-        // Requirements with `require` attribute:
-        //
-        // A -> B -> C
-        //   0    1
-        //
-        // Runtime requirements:
-        //
-        // X -> A -> B -> C
-        //   0    1    2
-        //
-        // X -> Y -> Z -> B -> C
-        //   0    1    2    3
-
-        #[derive(Component, Default)]
-        #[require(B)]
-        struct A;
-
-        #[derive(Component, Default)]
-        #[require(C)]
-        struct B;
-
-        #[derive(Component, Default)]
-        struct C;
-
-        #[derive(Component, Default)]
-        struct X;
-
-        #[derive(Component, Default)]
-        struct Y;
-
-        #[derive(Component, Default)]
-        struct Z;
-
-        let mut world = World::new();
-
-        let a = world.register_component::<A>();
-        let b = world.register_component::<B>();
-        let c = world.register_component::<C>();
-        let y = world.register_component::<Y>();
-        let z = world.register_component::<Z>();
-
-        world.register_required_components::<X, A>();
-        world.register_required_components::<X, Y>();
-        world.register_required_components::<Y, Z>();
-        world.register_required_components::<Z, B>();
-
-        world.spawn(X);
-
-        let required_a = world.get_required_components::<A>().unwrap();
-        let required_b = world.get_required_components::<B>().unwrap();
-        let required_c = world.get_required_components::<C>().unwrap();
-        let required_x = world.get_required_components::<X>().unwrap();
-        let required_y = world.get_required_components::<Y>().unwrap();
-        let required_z = world.get_required_components::<Z>().unwrap();
-
-        /// Returns the component IDs and inheritance depths of the required components
-        /// in ascending order based on the component ID.
-        fn to_vec(required: &RequiredComponents) -> Vec<(ComponentId, u16)> {
-            let mut vec = required
-                .0
-                .iter()
-                .map(|(id, component)| (*id, component.inheritance_depth))
-                .collect::<Vec<_>>();
-            vec.sort_by_key(|(id, _)| *id);
-            vec
-        }
-
-        // Check that the inheritance depths are correct for each component.
-        assert_eq!(to_vec(required_a), vec![(b, 0), (c, 1)]);
-        assert_eq!(to_vec(required_b), vec![(c, 0)]);
-        assert_eq!(to_vec(required_c), vec![]);
-        assert_eq!(
-            to_vec(required_x),
-            vec![(a, 0), (b, 1), (c, 2), (y, 0), (z, 1)]
-        );
-        assert_eq!(to_vec(required_y), vec![(b, 1), (c, 2), (z, 0)]);
-        assert_eq!(to_vec(required_z), vec![(b, 0), (c, 1)]);
-    }
-
-    #[test]
-    fn required_components_inheritance_depth_bias() {
+    fn required_components_bundle_priority() {
         #[derive(Component, PartialEq, Eq, Clone, Copy, Debug)]
         struct MyRequired(bool);
 
@@ -1303,7 +1216,7 @@ mod tests {
             .get::<MyRequired>()
             .cloned();
 
-        assert_eq!(order_a, Some(MyRequired(true)));
+        assert_eq!(order_a, Some(MyRequired(false)));
         assert_eq!(order_b, Some(MyRequired(true)));
     }