From d370c26c42329a0518c4ca56dbb04875bc8e7e3f Mon Sep 17 00:00:00 2001 From: James Grogan Date: Mon, 16 Jan 2023 18:16:14 +0000 Subject: [PATCH] Add exception handling for test runner. --- src/image/Image.cpp | 2 +- src/image/Image.h | 1 - test/test_utils/TestCaseRunner.cpp | 11 ++++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/image/Image.cpp b/src/image/Image.cpp index 6724419..c9ed06c 100644 --- a/src/image/Image.cpp +++ b/src/image/Image.cpp @@ -12,7 +12,7 @@ Image::Image(unsigned width, unsigned height, DataType dataType) mHeight(height), mDataType(dataType) { - + initialize(); } Image::~Image() diff --git a/src/image/Image.h b/src/image/Image.h index 9ebad47..817915b 100644 --- a/src/image/Image.h +++ b/src/image/Image.h @@ -48,7 +48,6 @@ public: private: void initialize(); - unsigned mWidth{1}; unsigned mHeight{1}; unsigned mBitDepth{8}; diff --git a/test/test_utils/TestCaseRunner.cpp b/test/test_utils/TestCaseRunner.cpp index 27498cb..0f6b7b9 100644 --- a/test/test_utils/TestCaseRunner.cpp +++ b/test/test_utils/TestCaseRunner.cpp @@ -67,7 +67,16 @@ bool TestCaseRunner::run(const std::vector& args) sLastTestFailed = false; std::cout << "TestFramework: Running Test - " << test_case->getName() << std::endl; - test_case->run(); + + try{ + test_case->run(); + } + catch(...) + { + std::cout << "Failed with exception" << std::endl; + mFailingTests.push_back(test_case->getName()); + }; + if (sLastTestFailed) { std::cout << "Failed at line: " << sFailureLine << std::endl;