From bc332aca33feb83d586736534c7f8aa5753527a7 Mon Sep 17 00:00:00 2001 From: asynts Date: Wed, 12 Aug 2020 11:44:57 +0200 Subject: [PATCH] AK: Rename error() to has_error() for streams. --- AK/Stream.h | 4 ++-- AK/Tests/TestStream.cpp | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/AK/Stream.h b/AK/Stream.h index daa0c112272..37d71e1ea42 100644 --- a/AK/Stream.h +++ b/AK/Stream.h @@ -37,10 +37,10 @@ class Stream { public: virtual ~Stream() { - ASSERT(!error()); + ASSERT(!has_error()); } - bool error() const { return m_error; } + bool has_error() const { return m_error; } bool handle_error() { return exchange(m_error, false); } diff --git a/AK/Tests/TestStream.cpp b/AK/Tests/TestStream.cpp index 09cc1ea2596..1032dad5ad2 100644 --- a/AK/Tests/TestStream.cpp +++ b/AK/Tests/TestStream.cpp @@ -48,7 +48,7 @@ TEST_CASE(read_an_integer) InputMemoryStream stream { { &expected, sizeof(expected) } }; stream >> actual; - EXPECT(!stream.error() && stream.eof()); + EXPECT(!stream.has_error() && stream.eof()); EXPECT_EQ(expected, actual); } @@ -59,15 +59,15 @@ TEST_CASE(recoverable_error) InputMemoryStream stream { { &expected, sizeof(expected) } }; - EXPECT(!stream.error() && !stream.eof()); + EXPECT(!stream.has_error() && !stream.eof()); stream >> to_large_value; - EXPECT(stream.error() && !stream.eof()); + EXPECT(stream.has_error() && !stream.eof()); EXPECT(stream.handle_error()); - EXPECT(!stream.error() && !stream.eof()); + EXPECT(!stream.has_error() && !stream.eof()); stream >> actual; - EXPECT(!stream.error() && stream.eof()); + EXPECT(!stream.has_error() && stream.eof()); EXPECT_EQ(expected, actual); } @@ -78,7 +78,7 @@ TEST_CASE(chain_stream_operator) InputMemoryStream stream { { expected, sizeof(expected) } }; stream >> actual[0] >> actual[1] >> actual[2] >> actual[3]; - EXPECT(!stream.error() && stream.eof()); + EXPECT(!stream.has_error() && stream.eof()); EXPECT(compare({ expected, sizeof(expected) }, { actual, sizeof(actual) })); } @@ -94,17 +94,17 @@ TEST_CASE(seeking_slicing_offset) InputMemoryStream stream { { input, sizeof(input) } }; stream >> Bytes { actual0, sizeof(actual0) }; - EXPECT(!stream.error() && !stream.eof()); + EXPECT(!stream.has_error() && !stream.eof()); EXPECT(compare({ expected0, sizeof(expected0) }, { actual0, sizeof(actual0) })); stream.seek(4); stream >> Bytes { actual1, sizeof(actual1) }; - EXPECT(!stream.error() && stream.eof()); + EXPECT(!stream.has_error() && stream.eof()); EXPECT(compare({ expected1, sizeof(expected1) }, { actual1, sizeof(actual1) })); stream.seek(1); stream >> Bytes { actual2, sizeof(actual2) }; - EXPECT(!stream.error() && !stream.eof()); + EXPECT(!stream.has_error() && !stream.eof()); EXPECT(compare({ expected2, sizeof(expected2) }, { actual2, sizeof(actual2) })); }