From ab4de3f86d35d6cf6419eceb9077ba07a130d95f Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Fri, 6 Nov 2020 09:40:32 +0100 Subject: [PATCH] test(c-api) Use `wasmer_assert` rather than `assert`. --- lib/c-api/src/wasm_c_api/module.rs | 84 +++++++++++++++--------------- lib/c-api/src/wasm_c_api/wat.rs | 10 ++-- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/lib/c-api/src/wasm_c_api/module.rs b/lib/c-api/src/wasm_c_api/module.rs index 5354c0671..9502afffa 100644 --- a/lib/c-api/src/wasm_c_api/module.rs +++ b/lib/c-api/src/wasm_c_api/module.rs @@ -133,7 +133,7 @@ mod tests { wasm_byte_vec_new_from_string(&wat, "(module)"); wasm_byte_vec_t* wasm = wat2wasm(&wat); - assert(wasm_module_validate(store, wasm)); + wasmer_assert(wasm_module_validate(store, wasm)); wasm_byte_vec_delete(wasm); wasm_store_delete(store); @@ -160,7 +160,7 @@ mod tests { wasm_module_t* module = wasm_module_new(store, wasm); - assert(module); + wasmer_assert(module); wasm_byte_vec_delete(wasm); wasm_module_delete(module); @@ -177,7 +177,7 @@ mod tests { #include "tests/wasmer_wasm.h" void assert_exporttype_name(const wasm_exporttype_t* exporttype, const char* expected) { - assert(strncmp(wasm_exporttype_name(exporttype)->data, expected, strlen(expected)) == 0); + wasmer_assert(strncmp(wasm_exporttype_name(exporttype)->data, expected, strlen(expected)) == 0); } int main() { @@ -197,30 +197,30 @@ mod tests { wasm_module_t* module = wasm_module_new(store, wasm); - assert(module); + wasmer_assert(module); wasm_exporttype_vec_t export_types; wasm_module_exports(module, &export_types); - assert(export_types.size == 4); + wasmer_assert(export_types.size == 4); { wasm_exporttype_t* export_type = export_types.data[0]; assert_exporttype_name(export_type, "function"); const wasm_externtype_t* extern_type = wasm_exporttype_type(export_type); - assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_FUNC); + wasmer_assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_FUNC); wasm_functype_t* func_type = wasm_externtype_as_functype((wasm_externtype_t*) extern_type); const wasm_valtype_vec_t* func_params = wasm_functype_params(func_type); - assert(func_params->size == 2); - assert(wasm_valtype_kind(func_params->data[0]) == WASM_I32); - assert(wasm_valtype_kind(func_params->data[1]) == WASM_I64); + wasmer_assert(func_params->size == 2); + wasmer_assert(wasm_valtype_kind(func_params->data[0]) == WASM_I32); + wasmer_assert(wasm_valtype_kind(func_params->data[1]) == WASM_I64); wasm_valtype_vec_delete((wasm_valtype_vec_t*) func_params); const wasm_valtype_vec_t* func_results = wasm_functype_results(func_type); - assert(func_results->size == 0); + wasmer_assert(func_results->size == 0); wasm_valtype_vec_delete((wasm_valtype_vec_t*) func_results); } @@ -229,11 +229,11 @@ mod tests { assert_exporttype_name(export_type, "global"); const wasm_externtype_t* extern_type = wasm_exporttype_type(export_type); - assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_GLOBAL); + wasmer_assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_GLOBAL); wasm_globaltype_t* global_type = wasm_externtype_as_globaltype((wasm_externtype_t*) extern_type); - assert(wasm_valtype_kind(wasm_globaltype_content(global_type)) == WASM_I32); - assert(wasm_globaltype_mutability(global_type) == WASM_CONST); + wasmer_assert(wasm_valtype_kind(wasm_globaltype_content(global_type)) == WASM_I32); + wasmer_assert(wasm_globaltype_mutability(global_type) == WASM_CONST); } { @@ -241,14 +241,14 @@ mod tests { assert_exporttype_name(export_type, "table"); const wasm_externtype_t* extern_type = wasm_exporttype_type(export_type); - assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_TABLE); + wasmer_assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_TABLE); wasm_tabletype_t* table_type = wasm_externtype_as_tabletype((wasm_externtype_t*) extern_type); - assert(wasm_valtype_kind(wasm_tabletype_element(table_type)) == WASM_FUNCREF); + wasmer_assert(wasm_valtype_kind(wasm_tabletype_element(table_type)) == WASM_FUNCREF); const wasm_limits_t* table_limits = wasm_tabletype_limits(table_type); - assert(table_limits->min == 0); - assert(table_limits->max == wasm_limits_max_default); + wasmer_assert(table_limits->min == 0); + wasmer_assert(table_limits->max == wasm_limits_max_default); } { @@ -256,12 +256,12 @@ mod tests { assert_exporttype_name(export_type, "memory"); const wasm_externtype_t* extern_type = wasm_exporttype_type(export_type); - assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_MEMORY); + wasmer_assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_MEMORY); wasm_memorytype_t* memory_type = wasm_externtype_as_memorytype((wasm_externtype_t*) extern_type); const wasm_limits_t* memory_limits = wasm_memorytype_limits(memory_type); - assert(memory_limits->min == 1); - assert(memory_limits->max == wasm_limits_max_default); + wasmer_assert(memory_limits->min == 1); + wasmer_assert(memory_limits->max == wasm_limits_max_default); } wasm_exporttype_vec_delete(&export_types); @@ -280,7 +280,7 @@ mod tests { #include "tests/wasmer_wasm.h" void assert_importtype_name(const wasm_name_t* name, const char* expected) { - assert(strncmp(name->data, expected, strlen(expected)) == 0); + wasmer_assert(strncmp(name->data, expected, strlen(expected)) == 0); } int main() { @@ -299,12 +299,12 @@ mod tests { wasm_byte_vec_t* wasm = wat2wasm(&wat); wasm_module_t* module = wasm_module_new(store, wasm); - assert(module); + wasmer_assert(module); wasm_importtype_vec_t import_types; wasm_module_imports(module, &import_types); - assert(import_types.size == 4); + wasmer_assert(import_types.size == 4); { const wasm_importtype_t* import_type = import_types.data[0]; @@ -316,16 +316,16 @@ mod tests { assert_importtype_name(import_name, "function"); const wasm_externtype_t* extern_type = wasm_importtype_type(import_type); - assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_FUNC); + wasmer_assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_FUNC); wasm_functype_t* func_type = wasm_externtype_as_functype((wasm_externtype_t*) extern_type); const wasm_valtype_vec_t* func_params = wasm_functype_params(func_type); - assert(func_params->size == 0); + wasmer_assert(func_params->size == 0); wasm_valtype_vec_delete((wasm_valtype_vec_t*) func_params); const wasm_valtype_vec_t* func_results = wasm_functype_results(func_type); - assert(func_results->size == 0); + wasmer_assert(func_results->size == 0); wasm_valtype_vec_delete((wasm_valtype_vec_t*) func_results); } @@ -339,11 +339,11 @@ mod tests { assert_importtype_name(import_name, "global"); const wasm_externtype_t* extern_type = wasm_importtype_type(import_type); - assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_GLOBAL); + wasmer_assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_GLOBAL); wasm_globaltype_t* global_type = wasm_externtype_as_globaltype((wasm_externtype_t*) extern_type); - assert(wasm_valtype_kind(wasm_globaltype_content(global_type)) == WASM_F32); - assert(wasm_globaltype_mutability(global_type) == WASM_CONST); + wasmer_assert(wasm_valtype_kind(wasm_globaltype_content(global_type)) == WASM_F32); + wasmer_assert(wasm_globaltype_mutability(global_type) == WASM_CONST); } { @@ -356,14 +356,14 @@ mod tests { assert_importtype_name(import_name, "table"); const wasm_externtype_t* extern_type = wasm_importtype_type(import_type); - assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_TABLE); + wasmer_assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_TABLE); wasm_tabletype_t* table_type = wasm_externtype_as_tabletype((wasm_externtype_t*) extern_type); - assert(wasm_valtype_kind(wasm_tabletype_element(table_type)) == WASM_FUNCREF); + wasmer_assert(wasm_valtype_kind(wasm_tabletype_element(table_type)) == WASM_FUNCREF); const wasm_limits_t* table_limits = wasm_tabletype_limits(table_type); - assert(table_limits->min == 1); - assert(table_limits->max == 2); + wasmer_assert(table_limits->min == 1); + wasmer_assert(table_limits->max == 2); } { @@ -376,12 +376,12 @@ mod tests { assert_importtype_name(import_name, "memory"); const wasm_externtype_t* extern_type = wasm_importtype_type(import_type); - assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_MEMORY); + wasmer_assert(wasm_externtype_kind(extern_type) == WASM_EXTERN_MEMORY); wasm_memorytype_t* memory_type = wasm_externtype_as_memorytype((wasm_externtype_t*) extern_type); const wasm_limits_t* memory_limits = wasm_memorytype_limits(memory_type); - assert(memory_limits->min == 3); - assert(memory_limits->max == 4); + wasmer_assert(memory_limits->min == 3); + wasmer_assert(memory_limits->max == 4); } wasm_importtype_vec_delete(&import_types); @@ -408,11 +408,11 @@ mod tests { wasm_byte_vec_t* wasm = wat2wasm(&wat); wasm_module_t* module = wasm_module_new(store, wasm); - assert(module); + wasmer_assert(module); wasm_byte_vec_t serialized_module; wasm_module_serialize(module, &serialized_module); - assert(serialized_module.size > 0); + wasmer_assert(serialized_module.size > 0); wasm_module_delete(module); wasm_byte_vec_delete(&serialized_module); @@ -445,11 +445,11 @@ mod tests { wasm_byte_vec_t* wasm = wat2wasm(&wat); wasm_module_t* module = wasm_module_new(store, wasm); - assert(module); + wasmer_assert(module); wasm_byte_vec_t serialized_module; wasm_module_serialize(module, &serialized_module); - assert(serialized_module.size > 0); + wasmer_assert(serialized_module.size > 0); wasm_module_delete(module); wasm_module_t* deserialized_module = wasm_module_deserialize( @@ -457,12 +457,12 @@ mod tests { &serialized_module ); wasm_byte_vec_delete(&serialized_module); - assert(deserialized_module); + wasmer_assert(deserialized_module); wasm_exporttype_vec_t export_types; wasm_module_exports(deserialized_module, &export_types); - assert(export_types.size == 4); + wasmer_assert(export_types.size == 4); wasm_exporttype_vec_delete(&export_types); wasm_module_delete(deserialized_module); diff --git a/lib/c-api/src/wasm_c_api/wat.rs b/lib/c-api/src/wasm_c_api/wat.rs index 6c53e6596..78b726a99 100644 --- a/lib/c-api/src/wasm_c_api/wat.rs +++ b/lib/c-api/src/wasm_c_api/wat.rs @@ -32,9 +32,9 @@ mod tests { }; wasm_byte_vec_t* wasm = wat2wasm(&wat); - assert(wasm); - assert(wasm->size == 8); - assert( + wasmer_assert(wasm); + wasmer_assert(wasm->size == 8); + wasmer_assert( wasm->data[0] == 0 && wasm->data[1] == 'a' && wasm->data[2] == 's' && @@ -70,8 +70,8 @@ mod tests { }; wasm_byte_vec_t* wasm = wat2wasm(&wat); - assert(!wasm); - assert(wasmer_last_error_length() > 0); + wasmer_assert(!wasm); + wasmer_assert(wasmer_last_error_length() > 0); wasm_store_delete(store); wasm_engine_delete(engine);