Changeset 456 for library/tests/unittest-cpp

Timestamp:

07/31/09 08:38:18 (15 years ago)

Author:

vbarta

Message:

custom test location for harness tests (extended UnitTest?++), configurable tolerance - all tests pass (most of the time)

Location:

library/tests/unittest-cpp

Files:

• TestDetails.cpp (modified) (1 diff)
• TestDetails.h (modified) (2 diffs)
• TestReporterStdout.cpp (modified) (1 diff)

library/tests/unittest-cpp/TestDetails.cpp

@@ -3 +3 @@
 namespace UnitTest {
 
-TestDetails::TestDetails(char const* testName_, char const* suiteName_, char const* filename_, int lineNumber_)
+TestDetails::TestDetails(char const* testName_, char const* suiteName_, char const* filename_, int lineNumber_, bool useFilename_)
     : suiteName(suiteName_)
     , testName(testName_)
     , filename(filename_)
     , lineNumber(lineNumber_)
+    , useFilename(useFilename_)
 {
 }
 
-TestDetails::TestDetails(const TestDetails& details, int lineNumber_)
+TestDetails::TestDetails(const TestDetails& details, int lineNumber_, bool useFilename_)
     : suiteName(details.suiteName)
     , testName(details.testName)
     , filename(details.filename)
     , lineNumber(lineNumber_)
+    , useFilename(useFilename_)
 {
 }

library/tests/unittest-cpp/TestDetails.h

@@ -7 +7 @@
 {
 public:
-    TestDetails(char const* testName, char const* suiteName, char const* filename, int lineNumber);
-    TestDetails(const TestDetails& details, int lineNumber);
+    TestDetails(char const* testName, char const* suiteName, char const* filename, int lineNumber, bool useFilename = true);
+    TestDetails(const TestDetails& details, int lineNumber, bool useFilename = true);
 
     char const* const suiteName;
@@ -14 +14 @@
     char const* const filename;
     int const lineNumber;
+    bool const useFilename;
 
     TestDetails(TestDetails const&); // Why is it public? --> http://gcc.gnu.org/bugs.html#cxx_rvalbind

library/tests/unittest-cpp/TestReporterStdout.cpp

@@ -19 +19 @@
 #endif
 
-        using namespace std;
-    printf(errorFormat, details.filename, details.lineNumber, details.testName, failure);
+    using namespace std;
+
+    if (details.useFilename) {
+        // standard way
+        printf(errorFormat, details.filename, details.lineNumber, details.testName, failure);
+    } else { 
+        // extended for BDM - the failure string already includes
+        // (custom) test location info
+        printf("%s\n", failure);
+    }
 }