Merge pull request #3 from sbash64/bug-fix/catch-std-exceptions

Bug fix/catch std exceptions

Author: sbash64

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10.0)
-project(TestCppLite VERSION 1.1.2 LANGUAGES CXX)
+project(TestCppLite VERSION 1.1.3 LANGUAGES CXX)
 add_subdirectory(src)
 if (${WITH_TESTS})
     enable_testing()

src/testcpplite.cpp

@@ -1,4 +1,5 @@
 #include "testcpplite.hpp"
+#include <exception>
 
 namespace testcpplite {
 struct TestResult {
@@ -22,18 +23,33 @@ static auto quoted(const std::string &s) -> std::string {
     return mark + s + mark;
 }
 
-auto test(const std::vector<Test> &tests, std::ostream &stream) -> int {
+static void writeFailure(
+    std::ostream &stream, const Test &test, const std::string &what) {
+    stream << "fail " << test.name << '\n';
+    stream << "    " << what << '\n';
+}
+
+static auto test(const Test &test, std::ostream &stream) -> bool {
     bool passed{true};
-    for (const auto &test : tests) {
+    try {
         TestResult result{};
         test.f(result);
         if (result.failed) {
             passed = false;
-            stream << "fail " << test.name << '\n';
-            stream << "    expected " << result.expected << ", actual "
-                   << result.actual << '\n';
+            writeFailure(stream, test,
+                "expected " + result.expected + ", actual " + result.actual);
         }
+    } catch (const std::exception &e) {
+        passed = false;
+        writeFailure(stream, test, e.what());
     }
+    return passed;
+}
+
+auto test(const std::vector<Test> &tests, std::ostream &stream) -> int {
+    bool passed{true};
+    for (const auto &t : tests)
+        passed &= test(t, stream);
     if (passed)
         stream << "pass\n";
     return passed ? 0 : 1;

test/main.cpp

@@ -1,6 +1,8 @@
 #include <testcpplite/testcpplite.hpp>
 #include <sstream>
 #include <iostream>
+#include <exception>
+#include <string>
 
 namespace testcpplite {
 namespace {
@@ -28,6 +30,16 @@ void passesNegativeBooleanAssertion(TestResult &result) {
 
 void expectsFalseActualTrue(TestResult &result) { assertFalse(result, true); }
 
+class StandardException : public std::exception {
+  public:
+    explicit StandardException(std::string s) : s{std::move(s)} {}
+
+    auto what() const noexcept -> const char * override { return s.c_str(); }
+
+  private:
+    std::string s;
+};
+
 auto testStream(const std::vector<Test> &tests) -> std::stringstream {
     std::stringstream stream;
     test(tests, stream);
@@ -140,6 +152,11 @@ void failedUnsignedIntegerComparisonShowsFailedMessage(TestResult &result) {
         {expects2147483647Actual2147483648, "myTest"});
 }
 
+void catchesStandardExceptions(TestResult &result) {
+    assertEqual(result, failMessage("myTest") + "    error\n",
+        {[](TestResult &) { throw StandardException{"error"}; }, "myTest"});
+}
+
 int main() {
     return testcpplite::test(
         {{passedOnlyTestShowsPassedMessage, "passedOnlyTestShowsPassedMessage"},
@@ -166,7 +183,8 @@ int main() {
             {failedNegativeBooleanAssertionShowsFailedMessage,
                 "failedNegativeBooleanAssertionShowsFailedMessage"},
             {failedUnsignedIntegerComparisonShowsFailedMessage,
-                "failedUnsignedIntegerComparisonShowsFailedMessage"}},
+                "failedUnsignedIntegerComparisonShowsFailedMessage"},
+            {catchesStandardExceptions, "catchesStandardExceptions"}},
         std::cout);
 }
 }