Commit 25bc145b authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

[trac813] Typos & style fixes

parent 4a2c0e7a
#
# A standard DNS message (taken from an invokation of dig)
# A standard DNS message (taken from an invocation of dig)
#
[custom]
......
#
# A standard DNS message with EDNS (taken from an invokation of dig)
# A standard DNS message with EDNS (taken from an invocation of dig)
#
[custom]
......
#
# A standard DNS message with TSIG (taken from an invokation of dig)
# A standard DNS message with TSIG (taken from an invocation of dig)
#
[custom]
......
......@@ -121,7 +121,7 @@ TEST_F(TSIGRecordTest, recordToWire) {
&data[0], data.size());
}
TEST_F(TSIGRecordTest, recordToOLongToWire) {
TEST_F(TSIGRecordTest, recordTooLongToWire) {
// Rendering the test record requires a room of 85 bytes (see the
// getLength test). By setting the limit to 84, it will fail, and
// the renderer will be marked as "truncated".
......
......@@ -77,7 +77,7 @@ public:
///
/// This constructor is intended to be used in the context of parsing
/// an incoming DNS message that contains a TSIG. The parser would
/// first extract the owner name, RR type (which TSIG) class, TTL and
/// first extract the owner name, RR type (which is TSIG) class, TTL and
/// the TSIG RDATA from the message. This constructor is expected to
/// be given these RR parameters (except the RR type, because it must be
/// TSIG).
......@@ -113,7 +113,7 @@ public:
/// the MAC computation must be performed for the original data without
/// TSIG, so, to avoid parsing the entire data in the verify process
/// again, it's necessary to record information that can identify the
/// length to be digested for the MAC. This parameter servers for that
/// length to be digested for the MAC. This parameter serves for that
/// purpose.
///
/// \note Since the constructor doesn't take the wire format data per se,
......
......@@ -45,8 +45,7 @@ matchTextData(EXPECTED_STREAM& expected, ACTUAL_STREAM& actual) {
while (std::getline(actual, actual_line), !actual.eof()) {
std::getline(expected, expected_line);
if (expected.eof()) {
ASSERT_FALSE(true) << "Redundant line in actual output: "
<< actual_line;
FAIL() << "Redundant line in actual output: " << actual_line;
break;
}
if (actual.bad() || actual.fail() ||
......@@ -56,8 +55,7 @@ matchTextData(EXPECTED_STREAM& expected, ACTUAL_STREAM& actual) {
EXPECT_EQ(expected_line, actual_line);
}
while (std::getline(expected, expected_line), !expected.eof()) {
EXPECT_FALSE(true) << "Missing line in actual output: "
<< expected_line;
ADD_FAILURE() << "Missing line in actual output: " << expected_line;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment