Merge pull request #360 from mshabunin:fix-contrib-tests

Author: alalek

modules/line_descriptor/perf/perf_descriptors.cpp

@@ -72,6 +72,6 @@ PERF_TEST_P(file_str, descriptors, testing::Values(IMAGES))
     bd->compute( frame, keylines, descriptors );
   }
 
-  SANITY_CHECK( descriptors );
+  SANITY_CHECK_NOTHING();
 
 }

modules/line_descriptor/perf/perf_detection.cpp

@@ -109,7 +109,7 @@ PERF_TEST_P(file_str, detect, testing::Values(IMAGES))
     createMatFromVec( keylines, lines );
   }
 
-  SANITY_CHECK( lines );
+  SANITY_CHECK_NOTHING();
 
 }
 
@@ -133,6 +133,6 @@ PERF_TEST_P(file_str, detect_lsd, testing::Values(IMAGES))
     createMatFromVec( keylines, lines );
   }
 
-  SANITY_CHECK( lines );
+  SANITY_CHECK_NOTHING();
 
 }

modules/line_descriptor/perf/perf_matching.cpp

@@ -138,7 +138,7 @@ PERF_TEST(matching, single_match)
   TEST_CYCLE()
     bd->match( query, train, dm );
 
-  SANITY_CHECK_MATCHES( dm );
+  SANITY_CHECK_NOTHING();
 
 }
 
@@ -160,7 +160,7 @@ PERF_TEST(knn_matching, knn_match_distances_test)
     }
   }
 
-  SANITY_CHECK( distances );
+  SANITY_CHECK_NOTHING();
 }
 
 PERF_TEST(radius_match, radius_match_distances_test)
@@ -181,7 +181,7 @@ PERF_TEST(radius_match, radius_match_distances_test)
     }
   }
 
-  SANITY_CHECK( distances );
+  SANITY_CHECK_NOTHING();
 
 }
 

modules/reg/perf/perf_reg.cpp

@@ -205,7 +205,7 @@ PERF_TEST_P(Size_MatType, Registration_Shift,
 
     TEST_CYCLE() shift = perfShift(frame);
 
-    SANITY_CHECK(shift);
+    SANITY_CHECK_NOTHING();
 }
 
 PERF_TEST_P(Size_MatType, Registration_Euclidean,
@@ -223,7 +223,7 @@ PERF_TEST_P(Size_MatType, Registration_Euclidean,
 
     TEST_CYCLE() result = perfEuclidean(frame);
 
-    SANITY_CHECK(result);
+    SANITY_CHECK_NOTHING();
 }
 
 PERF_TEST_P(Size_MatType, Registration_Similarity,
@@ -241,7 +241,7 @@ PERF_TEST_P(Size_MatType, Registration_Similarity,
 
     TEST_CYCLE() result = perfSimilarity(frame);
 
-    SANITY_CHECK(result);
+    SANITY_CHECK_NOTHING();
 }
 
 PERF_TEST_P(Size_MatType, Registration_Affine,
@@ -259,7 +259,7 @@ PERF_TEST_P(Size_MatType, Registration_Affine,
 
     TEST_CYCLE() result = perfAffine(frame);
 
-    SANITY_CHECK(result);
+    SANITY_CHECK_NOTHING();
 }
 
 PERF_TEST_P(Size_MatType, Registration_Projective,
@@ -277,5 +277,5 @@ PERF_TEST_P(Size_MatType, Registration_Projective,
 
     TEST_CYCLE() result = perfProjective(frame);
 
-    SANITY_CHECK(result);
+    SANITY_CHECK_NOTHING();
 }

modules/xfeatures2d/perf/perf_daisy.cpp

@@ -29,5 +29,5 @@ PERF_TEST_P(daisy, extract, testing::Values(DAISY_IMAGES))
     // compute all daisies in image
     TEST_CYCLE() descriptor->compute(frame, descriptors);
 
-    SANITY_CHECK(descriptors, 1e-4);
+    SANITY_CHECK_NOTHING();
 }

modules/xfeatures2d/perf/perf_latch.cpp

@@ -30,5 +30,5 @@ PERF_TEST_P(latch, extract, testing::Values(LATCH_IMAGES))
     vector<uchar> descriptors;
     TEST_CYCLE() descriptor->compute(frame, points, descriptors);
 
-    SANITY_CHECK(descriptors, 1e-4);
+    SANITY_CHECK_NOTHING();
 }

modules/xfeatures2d/perf/perf_surf.cpp

@@ -26,7 +26,7 @@ PERF_TEST_P(surf, detect, testing::Values(SURF_IMAGES))
 
     TEST_CYCLE() detector->detect(frame, points, mask);
 
-    SANITY_CHECK_KEYPOINTS(points, 1e-3);
+    SANITY_CHECK_NOTHING();
 }
 
 PERF_TEST_P(surf, extract, testing::Values(SURF_IMAGES))
@@ -45,7 +45,7 @@ PERF_TEST_P(surf, extract, testing::Values(SURF_IMAGES))
 
     TEST_CYCLE() detector->compute(frame, points, descriptors);
 
-    SANITY_CHECK(descriptors, 1e-4);
+    SANITY_CHECK_NOTHING();
 }
 
 PERF_TEST_P(surf, full, testing::Values(SURF_IMAGES))
