diff --git a/test/embind/test_i64_val.cpp b/test/embind/test_i64_val.cpp index af5d09cf7e794..1b33256b7814c 100644 --- a/test/embind/test_i64_val.cpp +++ b/test/embind/test_i64_val.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -14,34 +13,14 @@ using namespace emscripten; using namespace std; -void fail() -{ - cout << "fail\n"; -} - -void pass() -{ - cout << "pass\n"; -} - -void test(string message) -{ +void test(string message) { cout << "test:\n" << message << "\n"; } -void ensure(bool value) -{ - if (value) - pass(); - else - fail(); -} - -void ensure_js(string js_code) -{ +void ensure_js(string js_code) { js_code.append(";"); const char* js_code_pointer = js_code.c_str(); - ensure(EM_ASM_INT({ + assert(EM_ASM_INT({ var js_code = UTF8ToString($0); return eval(js_code); }, js_code_pointer)); @@ -54,8 +33,7 @@ string compare_a_64_js(T value) { return ss.str(); } -int main() -{ +int main() { const int64_t max_int64_t = numeric_limits::max(); const int64_t min_int64_t = numeric_limits::min(); const uint64_t max_uint64_t = numeric_limits::max(); @@ -73,7 +51,7 @@ int main() val::global().set("a", val(int64_t(0x12345678aabbccddL))); ensure_js("a === 1311768467732155613n"); - ensure(val::global()["a"].as() == 0x12345678aabbccddL); + assert(val::global()["a"].as() == 0x12345678aabbccddL); test("val(uint64_t v)"); val::global().set("a", val(uint64_t(1234))); @@ -81,16 +59,16 @@ int main() val::global().set("a", val(max_uint64_t)); ensure_js(compare_a_64_js(max_uint64_t)); - ensure(val::global()["a"].as() == max_uint64_t); + assert(val::global()["a"].as() == max_uint64_t); test("val(int64_t v)"); val::global().set("a", val(max_int64_t)); ensure_js(compare_a_64_js(max_int64_t)); - ensure(val::global()["a"].as() == max_int64_t); + assert(val::global()["a"].as() == max_int64_t); val::global().set("a", val(min_int64_t)); ensure_js(compare_a_64_js(min_int64_t)); - ensure(val::global()["a"].as() == min_int64_t); + assert(val::global()["a"].as() == min_int64_t); test("val(typed_memory_view)"); val::global().set("a", val(typed_memory_view(uint64Array.size(), uint64Array.data()))); diff --git a/test/embind/test_i64_val.out b/test/embind/test_i64_val.out index 19196845e8236..e5b21f95d91d7 100644 --- a/test/embind/test_i64_val.out +++ b/test/embind/test_i64_val.out @@ -1,31 +1,12 @@ start test: val(int64_t v) -pass -pass -pass -pass test: val(uint64_t v) -pass -pass -pass test: val(int64_t v) -pass -pass -pass -pass test: val(typed_memory_view) -pass -pass -pass -pass test: val(typed_memory_view) -pass -pass -pass -pass end