system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-15 12:23:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

AK: Rename error() to has_error() for streams.

Browse source
This commit is contained in:
asynts 2020-08-12 11:44:57 +02:00 committed by Andreas Kling
parent 6d15318560
commit bc332aca33
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AK/Stream.h
View file

@ -37,10 +37,10 @@ class Stream {
public: public:
virtual ~Stream() 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); } bool handle_error() { return exchange(m_error, false); }

18
AK/Tests/TestStream.cpp
View file

@ -48,7 +48,7 @@ TEST_CASE(read_an_integer)
InputMemoryStream stream { { &expected, sizeof(expected) } }; InputMemoryStream stream { { &expected, sizeof(expected) } };
stream >> actual; stream >> actual;
EXPECT(!stream.error() && stream.eof()); EXPECT(!stream.has_error() && stream.eof());
EXPECT_EQ(expected, actual); EXPECT_EQ(expected, actual);
} }
@ -59,15 +59,15 @@ TEST_CASE(recoverable_error)
InputMemoryStream stream { { &expected, sizeof(expected) } }; InputMemoryStream stream { { &expected, sizeof(expected) } };
EXPECT(!stream.error() && !stream.eof()); EXPECT(!stream.has_error() && !stream.eof());
stream >> to_large_value; stream >> to_large_value;
EXPECT(stream.error() && !stream.eof()); EXPECT(stream.has_error() && !stream.eof());
EXPECT(stream.handle_error()); EXPECT(stream.handle_error());
EXPECT(!stream.error() && !stream.eof()); EXPECT(!stream.has_error() && !stream.eof());
stream >> actual; stream >> actual;
EXPECT(!stream.error() && stream.eof()); EXPECT(!stream.has_error() && stream.eof());
EXPECT_EQ(expected, actual); EXPECT_EQ(expected, actual);
} }
@ -78,7 +78,7 @@ TEST_CASE(chain_stream_operator)
InputMemoryStream stream { { expected, sizeof(expected) } }; InputMemoryStream stream { { expected, sizeof(expected) } };
stream >> actual[0] >> actual[1] >> actual[2] >> actual[3]; 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) })); EXPECT(compare({ expected, sizeof(expected) }, { actual, sizeof(actual) }));
} }
@ -94,17 +94,17 @@ TEST_CASE(seeking_slicing_offset)
InputMemoryStream stream { { input, sizeof(input) } }; InputMemoryStream stream { { input, sizeof(input) } };
stream >> Bytes { actual0, sizeof(actual0) }; stream >> Bytes { actual0, sizeof(actual0) };
EXPECT(!stream.error() && !stream.eof()); EXPECT(!stream.has_error() && !stream.eof());
EXPECT(compare({ expected0, sizeof(expected0) }, { actual0, sizeof(actual0) })); EXPECT(compare({ expected0, sizeof(expected0) }, { actual0, sizeof(actual0) }));
stream.seek(4); stream.seek(4);
stream >> Bytes { actual1, sizeof(actual1) }; stream >> Bytes { actual1, sizeof(actual1) };
EXPECT(!stream.error() && stream.eof()); EXPECT(!stream.has_error() && stream.eof());
EXPECT(compare({ expected1, sizeof(expected1) }, { actual1, sizeof(actual1) })); EXPECT(compare({ expected1, sizeof(expected1) }, { actual1, sizeof(actual1) }));
stream.seek(1); stream.seek(1);
stream >> Bytes { actual2, sizeof(actual2) }; stream >> Bytes { actual2, sizeof(actual2) };
EXPECT(!stream.error() && !stream.eof()); EXPECT(!stream.has_error() && !stream.eof());
EXPECT(compare({ expected2, sizeof(expected2) }, { actual2, sizeof(actual2) })); EXPECT(compare({ expected2, sizeof(expected2) }, { actual2, sizeof(actual2) }));
} }