diff options
author | Sam Atkins <atkinssj@serenityos.org> | 2022-04-15 14:52:33 +0100 |
---|---|---|
committer | Tim Flynn <trflynn89@pm.me> | 2022-04-16 13:27:51 -0400 |
commit | d564cf1e8970275a52a1ef43debe4b1d14b2c063 (patch) | |
tree | dca303a1d92a9cfbe86912edb59fb902b3a74576 /Tests | |
parent | c4134e97944538f34a5881954fb55431ea9da587 (diff) | |
download | serenity-d564cf1e8970275a52a1ef43debe4b1d14b2c063.zip |
LibCore+Everywhere: Make Core::Stream read_line() return StringView
Similar reasoning to making Core::Stream::read() return Bytes, except
that every user of read_line() creates a StringView from the result, so
let's just return one right away.
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/LibCore/TestLibCoreStream.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Tests/LibCore/TestLibCoreStream.cpp b/Tests/LibCore/TestLibCoreStream.cpp index b8a47283d0..fcb326cc14 100644 --- a/Tests/LibCore/TestLibCoreStream.cpp +++ b/Tests/LibCore/TestLibCoreStream.cpp @@ -426,15 +426,15 @@ TEST_CASE(buffered_long_file_read) auto buffer = ByteBuffer::create_uninitialized(4096).release_value(); EXPECT(!file->seek(255, Core::Stream::SeekMode::SetPosition).is_error()); EXPECT(file->can_read_line().release_value()); - auto maybe_nread = file->read_line(buffer); - EXPECT(!maybe_nread.is_error()); - EXPECT_EQ(maybe_nread.value(), 4095ul); // 4095 bytes on the third line + auto maybe_line = file->read_line(buffer); + EXPECT(!maybe_line.is_error()); + EXPECT_EQ(maybe_line.value().length(), 4095ul); // 4095 bytes on the third line // Testing that buffering with seeking works properly EXPECT(!file->seek(365, Core::Stream::SeekMode::SetPosition).is_error()); - auto maybe_after_seek_nread = file->read_line(buffer); - EXPECT(!maybe_after_seek_nread.is_error()); - EXPECT_EQ(maybe_after_seek_nread.value(), 3985ul); // 4095 - 110 + auto maybe_after_seek_line = file->read_line(buffer); + EXPECT(!maybe_after_seek_line.is_error()); + EXPECT_EQ(maybe_after_seek_line.value().length(), 3985ul); // 4095 - 110 } TEST_CASE(buffered_small_file_read) @@ -456,10 +456,10 @@ TEST_CASE(buffered_small_file_read) auto buffer = ByteBuffer::create_uninitialized(4096).release_value(); for (auto const& line : expected_lines) { VERIFY(file->can_read_line().release_value()); - auto maybe_nread = file->read_line(buffer); - EXPECT(!maybe_nread.is_error()); - EXPECT_EQ(maybe_nread.value(), line.length()); - EXPECT_EQ(StringView(buffer.span().trim(maybe_nread.value())), line); + auto maybe_read_line = file->read_line(buffer); + EXPECT(!maybe_read_line.is_error()); + EXPECT_EQ(maybe_read_line.value().length(), line.length()); + EXPECT_EQ(StringView(buffer.span().trim(maybe_read_line.value().length())), line); } EXPECT(!file->can_read_line().is_error()); EXPECT(!file->can_read_line().value()); @@ -496,13 +496,13 @@ TEST_CASE(buffered_tcp_socket_read) auto receive_buffer = ByteBuffer::create_uninitialized(64).release_value(); - auto maybe_first_nread = client_socket->read_line(receive_buffer); - EXPECT(!maybe_first_nread.is_error()); - StringView first_received_line { receive_buffer.data(), maybe_first_nread.value() }; + auto maybe_first_received_line = client_socket->read_line(receive_buffer); + EXPECT(!maybe_first_received_line.is_error()); + auto first_received_line = maybe_first_received_line.value(); EXPECT_EQ(first_received_line, first_line); - auto maybe_second_nread = client_socket->read_line(receive_buffer); - EXPECT(!maybe_second_nread.is_error()); - StringView second_received_line { receive_buffer.data(), maybe_second_nread.value() }; + auto maybe_second_received_line = client_socket->read_line(receive_buffer); + EXPECT(!maybe_second_received_line.is_error()); + auto second_received_line = maybe_second_received_line.value(); EXPECT_EQ(second_received_line, second_line); } |