Rename some of the functions and member variables to match the terminology of a check or test for improved readability.

Author: colinrg

test/TestClass.hpp

@@ -338,7 +338,7 @@ class TestClass
 
         m_logged = true;
 
-        privateLogFunction();
+        privateLogTest();
 
         // Ensure tear down happens before leak checking stops.
         Teardown();
@@ -752,10 +752,10 @@ class TestClass
 
 // Log reporting private helpers.
 private:
-    // Log the whole line for a function or member function.
-    void privateLogFunction()
+    // Log the whole line for a test name, function or member function name.
+    void privateLogTest()
     {
-        privateLogFunctionLineNumber();
+        privateLogTestLineNumber();
 
         privateLogTestStatus();
 
@@ -773,8 +773,8 @@ class TestClass
             privateLogFailures();
     }
 
-    // Log the current tested function with a line number.
-    void privateLogFunctionLineNumber()
+    // Log the current test or function with a line number.
+    void privateLogTestLineNumber()
     {
         TestString str, line_number_str;
 
@@ -796,7 +796,7 @@ class TestClass
         if (HasTests())
         {
             if (!IsGeneralTest())
-                GetSharedData().IncTotalFunctionsTested();
+                GetSharedData().IncTotalTested();
             if (HasFailed() || m_leak_check.IsLeaking())
                 LogWrite(GetSharedData().GetFailedMessage());
             else
@@ -994,9 +994,9 @@ class TestClass
                 privateLogCount("Total failed checks", GetSharedData().GetTotalFailedChecks());
             if (GetSharedData().GetTotalNotTested() > 0)
                 privateLogCount("Total not tested", GetSharedData().GetTotalNotTested());
-            privateLogCount("Total tested", GetSharedData().GetTotalFunctionsTested());
-            if (GetSharedData().GetTotalTimedFunctions() > 0)
-                privateLogCount("Total timed", GetSharedData().GetTotalTimedFunctions());
+            privateLogCount("Total tested", GetSharedData().GetTotalTested());
+            if (GetSharedData().GetTotalTimed() > 0)
+                privateLogCount("Total timed", GetSharedData().GetTotalTimed());
             privateLogCount("Total tests", GetSharedData().GetTotalTests());
             if (GetSharedData().GetTotalLeakedTests() > 0)
                 privateLogCount("Total memory leaks", GetSharedData().GetTotalLeakedTests());

test/TestClassSharedData.hpp

@@ -44,8 +44,8 @@ class TestClassSharedData
         , m_total_not_tested(0)
         , m_total_failed_checks(0)
         , m_total_leaked_tests(0)
-        , m_total_functions_tested(0)
-        , m_total_timed_functions(0)
+        , m_total_tested(0)
+        , m_total_timed(0)
         , m_total_tests(0)
 
         // Padded to be lined up for output as columns.
@@ -193,34 +193,34 @@ class TestClassSharedData
         ++m_total_leaked_tests;
     }
 
-    SizeType GetTotalFunctionsTested() const throw()
+    SizeType GetTotalTested() const throw()
     {
-        return m_total_functions_tested;
+        return m_total_tested;
     }
 
-    void SetTotalFunctionsTested(SizeType total_functions_tested) throw()
+    void SetTotalTested(SizeType total_tested) throw()
     {
-        m_total_functions_tested = total_functions_tested;
+        m_total_tested = total_tested;
     }
 
-    void IncTotalFunctionsTested()
+    void IncTotalTested()
     {
-        ++m_total_functions_tested;
+        ++m_total_tested;
     }
 
-    SizeType GetTotalTimedFunctions() const throw()
+    SizeType GetTotalTimed() const throw()
     {
-        return m_total_timed_functions;
+        return m_total_timed;
     }
 
-    void SetTotalTimedFunctions(SizeType total_timed_functions) throw()
+    void SetTotalTimed(SizeType total_timed) throw()
     {
-        m_total_timed_functions = total_timed_functions;
+        m_total_timed = total_timed;
     }
 
     void IncTotalTimedFunctions()
     {
-        ++m_total_timed_functions;
+        ++m_total_timed;
     }
 
     SizeType GetTotalTests() const throw()
@@ -292,12 +292,14 @@ class TestClassSharedData
     SizeType m_logged_line;
 
     // Counts for all tests.
+    // The counts are either for a check, e.g. CHECK_TRUE, CHECK_EQUAL, etc.
+    // or a test, e.g. TEST, TEST_FUNCTION, etc.
     SizeType m_total_checks;
     SizeType m_total_not_tested;
     SizeType m_total_failed_checks;
     SizeType m_total_leaked_tests;
-    SizeType m_total_functions_tested;
-    SizeType m_total_timed_functions;
+    SizeType m_total_tested;
+    SizeType m_total_timed;
     SizeType m_total_tests;
 
     // Last class name set for TestClass.