refactor: Bring test harness in line.

Author: shanecelis

crates/languages/bevy_mod_scripting_lua/src/lib.rs

@@ -275,13 +275,14 @@ mod test {
     #[test]
     fn test_reload_doesnt_overwrite_old_context() {
         let lua = Lua::new();
-        let script_id = ScriptId::from("asd.lua");
+        let script_id: ScriptId = ScriptId::from(uuid::Uuid::new_v4());
         let initializers = vec![];
         let pre_handling_initializers = vec![];
         let mut old_ctxt = lua.clone();
+        let handle = Handle::Weak(script_id);
 
         lua_context_load(
-            &script_id,
+            &handle,
             "function hello_world_from_first_load()
             
             end"
@@ -293,7 +294,7 @@ mod test {
         .unwrap();
 
         lua_context_reload(
-            &script_id,
+            &handle,
             "function hello_world_from_second_load()
             
             end"

crates/testing_crates/script_integration_test_harness/Cargo.toml

@@ -6,7 +6,7 @@ publish = false
 
 [features]
 default = ["lua", "rhai"]
-lua = ["bevy_mod_scripting_lua", "bevy_mod_scripting_functions/lua_bindings"]
+lua = ["bevy_mod_scripting_lua", "bevy_mod_scripting_functions/lua_bindings", "bevy_mod_scripting_lua/lua54"]
 rhai = ["bevy_mod_scripting_rhai", "bevy_mod_scripting_functions/rhai_bindings"]
 
 [dependencies]
@@ -23,3 +23,4 @@ bevy_mod_scripting_rhai = { path = "../../languages/bevy_mod_scripting_rhai", op
 criterion = "0.5"
 rand = "0.9"
 rand_chacha = "0.9"
+uuid = "1.11"

crates/testing_crates/script_integration_test_harness/src/lib.rs

@@ -309,7 +309,7 @@ fn run_test_callback<P: IntoScriptPluginParams, C: IntoCallbackLabel>(
     }
 
     let res = handler_ctxt.call::<C>(
-        &script_id,
+        &Handle::Weak(*script_id),
         Entity::from_raw(0),
         vec![],
         guard.clone(),
@@ -505,14 +505,15 @@ pub fn run_plugin_script_load_benchmark<
             || {
                 let mut rng = RNG.lock().unwrap();
                 let is_reload = rng.random_range(0f32..=1f32) < reload_probability;
-                let random_id = if is_reload { 0 } else { rng.random::<u64>() };
+                let random_id = if is_reload { 0 } else { rng.random::<u128>() };
 
-                let random_script_id = script_id_generator(random_id);
+                // let random_script_id = script_id_generator(random_id);
+                let random_script_id: ScriptId = ScriptId::from(uuid::Builder::from_random_bytes(random_id.to_le_bytes()).into_uuid());
                 // we manually load the script inside a command
                 let content = content.to_string().into_boxed_str();
                 (
                     CreateOrUpdateScript::<P>::new(
-                        random_script_id,
+                        Handle::Weak(random_script_id),
                         content.clone().into(),
                         None,
                     ),

tests/script_tests.rs

@@ -4,7 +4,9 @@ use std::path::PathBuf;
 
 use libtest_mimic::{Arguments, Failed, Trial};
 use script_integration_test_harness::{
-    execute_lua_integration_test, execute_rhai_integration_test,
+    execute_lua_integration_test,
+    #[cfg(feature = "rhai")]
+    execute_rhai_integration_test,
 };
 
 use test_utils::{discover_all_tests, Test, TestKind};
@@ -20,7 +22,13 @@ impl TestExecutor for Test {
 
         match self.kind {
             TestKind::Lua => execute_lua_integration_test(&self.path.to_string_lossy())?,
-            TestKind::Rhai => execute_rhai_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")
+            },
+
         }
 
         Ok(())