BIND 10 trac813, updated. 25bc145bb597683411ece6ad7cb72fc0fabedeae [trac813] Typos & style fixes

[BIND 10 source code commits]

The branch, trac813 has been updated
       via  25bc145bb597683411ece6ad7cb72fc0fabedeae (commit)
      from  4a2c0e7a8852496e9b8f9a56f5058cb1f55d3f55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 25bc145bb597683411ece6ad7cb72fc0fabedeae
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed May 4 11:48:35 2011 +0200

    [trac813] Typos & style fixes

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dns/tests/testdata/message_toText1.spec |    2 +-
 src/lib/dns/tests/testdata/message_toText2.spec |    2 +-
 src/lib/dns/tests/testdata/message_toText3.spec |    2 +-
 src/lib/dns/tests/tsigrecord_unittest.cc        |    2 +-
 src/lib/dns/tsigrecord.h                        |    4 ++--
 src/lib/util/unittests/textdata.h               |    6 ++----
 6 files changed, 8 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/tests/testdata/message_toText1.spec b/src/lib/dns/tests/testdata/message_toText1.spec
index c5912c4..b31310e 100644
--- a/src/lib/dns/tests/testdata/message_toText1.spec
+++ b/src/lib/dns/tests/testdata/message_toText1.spec
@@ -1,5 +1,5 @@
 #
-# A standard DNS message (taken from an invokation of dig)
+# A standard DNS message (taken from an invocation of dig)
 #
 
 [custom]
diff --git a/src/lib/dns/tests/testdata/message_toText2.spec b/src/lib/dns/tests/testdata/message_toText2.spec
index ddbf251..978aab3 100644
--- a/src/lib/dns/tests/testdata/message_toText2.spec
+++ b/src/lib/dns/tests/testdata/message_toText2.spec
@@ -1,5 +1,5 @@
 #
-# 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]
diff --git a/src/lib/dns/tests/testdata/message_toText3.spec b/src/lib/dns/tests/testdata/message_toText3.spec
index 0c6d21a..a74ea1b 100644
--- a/src/lib/dns/tests/testdata/message_toText3.spec
+++ b/src/lib/dns/tests/testdata/message_toText3.spec
@@ -1,5 +1,5 @@
 #
-# 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]
diff --git a/src/lib/dns/tests/tsigrecord_unittest.cc b/src/lib/dns/tests/tsigrecord_unittest.cc
index b901ad3..e4e7599 100644
--- a/src/lib/dns/tests/tsigrecord_unittest.cc
+++ b/src/lib/dns/tests/tsigrecord_unittest.cc
@@ -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".
diff --git a/src/lib/dns/tsigrecord.h b/src/lib/dns/tsigrecord.h
index 165e407..e42edf1 100644
--- a/src/lib/dns/tsigrecord.h
+++ b/src/lib/dns/tsigrecord.h
@@ -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,
diff --git a/src/lib/util/unittests/textdata.h b/src/lib/util/unittests/textdata.h
index c1e0685..3e9b1aa 100644
--- a/src/lib/util/unittests/textdata.h
+++ b/src/lib/util/unittests/textdata.h
@@ -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;
     }
 }