SERVER-44570 Add tripwire assertions (tassert)

2 files changed, 14 insertions, 2 deletions

diff --git a/src/mongo/unittest/unittest.h b/src/mongo/unittest/unittest.h
index 160532e4528..2ef1d7cd77e 100644
--- a/src/mongo/unittest/unittest.h
+++ b/src/mongo/unittest/unittest.h
@@ -506,12 +506,22 @@ public:
     /**
      * Called on the test object before running the test.
      */
-    virtual void setUp() {}
+    virtual void setUp() {
+        // React to any tasserts in the unittest framework initialisation, or between tests.
+        checkForTripwireAssertions();
+        // Clear tasserts for the code that's about to be under test.
+        assertionCount.tripwire.store(0);
+    }
 
     /**
      * Called on the test object after running the test.
      */
-    virtual void tearDown() {}
+    virtual void tearDown() {
+        // React to any tasserts in the code that was under test.
+        checkForTripwireAssertions();
+        // Clear tasserts in case of any between tests, or during the unittest framework shutdown.
+        assertionCount.tripwire.store(0);
+    }
 
 protected:
     /**
diff --git a/src/mongo/unittest/unittest_main.cpp b/src/mongo/unittest/unittest_main.cpp
index b1286ed772a..1056198a04f 100644
--- a/src/mongo/unittest/unittest_main.cpp
+++ b/src/mongo/unittest/unittest_main.cpp
@@ -127,5 +127,7 @@ int main(int argc, char** argv) {
         std::cerr << "Global deinitilization failed: " << ret.reason() << std::endl;
     }
 
+    ::mongo::checkForTripwireAssertions();
+
     return result;
 }