test: Tests are running!

Author: shanecelis

crates/languages/bevy_mod_scripting_rhai/src/lib.rs

@@ -3,11 +3,12 @@
 use std::ops::Deref;
 
 use bevy::{
+    asset::Handle,
     app::Plugin,
     ecs::{entity::Entity, world::World},
 };
 use bevy_mod_scripting_core::{
-    asset::Language,
+    asset::{Language, ScriptAsset},
     bindings::{
         function::namespace::Namespace, globals::AppScriptGlobalsRegistry,
         script_value::ScriptValue, ThreadWorldContainer, WorldContainer,
@@ -17,7 +18,7 @@ use bevy_mod_scripting_core::{
     event::CallbackLabel,
     reflection_extensions::PartialReflectExt,
     runtime::RuntimeSettings,
-    script::ScriptId,
+    script::{DisplayProxy, ScriptId},
     IntoScriptPluginParams, ScriptingPlugin,
 };
 use bindings::{
@@ -180,7 +181,7 @@ impl Plugin for RhaiScriptingPlugin {
 // NEW helper function to load content into an existing context without clearing previous definitions.
 fn load_rhai_content_into_context(
     context: &mut RhaiScriptContext,
-    script: &ScriptId,
+    script: &Handle<ScriptAsset>,
     content: &[u8],
     initializers: &[ContextInitializer<RhaiScriptingPlugin>],
     pre_handling_initializers: &[ContextPreHandlingInitializer<RhaiScriptingPlugin>],
@@ -189,7 +190,7 @@ fn load_rhai_content_into_context(
     let runtime = runtime.read();
 
     context.ast = runtime.compile(std::str::from_utf8(content)?)?;
-    context.ast.set_source(script.to_string());
+    context.ast.set_source(script.display().to_string());
 
     initializers
         .iter()
@@ -205,7 +206,7 @@ fn load_rhai_content_into_context(
 
 /// Load a rhai context from a script.
 pub fn rhai_context_load(
-    script: &ScriptId,
+    script: &Handle<ScriptAsset>,
     content: &[u8],
     initializers: &[ContextInitializer<RhaiScriptingPlugin>],
     pre_handling_initializers: &[ContextPreHandlingInitializer<RhaiScriptingPlugin>],
@@ -229,7 +230,7 @@ pub fn rhai_context_load(
 
 /// Reload a rhai context from a script. New content is appended to the existing context.
 pub fn rhai_context_reload(
-    script: &ScriptId,
+    script: &Handle<ScriptAsset>,
     content: &[u8],
     context: &mut RhaiScriptContext,
     initializers: &[ContextInitializer<RhaiScriptingPlugin>],
@@ -251,7 +252,7 @@ pub fn rhai_context_reload(
 pub fn rhai_callback_handler(
     args: Vec<ScriptValue>,
     entity: Entity,
-    script_id: &ScriptId,
+    script_id: &Handle<ScriptAsset>,
     callback: &CallbackLabel,
     context: &mut RhaiScriptContext,
     pre_handling_initializers: &[ContextPreHandlingInitializer<RhaiScriptingPlugin>],
@@ -271,7 +272,7 @@ pub fn rhai_callback_handler(
     bevy::log::trace!(
         "Calling callback {} in script {} with args: {:?}",
         callback,
-        script_id,
+        script_id.display(),
         args
     );
     let runtime = runtime.read();
@@ -288,7 +289,7 @@ pub fn rhai_callback_handler(
             if let EvalAltResult::ErrorFunctionNotFound(_, _) = e.unwrap_inner() {
                 bevy::log::trace!(
                     "Script {} is not subscribed to callback {} with the provided arguments.",
-                    script_id,
+                    script_id.display(),
                     callback
                 );
                 Ok(ScriptValue::Unit)

crates/testing_crates/script_integration_test_harness/src/lib.rs

@@ -17,7 +17,7 @@ use bevy::{
         world::{Command, FromWorld, Mut},
     },
     log::Level,
-    prelude::{Entity, World},
+    prelude::{Entity, World, Commands},
     reflect::{Reflect, TypeRegistry},
     utils::tracing,
 };
@@ -33,7 +33,7 @@ use bevy_mod_scripting_core::{
     event::{IntoCallbackLabel, ScriptErrorEvent},
     extractors::{HandlerContext, WithWorldGuard},
     handler::handle_script_errors,
-    script::ScriptId,
+    script::{ScriptComponent, ScriptId},
     BMSScriptingInfrastructurePlugin, IntoScriptPluginParams, ScriptingPlugin,
 };
 use bevy_mod_scripting_functions::ScriptFunctionsPlugin;
@@ -201,14 +201,15 @@ pub fn execute_rhai_integration_test(script_id: &str) -> Result<(), String> {
     execute_integration_test(plugin, |_, _| {}, script_id)
 }
 
-pub fn execute_integration_test<
+pub fn execute_integration_test<'a,
     P: IntoScriptPluginParams + Plugin + AsMut<ScriptingPlugin<P>>,
     F: FnOnce(&mut World, &mut TypeRegistry),
 >(
     plugin: P,
     init: F,
-    script_id: &str,
+    script_id: impl Into<AssetPath<'a>>,
 ) -> Result<(), String> {
+    let script_id = script_id.into();
     // set "BEVY_ASSET_ROOT" to the global assets folder, i.e. CARGO_MANIFEST_DIR/../../../assets
     let mut manifest_dir = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap());
 
@@ -234,28 +235,27 @@ pub fn execute_integration_test<
         OnTestLast => "on_test_last",
     );
 
-    let script_id = script_id.to_owned();
-    let script_id: &'static str = Box::leak(script_id.into_boxed_str());
+    let script_path = script_id.clone_owned();
 
-    let load_system = |server: Res<AssetServer>, mut handle: Local<Handle<ScriptAsset>>| {
-        *handle = server.load(script_id.to_owned());
+    // tests can opt in to this via "__RETURN"
+    let expect_callback_response = script_id.path().to_str().map(|s| s.contains("__RETURN")).unwrap_or(false);
+    let load_system = move |server: Res<AssetServer>, mut commands: Commands| {
+        commands.spawn(ScriptComponent::new([server.load(script_path.clone())]));
     };
 
-    // tests can opt in to this via "__RETURN"
-    let expect_callback_response = script_id.contains("__RETURN");
 
     app.add_systems(Startup, load_system);
     app.add_systems(
         Update,
-        TestCallbackBuilder::<P, OnTest>::build(script_id, expect_callback_response),
+        TestCallbackBuilder::<P, OnTest>::build(&script_id, expect_callback_response),
     );
     app.add_systems(
         PostUpdate,
-        TestCallbackBuilder::<P, OnTestPostUpdate>::build(script_id, expect_callback_response),
+        TestCallbackBuilder::<P, OnTestPostUpdate>::build(&script_id, expect_callback_response),
     );
     app.add_systems(
         Last,
-        TestCallbackBuilder::<P, OnTestLast>::build(script_id, expect_callback_response),
+        TestCallbackBuilder::<P, OnTestLast>::build(&script_id, expect_callback_response),
     );
     app.add_systems(Update, dummy_update_system);
     app.add_systems(Startup, dummy_startup_system::<String>);

tests/script_tests.rs

@@ -5,8 +5,6 @@ use std::path::PathBuf;
 use libtest_mimic::{Arguments, Failed, Trial};
 use script_integration_test_harness::{
     execute_lua_integration_test,
-    #[cfg(feature = "rhai")]
-    execute_rhai_integration_test,
 };
 
 use test_utils::{discover_all_tests, Test, TestKind};
@@ -23,10 +21,12 @@ impl TestExecutor for Test {
         match self.kind {
             TestKind::Lua => execute_lua_integration_test(&self.path.to_string_lossy())?,
             TestKind::Rhai => {
-                #[cfg(feature = "rhai")]
-                execute_rhai_integration_test(&self.path.to_string_lossy())?
-                #[cfg(not(feature = "rhai"))]
-                panic!("no 'rhai' feature")
+                if cfg!(feature = "rhai") {
+                    #[cfg(feature = "rhai")]
+                    script_integration_test_harness::execute_rhai_integration_test(&self.path.to_string_lossy())?
+                } else {
+                    panic!("no 'rhai' feature")
+                }
             },
 
         }