remove logs and add test

Author: makspll

crates/bevy_mod_scripting_core/src/bindings/query.rs

@@ -178,8 +178,6 @@ impl ScriptComponentRegistration {
                     )
                 })?;
 
-            bevy::log::debug!("found component data");
-
             //  TODO: this shouldn't need entire world access it feels
             let type_registry = world.type_registry();
             world.with_global_access(|world| {
@@ -188,7 +186,6 @@ impl ScriptComponentRegistration {
                     .map_err(|_| InteropError::missing_entity(entity))?;
                 {
                     let registry = type_registry.read();
-                    bevy::log::debug!("inserting component instance using component data");
                     component_data.insert(&mut entity, instance.as_partial_reflect(), &registry);
                 }
                 Ok(())

crates/bevy_mod_scripting_core/src/bindings/script_component.rs

@@ -91,12 +91,6 @@ impl WorldAccessGuard<'_> {
         }
 
         let component_id = self.with_global_access(|w| {
-            bevy::log::info!(
-                "components present: {}. script: {}. World id: {:?}",
-                w.components().len(),
-                component_registry_read.components.len(),
-                w.id()
-            );
             let descriptor = unsafe {
                 // Safety: same safety guarantees as ComponentDescriptor::new
                 // we know the type in advance
@@ -108,9 +102,7 @@ impl WorldAccessGuard<'_> {
                     needs_drop::<ScriptComponent>().then_some(|x| x.drop_as::<ScriptComponent>()),
                 )
             };
-            let o = w.register_component_with_descriptor(descriptor);
-            bevy::log::info!("components present after: {}", w.components().len());
-            o
+            w.register_component_with_descriptor(descriptor)
         })?;
         drop(component_registry_read);
         let mut component_registry = component_registry.write();
@@ -122,12 +114,6 @@ impl WorldAccessGuard<'_> {
             component_id,
         );
 
-        bevy::log::debug!(
-            "Registering dynamic script component: {}, component id assigned: {:?}",
-            component_name,
-            component_id
-        );
-
         let component_info = ScriptComponentInfo {
             name: component_name.clone(),
             registration: registration.clone(),
@@ -153,51 +139,33 @@ impl Plugin for DynamicScriptComponentPlugin {
 
 #[cfg(test)]
 mod test {
-    use std::ptr::NonNull;
-
     use super::*;
-    use bevy::{ecs::world::World, ptr::OwningPtr};
+    use bevy::ecs::world::World;
 
     #[test]
     fn test_script_component() {
         let mut world = World::new();
-        let component_name = "MyScriptComponent";
-
-        #[derive(Reflect, Component)]
-        struct UnderlyingComponent;
-
-        // initialize component descriptor dynamically
-        let descriptor = unsafe {
-            // Safety: same safety guarantees as ComponentDescriptor::new
-            // we know the type in advance
-            // we only use this method to name the component
-            ComponentDescriptor::new_with_layout(
-                component_name,
-                UnderlyingComponent::STORAGE_TYPE,
-                Layout::new::<UnderlyingComponent>(),
-                needs_drop::<UnderlyingComponent>()
-                    .then_some(|x| x.drop_as::<UnderlyingComponent>()),
-            )
+        let registration = {
+            let guard = WorldAccessGuard::new_exclusive(&mut world);
+
+            guard
+                .register_script_component("ScriptTest".to_string())
+                .unwrap()
         };
 
-        // register with the world
-        let component_id = world.register_component_with_descriptor(descriptor.clone());
-        let component_id_2 = world.register_component_with_descriptor(descriptor);
-        assert_eq!(component_id, component_id_2); // iam getting a double free for this in scritps somehow
-
-        // insert into the entity
-        let entity = world.spawn_empty().id();
-        let mut entity = world.entity_mut(entity);
-
-        let value = Box::new(UnderlyingComponent);
-        let value_ref = Box::into_raw(value).cast::<u8>();
-        let ptr = unsafe { OwningPtr::new(NonNull::new(value_ref).unwrap()) };
-        unsafe { entity.insert_by_id(component_id, ptr) };
-
-        // check it gets inserted
-        assert!(
-            entity.contains_id(component_id),
-            "entity does not contain freshly inserted component"
-        )
+        let registry = world.get_resource::<AppScriptComponentRegistry>().unwrap();
+
+        let registry = registry.read();
+        let info = registry.get("ScriptTest").unwrap();
+        assert_eq!(info.registration.component_id, registration.component_id);
+        assert_eq!(info.name, "ScriptTest");
+
+        // can get the component through the world
+        let component = world
+            .components()
+            .get_info(info.registration.component_id)
+            .unwrap();
+
+        assert_eq!(component.name(), "ScriptTest");
     }
 }