[2974] Added missing ServerHooks test

Added test for the getCount() method, and tidied up the documentation
for the ServerHooks class.

diff --git a/src/lib/util/hooks/server_hooks.h b/src/lib/util/hooks/server_hooks.h
index 50b6adc6a27d65b8d4644410e048d64760b1ae61..21f20a74c47fffb1fe594ee99e9db7da3b09d010 100644 (file)
--- a/src/lib/util/hooks/server_hooks.h
+++ b/src/lib/util/hooks/server_hooks.h
@@ -65,7 +65,7 @@ public:
     ///         fails in some way.
     ServerHooks();
 
-    /// @brief Register a Hook
+    /// @brief Register a hook
     ///
     /// Registers a hook and returns the hook index.
     ///
@@ -78,7 +78,7 @@ public:
     ///         registered.
     int registerHook(const std::string& name);
 
-    /// @brief Get Hook Index
+    /// @brief Get hook index
     ///
     /// Returns the index of a hook.
     ///
@@ -88,7 +88,7 @@ public:
     ///         -1 is returned if no hook of the given name is found.
     int getIndex(const std::string& name) const;
 
-    /// @brief Return Number of Hooks
+    /// @brief Return number of hooks
     ///
     /// Returns the total number of hooks registered.
     ///
@@ -97,7 +97,7 @@ public:
         return (hooks_.size());
     }
 
-    /// @brief Hook Names
+    /// @brief Get hook names
     ///
     /// Return list of hooks registered in the object.
     ///

diff --git a/src/lib/util/tests/server_hooks_unittest.cc b/src/lib/util/tests/server_hooks_unittest.cc
index 88e105df4e04327bc62cd7796471b3ed88a5ba9c..dd9ea1b1947d771cdcf3b840a153407ae549f455 100644 (file)
--- a/src/lib/util/tests/server_hooks_unittest.cc
+++ b/src/lib/util/tests/server_hooks_unittest.cc
@@ -94,4 +94,19 @@ TEST(ServerHooksTest, GetHookNames) {
     EXPECT_TRUE(expected_names == actual_names);
 }
 
+// Check that the count of hooks is correct.
+
+TEST(ServerHooksTest, HookCount) {
+    ServerHooks hooks;
+
+    // Insert the names into the hooks object
+    hooks.registerHook("alpha");
+    hooks.registerHook("betha");
+    hooks.registerHook("gamma");
+    hooks.registerHook("delta");
+
+    // Should be two more hooks that the number we have registered.
+    EXPECT_EQ(6, hooks.getCount());
+}
+
 } // Anonymous namespace