Split setCrashOnFail into set/reset

cpputest · Sep 17, 2020 · 8563380 · 8563380
1 parent 68215f4
commit 8563380
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/include/CppUTest/Utest.h b/include/CppUTest/Utest.h
@@ -96,7 +96,8 @@ class UtestShell
 
     static const TestTerminator &getCurrentTestTerminator();
 
-    static void setCrashOnFail(bool crashOnFail = true);
+    static void setCrashOnFail();
+    static void resetFailBehaviour();
 
 public:
     UtestShell(const char* groupName, const char* testName, const char* fileName, size_t lineNumber);

diff --git a/src/CppUTest/Utest.cpp b/src/CppUTest/Utest.cpp
@@ -129,8 +129,7 @@ extern "C" {
 
 }
 
-/************************************************************************** */
-/* Define the two possible TestTerminators that can be selected at run time */
+/******************************** */
 
 static const NormalTestTerminator normalTestTerminator;
 static const CrashingTestTerminator crashingTestTerminator;
@@ -588,12 +587,14 @@ const TestTerminator &UtestShell::getCurrentTestTerminator()
     return *currentTestTerminator_;
 }
 
-void UtestShell::setCrashOnFail(bool crashOnFail)
+void UtestShell::setCrashOnFail()
 {
-    if (crashOnFail)
-        currentTestTerminator_ = &crashingTestTerminator;
-    else
-        currentTestTerminator_ = &normalTestTerminator;
+    currentTestTerminator_ = &crashingTestTerminator;
+}
+
+void UtestShell::resetFailBehaviour()
+{
+    currentTestTerminator_ = &normalTestTerminator;
 }
 
 ExecFunctionTestShell::~ExecFunctionTestShell()

diff --git a/tests/CppUTestExt/MockSupportTest.cpp b/tests/CppUTestExt/MockSupportTest.cpp
@@ -268,7 +268,7 @@ TEST(MockSupportTestWithFixture, shouldCrashOnFailureWithCppUTestSetting)
 
     CHECK(cpputestHasCrashed);
 
-    UtestShell::setCrashOnFail(false);
+    UtestShell::resetFailBehaviour();
     UtestShell::resetCrashMethod();
 }