Bug fixes of median filter test, replace .jpg to .png.

Author: valentina-kustikova

CMakeLists.txt

@@ -3,8 +3,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 set(PROJECT_NAME practice2)
 project(${PROJECT_NAME})
 
-option(WITH_CODE_COVERAGE "Enable code coverage analysis" OFF)
-
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
@@ -17,24 +15,14 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEAS
 
 set(PRACTICE2_LIBRARY ${PROJECT_NAME})
 set(PRACTICE2_TESTS "${PROJECT_NAME}_test")
-
-find_package(OpenCV REQUIRED)
-
 set(PRACTICE2_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include")
+
 include_directories("${PRACTICE2_INCLUDE}")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/3rdparty")
 
+find_package(OpenCV REQUIRED)
 set(LIBRARY_DEPS ${OpenCV_LIBS})
 
-if (WITH_CODE_COVERAGE)
-  if (CMAKE_COMPILER_IS_GNUCXX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
-  else()
-    message(WARNING "Code coverage can be estimated only when g++ compiler is used. Code coverage analysis is disabled.")
-    set(WITH_CODE_COVERAGE OFF)
-  endif()
-endif()
-
 # BUILD
 add_subdirectory(3rdparty)
 add_subdirectory(src)
@@ -48,5 +36,4 @@ message( STATUS "======================================")
 message( STATUS "")
 message( STATUS "   Configuration:        ${CMAKE_BUILD_TYPE}")
 message( STATUS "   OpenCV build path:    ${OpenCV_DIR}")
-message( STATUS "   Enable code coverage: ${WITH_CODE_COVERAGE}")
 message( STATUS "")

src/img_proc.cpp

@@ -14,6 +14,10 @@ int processFrame(const Mat& src, Mat& dst)
 {
     const int kSize = 11;
     medianBlur(src, dst, kSize);
+    if (dst.empty())
+    {
+        return 1;
+    }
     return 0;
 }
 

test/img_proc_test.cpp

@@ -3,17 +3,26 @@
 
 TEST(practice2, median_filter_test)
 {
-    std::string input = "./testdata/image.jpg";
-    std::string expOutput = "./testdata/image_median_1.jpg";
+    std::string input = "./testdata/image.png";
+    std::string expOutput = "./testdata/image_median_11.png";
 
     Mat src, expDst, dst; 
     getFrame(input, src);
+    if (src.empty())
+    {
+        FAIL() << "Can't read" + input + " image";
+    }
     getFrame(expOutput, expDst);
     if (expDst.empty())
     {
         FAIL() << "Can't read" + expOutput + " image";
     }
 
+    if (processFrame(src, dst) != 0)
+    {
+        FAIL() << "Can't execute median filtering";
+    }
+
     Mat diff = abs(expDst - dst);
     Mat mask = diff.reshape(1) > 1;