From 7ff99c397219abe2354971c847efe7052b0558ca Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 10 Mar 2022 16:20:40 +0000 Subject: Tests: Port test-wasm to Core::Stream --- Tests/LibWasm/test-wasm.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'Tests') diff --git a/Tests/LibWasm/test-wasm.cpp b/Tests/LibWasm/test-wasm.cpp index 926ddfdabe..f6e14a7d9e 100644 --- a/Tests/LibWasm/test-wasm.cpp +++ b/Tests/LibWasm/test-wasm.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include #include @@ -15,12 +15,20 @@ TEST_ROOT("Userland/Libraries/LibWasm/Tests"); TESTJS_GLOBAL_FUNCTION(read_binary_wasm_file, readBinaryWasmFile) { auto filename = TRY(vm.argument(0).to_string(global_object)); - auto file = Core::File::open(filename, Core::OpenMode::ReadOnly); + auto file = Core::Stream::File::open(filename, Core::Stream::OpenMode::Read); if (file.is_error()) return vm.throw_completion(global_object, strerror(file.error().code())); - auto contents = file.value()->read_all(); - auto* array = TRY(JS::Uint8Array::create(global_object, contents.size())); - contents.span().copy_to(array->data()); + + auto file_size = file.value()->size(); + if (file_size.is_error()) + return vm.throw_completion(global_object, strerror(file_size.error().code())); + + auto* array = TRY(JS::Uint8Array::create(global_object, file_size.value())); + + auto read = file.value()->read(array->data()); + if (read.is_error()) + return vm.throw_completion(global_object, strerror(read.error().code())); + return JS::Value(array); } -- cgit v1.2.3