test macos

CMakeLists.txt

@@ -141,7 +141,6 @@ if(BUILD_TESTS)
 	message("Build tests")
 	enable_testing()
 	add_subdirectory("test/Iris.Tests")
-	add_subdirectory("test/AddressSanitizer.Tests")
 endif()
 
 # ---------------------------------------------------------------------------------------

src/CDLuminance.h

@@ -30,7 +30,7 @@ namespace iris
 		/// <param name="flashThreshold"></param>
 		CDLuminance(EA::EACC::Utils::FrameConverter* converter, const short& fps, const cv::Size& frameSize, FlashParams* params);
 		void SetCurrentFrame(const IrisFrame& irisFrame) override;
-		void SetCurrentFrame(cv::Mat* bgrFrame);
+		void SetCurrentFrame (cv::Mat* bgrFrame) override;
 
 		~CDLuminance();
 	protected:

src/RelativeLuminance.h

@@ -26,7 +26,7 @@ namespace iris
 
 
 		void SetCurrentFrame(const IrisFrame& irisFrame) override;
-		void SetCurrentFrame(cv::Mat* bgrFrame);
+		void SetCurrentFrame(cv::Mat* bgrFrame) override;
 
 		~RelativeLuminance();
 	protected:

src/TransitionTracker.h

@@ -14,7 +14,8 @@ namespace iris
 	{
 
 	public:
-
+
+		virtual ~TransitionTracker() {};
 
 		inline bool getLumPassWithWarning() { return m_luminanceResults.passWithWarning; };
 		inline bool getRedPassWithWarning() { return m_redResults.passWithWarning; };
@@ -52,9 +53,11 @@ namespace iris
 		/// If AnalysisByTime is enabled, add the first frame to the FrameTimeStamps structs
 		/// </summary>
 		/// <param name="data">data to persist</param>
-		virtual void SetFirstFrame(FrameData& data) {return;}
+		virtual void SetFirstFrame(FrameData& data) {}
 	protected:
 
+		TransitionTracker() {};
+
 		struct Counter
 		{
 			std::vector<int> count; //transition count that surpass the luminance/red threshold from the last second 

src/TransitionTrackerByFPS.cpp

@@ -3,6 +3,7 @@
 namespace iris
 {
 	TransitionTrackerByFPS::TransitionTrackerByFPS(unsigned int fps, TransitionTrackerParams* params)
+		: TransitionTracker()	
 	{
 		m_params = params;
 		m_luminanceTransitionCount.count.reserve(fps); m_luminanceTransitionCount.count.emplace_back(0);

src/TransitionTrackerByTime.cpp

@@ -2,7 +2,8 @@
 
 namespace iris
 {
-	TransitionTrackerByTime::TransitionTrackerByTime(unsigned int starterFpsReserve, TransitionTrackerParams* params)
+	TransitionTrackerByTime::TransitionTrackerByTime(unsigned int starterFpsReserve, TransitionTrackerParams* params) 
+		: TransitionTracker()
 	{
 		m_params = params;
 		m_luminanceTransitionCount.count.reserve(starterFpsReserve); m_luminanceTransitionCount.count.emplace_back(0);
@@ -39,13 +40,13 @@ namespace iris
 		m_fourSecondTimeStamps.GetFrameNumToRemove(data.TimeStampVal);
 
 		//update transition lists as 1s has passed
-		for (m_oneSecondFramesToRemove; m_oneSecondFramesToRemove > 0; m_oneSecondFramesToRemove--)
+		for (; m_oneSecondFramesToRemove > 0; m_oneSecondFramesToRemove--)
 		{
 			m_luminanceTransitionCount.updatePassed();
 			m_redTransitionCount.updatePassed();
 		}
 		//update extended failure as 5s have passed			 	
-		for (m_fiveSecondFramesToRemove; m_fiveSecondFramesToRemove > 0; m_fiveSecondFramesToRemove--)
+		for (; m_fiveSecondFramesToRemove > 0; m_fiveSecondFramesToRemove--)
 		{
 			m_luminanceExtendedCount.updatePassed();
 			m_redExtendedCount.updatePassed();

test/Iris.Tests/CMakeLists.txt

@@ -33,7 +33,7 @@ option(ASAN_ENABLED "Build this target with AddressSanitizer" ON)
 
 
 if(ASAN_ENABLED)
-  if(NOT MSVC)
+  if(NOT MSVC AND NOT APPLE)
     target_compile_options(${PROJECT_NAME} PUBLIC -fsanitize=address -fno-omit-frame-pointer)
     target_link_options(${PROJECT_NAME} PUBLIC -fsanitize=address)
     endif()

test/Iris.Tests/src/FlashDetectionTests.cpp

@@ -23,11 +23,9 @@ namespace iris::Tests
 
 	TEST_F(FlashDetectionTests, RELATIVE_LUMINANCE)
 	{
-
         configuration.SetLuminanceType(Configuration::LuminanceType::RELATIVE);
         configuration.Init();
-
-
+
         cv::Size size(100, 100);
 
         cv::Mat blackFrame(size, CV_8UC3, black); //lum = 0f