BIND 10 trac3087, updated. 33a7569f381acf79c29b57a20329a8ed94319aa1 [3087] Minor review corrections.

[BIND 10 source code commits]

The branch, trac3087 has been updated
       via  33a7569f381acf79c29b57a20329a8ed94319aa1 (commit)
      from  4c74dff22bd0cd130120d98847c16152ddf39bc6 (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 33a7569f381acf79c29b57a20329a8ed94319aa1
Author: Thomas Markwalder <tmark at isc.org>
Date:   Tue Dec 3 10:48:10 2013 -0500

    [3087] Minor review corrections.
    
    Fixed a typo and added a bit more diagnostic output to two unit tests.

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

Summary of changes:
 src/bin/d2/nc_add.h                  |    8 ++++----
 src/bin/d2/tests/nc_add_unittests.cc |   33 +++++++++++++++++++++++----------
 2 files changed, 27 insertions(+), 14 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/d2/nc_add.h b/src/bin/d2/nc_add.h
index 7dc654e..ce8a1c5 100644
--- a/src/bin/d2/nc_add.h
+++ b/src/bin/d2/nc_add.h
@@ -135,10 +135,10 @@ protected:
     /// - INIT_ST with next event of START_EVT
     ///
     /// The READY_ST is the state the model transitions into when the inherited
-    /// method, startTransaction() is invoked.  This handler, therefore, as the
-    /// is the entry point into the state model execution.h  Its primary task
-    /// is to determine whether to start with a forward DNS change or a
-    /// reverse DNS change.
+    /// method, startTransaction() is invoked.  This handler, therefore, is the
+    /// entry point into the state model execution.h  Its primary task is to
+    /// determine whether to start with a forward DNS change or a reverse DNS
+    /// change.
     ///
     /// Transitions to:
     /// - SELECTING_FWD_SERVER_ST with next event of SERVER_SELECT_ST if request
diff --git a/src/bin/d2/tests/nc_add_unittests.cc b/src/bin/d2/tests/nc_add_unittests.cc
index 15b5ad8..8d28cc3 100644
--- a/src/bin/d2/tests/nc_add_unittests.cc
+++ b/src/bin/d2/tests/nc_add_unittests.cc
@@ -353,21 +353,27 @@ TEST_F(NameAddTransactionTest, selectingFwdServerHandler) {
     for (int i = 0; i < num_servers; ++i) {
         // Run selectingFwdServerHandler.
         ASSERT_NO_THROW(name_add->selectingFwdServerHandler())
-              << " num_servers: " << num_servers << " selections: " << i;
+                        << " num_servers: " << num_servers
+                        << " selections: " << i;
 
         // Verify that a server was selected.
-        ASSERT_TRUE(name_add->getCurrentServer());
+        ASSERT_TRUE(name_add->getCurrentServer())
+                    << " num_servers: " << num_servers << " selections: " << i;
 
         // Verify that we transitioned correctly.
         ASSERT_EQ(NameAddTransaction::ADDING_FWD_ADDRS_ST,
-              name_add->getCurrState());
+                  name_add->getCurrState())
+                  << " num_servers: " << num_servers << " selections: " << i;
         ASSERT_EQ(NameChangeTransaction::SERVER_SELECTED_EVT,
-              name_add->getNextEvent());
+                  name_add->getNextEvent())
+                  << " num_servers: " << num_servers << " selections: " << i;
 
         // Post a server IO error event.  This simulates an IO error occuring
         // and a need to select the new server.
         ASSERT_NO_THROW(name_add->postNextEvent(NameChangeTransaction::
-                                                SERVER_IO_ERROR_EVT));
+                                                SERVER_IO_ERROR_EVT))
+                        << " num_servers: " << num_servers
+                        << " selections: " << i;
     }
 
     // We should have exhausted the list of servers. Processing another
@@ -1082,21 +1088,28 @@ TEST_F(NameAddTransactionTest, selectingRevServerHandler) {
     for (int i = 0; i < num_servers; ++i) {
         // Run selectingRevServerHandler.
         ASSERT_NO_THROW(name_add->selectingRevServerHandler())
-              << " num_servers: " << num_servers << " selections: " << i;
+                        << " num_servers: " << num_servers
+                        << " selections: " << i;
 
         // Verify that a server was selected.
-        ASSERT_TRUE(name_add->getCurrentServer());
+        ASSERT_TRUE(name_add->getCurrentServer())
+                    << " num_servers: " << num_servers
+                    << " selections: " << i;
 
         // Verify that we transitioned correctly.
         ASSERT_EQ(NameAddTransaction::REPLACING_REV_PTRS_ST,
-                  name_add->getCurrState());
+                  name_add->getCurrState())
+                  << " num_servers: " << num_servers << " selections: " << i;
         ASSERT_EQ(NameChangeTransaction::SERVER_SELECTED_EVT,
-                  name_add->getNextEvent());
+                  name_add->getNextEvent())
+                  << " num_servers: " << num_servers << " selections: " << i;
 
         // Post a server IO error event.  This simulates an IO error occuring
         // and a need to select the new server.
         ASSERT_NO_THROW(name_add->postNextEvent(NameChangeTransaction::
-                                                SERVER_IO_ERROR_EVT));
+                                                SERVER_IO_ERROR_EVT))
+                        << " num_servers: " << num_servers
+                        << " selections: " << i;
     }
 
     // We should have exhausted the list of servers. Processing another