From aca28f00deba672c02fdb8732f10763e198b1cfc Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 10 Mar 2022 12:27:32 +0000 Subject: [PATCH] Tests: Port test-cpp-preprocessor to Core::Stream --- Tests/LibCpp/test-cpp-preprocessor.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Tests/LibCpp/test-cpp-preprocessor.cpp b/Tests/LibCpp/test-cpp-preprocessor.cpp index be2a0c3e65a..925571ff002 100644 --- a/Tests/LibCpp/test-cpp-preprocessor.cpp +++ b/Tests/LibCpp/test-cpp-preprocessor.cpp @@ -6,22 +6,20 @@ #include #include -#include +#include #include #include -#include -#include -#include -#include constexpr char TESTS_ROOT_DIR[] = "/home/anon/cpp-tests/preprocessor"; -static String read_all(const String& path) +static String read_all(String const& path) { - auto result = Core::File::open(path, Core::OpenMode::ReadOnly); - VERIFY(!result.is_error()); - auto content = result.value()->read_all(); - return { reinterpret_cast(content.data()), content.size() }; + auto file = MUST(Core::Stream::File::open(path, Core::Stream::OpenMode::Read)); + auto file_size = MUST(file->size()); + auto content = MUST(ByteBuffer::create_uninitialized(file_size)); + if (!file->read_or_error(content.bytes())) + VERIFY_NOT_REACHED(); + return String { content.bytes() }; } TEST_CASE(test_regression)