[Fix(test)] fix test_func_basic

Signed-off-by: csh <[email protected]>
second-state · May 19, 2024 · 12c26e4 · 12c26e4
1 parent 484530d
commit 12c26e4
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 11 deletions.
diff --git a/crates/wasmedge-sys/src/async/function.rs b/crates/wasmedge-sys/src/async/function.rs
@@ -132,7 +132,10 @@ impl AsMut<Function> for AsyncFunction {
 mod tests {
     use super::*;
     use crate::{
-        instance::function::AsFunc, r#async::fiber::AsyncState, types::WasmValue, Executor,
+        instance::function::AsFunc,
+        r#async::{fiber::AsyncState, module::AsyncImportObject},
+        types::WasmValue,
+        AsInstance, Executor,
     };
 
     use wasmedge_types::{error::CoreExecutionError, FuncType, ValType};
@@ -147,7 +150,7 @@ mod tests {
             _s: Vec<S>,
         }
 
-        let mut data: Data<i32, &str> = Data {
+        let data: Data<i32, &str> = Data {
             _x: 12,
             _y: "hello".to_string(),
             _v: vec![1, 2, 3],
@@ -189,13 +192,19 @@ mod tests {
             })
         }
 
+        let mut import_module = AsyncImportObject::create("test_module", Box::new(data)).unwrap();
+
         // create a FuncType
         let func_ty = FuncType::new(vec![ValType::I32; 2], vec![ValType::I32]);
         // create a host function
-        let result =
-            AsyncFunction::create_async_func(&func_ty, real_add::<Data<i32, &str>>, &mut data, 0);
+        let result = AsyncFunction::create_async_func(
+            &func_ty,
+            real_add::<Data<i32, &str>>,
+            import_module.get_host_data_mut(),
+            0,
+        );
         assert!(result.is_ok());
-        let mut host_func = result.unwrap();
+        let host_func = result.unwrap();
 
         // get func type
         let result = host_func.ty();
@@ -210,17 +219,21 @@ mod tests {
         assert_eq!(ty.returns_len(), 1);
         assert_eq!(ty.returns(), &[ValType::I32]);
 
+        import_module.add_async_func("add", host_func);
+
         // run this function
         let result = Executor::create(None, None);
         assert!(result.is_ok());
         let mut executor = result.unwrap();
 
+        let mut add_func = import_module.get_func_mut("add").unwrap();
+
         let async_state = AsyncState::new();
 
         let result = executor
             .call_func_async(
                 &async_state,
-                host_func.as_mut(),
+                &mut add_func,
                 vec![WasmValue::from_i32(1), WasmValue::from_i32(2)],
             )
             .await;

diff --git a/crates/wasmedge-sys/src/instance/function.rs b/crates/wasmedge-sys/src/instance/function.rs
@@ -370,7 +370,7 @@ unsafe impl Sync for InnerFuncType {}
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{types::WasmValue, Executor};
+    use crate::{types::WasmValue, AsInstance, Executor, ImportModule};
 
     use wasmedge_types::{error::CoreExecutionError, FuncType, ValType};
 
@@ -441,7 +441,7 @@ mod tests {
             _s: Vec<S>,
         }
 
-        let mut data: Data<i32, &str> = Data {
+        let data: Data<i32, &str> = Data {
             _x: 12,
             _y: "hello".to_string(),
             _v: vec![1, 2, 3],
@@ -479,14 +479,21 @@ mod tests {
             Ok(vec![WasmValue::from_i32(c)])
         }
 
+        let mut import_module = ImportModule::create("test_module", Box::new(data)).unwrap();
+
         // create a FuncType
         let func_ty = FuncType::new(vec![ValType::I32; 2], vec![ValType::I32]);
         // create a host function
         let result = unsafe {
-            Function::create_sync_func(&func_ty, real_add::<Data<i32, &str>>, &mut data, 0)
+            Function::create_sync_func(
+                &func_ty,
+                real_add::<Data<i32, &str>>,
+                import_module.get_host_data_mut(),
+                0,
+            )
         };
         assert!(result.is_ok());
-        let mut host_func = result.unwrap();
+        let host_func = result.unwrap();
 
         // get func type
         let result = host_func.ty();
@@ -501,13 +508,17 @@ mod tests {
         assert_eq!(ty.returns_len(), 1);
         assert_eq!(ty.returns(), &[ValType::I32]);
 
+        import_module.add_func("add", host_func);
+
         // run this function
         let result = Executor::create(None, None);
         assert!(result.is_ok());
         let mut executor = result.unwrap();
 
+        let mut add_func = import_module.get_func_mut("add").unwrap();
+
         let result = executor.call_func(
-            &mut host_func,
+            &mut add_func,
             vec![WasmValue::from_i32(1), WasmValue::from_i32(2)],
         );