@@ -62,6 +62,5 @@ PERF_TEST_P(surf, full, testing::Values(SURF_IMAGES))
 
     TEST_CYCLE() detector->detectAndCompute(frame, mask, points, descriptors, false);
 
-    SANITY_CHECK_KEYPOINTS(points, 1e-3);
-    SANITY_CHECK(descriptors, 1e-4);
+    SANITY_CHECK_NOTHING();
 }

modules/xfeatures2d/perf/perf_surf.ocl.cpp

@@ -81,8 +81,7 @@ PERF_TEST_P(OCL_SURF, DISABLED_with_data_transfer, testing::Values(SURF_IMAGES))
         d_descriptors.download(cpu_dp);
     }
 
-    SANITY_CHECK(cpu_kp, 1);
-    SANITY_CHECK(cpu_dp, 1);
+    SANITY_CHECK_NOTHING();
 }
 
 PERF_TEST_P(OCL_SURF, DISABLED_without_data_transfer, testing::Values(SURF_IMAGES))
@@ -104,8 +103,7 @@ PERF_TEST_P(OCL_SURF, DISABLED_without_data_transfer, testing::Values(SURF_IMAGE
     Mat cpu_dp;
     d_keypoints.download(cpu_kp);
     d_descriptors.download(cpu_dp);
-    SANITY_CHECK(cpu_kp, 1);
-    SANITY_CHECK(cpu_dp, 1);
+    SANITY_CHECK_NOTHING();
 }
 
 #endif // HAVE_OPENCV_OCL

modules/ximgproc/perf/perf_adaptive_manifold.cpp

@@ -2,26 +2,26 @@
  *  By downloading, copying, installing or using the software you agree to this license.
  *  If you do not agree to this license, do not download, install,
  *  copy or use the software.
- *  
- *  
+ *
+ *
  *  License Agreement
  *  For Open Source Computer Vision Library
  *  (3 - clause BSD License)
- *  
+ *
  *  Redistribution and use in source and binary forms, with or without modification,
  *  are permitted provided that the following conditions are met :
- *  
+ *
  *  *Redistributions of source code must retain the above copyright notice,
  *  this list of conditions and the following disclaimer.
- *  
+ *
  *  * Redistributions in binary form must reproduce the above copyright notice,
  *  this list of conditions and the following disclaimer in the documentation
  *  and / or other materials provided with the distribution.
- *  
+ *
  *  * Neither the names of the copyright holders nor the names of the contributors
  *  may be used to endorse or promote products derived from this software
  *  without specific prior written permission.
- *  
+ *
  *  This software is provided by the copyright holders and contributors "as is" and
  *  any express or implied warranties, including, but not limited to, the implied
  *  warranties of merchantability and fitness for a particular purpose are disclaimed.
@@ -49,7 +49,7 @@ using namespace cv::ximgproc;
 
 typedef tuple<bool, Size, int, int, MatType> AMPerfTestParam;
 typedef TestBaseWithParam<AMPerfTestParam> AdaptiveManifoldPerfTest;
-    
+
 PERF_TEST_P( AdaptiveManifoldPerfTest, perf,
     Combine(
     Values(true, false),            //adjust_outliers flag
@@ -70,7 +70,7 @@ PERF_TEST_P( AdaptiveManifoldPerfTest, perf,
     Mat joint(sz, CV_MAKE_TYPE(depth, jointCnNum));
     Mat src(sz, CV_MAKE_TYPE(depth, srcCnNum));
     Mat dst(sz, CV_MAKE_TYPE(depth, srcCnNum));
-    
+
     cv::setNumThreads(cv::getNumberOfCPUs());
 
     declare.in(joint, src, WARMUP_RNG).out(dst).tbb_threads(cv::getNumberOfCPUs());
@@ -87,7 +87,7 @@ PERF_TEST_P( AdaptiveManifoldPerfTest, perf,
         sigma_r /= 1.38;
     }
 
-    SANITY_CHECK(dst);
+    SANITY_CHECK_NOTHING();
 }
 
-}
+}

modules/ximgproc/perf/perf_disparity_wls_filter.cpp

@@ -89,7 +89,7 @@ PERF_TEST_P( DisparityWLSFilterPerfTest, perf, Combine(GuideTypes::all(), SrcTyp
         wls_filter->filter(disp_left,guide,dst,disp_right,ROI);
     }
 
-    SANITY_CHECK(dst);
+    SANITY_CHECK_NOTHING();
 }
 
 void MakeArtificialExample(RNG rng, Mat& dst_left_view, Mat& dst_left_disparity_map, Mat& dst_right_disparity_map, Rect& dst_ROI)