Merge pull request #1455 from ilya-lavrenov:ocl_test_output

modules/ocl/test/test_imgproc.cpp

@@ -482,7 +482,6 @@ struct CopyMakeBorder : ImgprocTestBase {};
 TEST_P(CopyMakeBorder, Mat)
 {
     int bordertype[] = {cv::BORDER_CONSTANT, cv::BORDER_REPLICATE, cv::BORDER_REFLECT, cv::BORDER_WRAP, cv::BORDER_REFLECT_101};
-    //const char *borderstr[] = {"BORDER_CONSTANT", "BORDER_REPLICATE", "BORDER_REFLECT", "BORDER_WRAP", "BORDER_REFLECT_101"};
     cv::RNG &rng = TS::ptr()->get_rng();
     int top = rng.uniform(0, 10);
     int bottom = rng.uniform(0, 10);
@@ -895,8 +894,7 @@ TEST_P(Remap, Mat)
         return;
     }
     int bordertype[] = {cv::BORDER_CONSTANT, cv::BORDER_REPLICATE/*,BORDER_REFLECT,BORDER_WRAP,BORDER_REFLECT_101*/};
-    //const char *borderstr[] = {"BORDER_CONSTANT", "BORDER_REPLICATE"/*, "BORDER_REFLECT","BORDER_WRAP","BORDER_REFLECT_101"*/};
-    // for(int i = 0; i < sizeof(bordertype)/sizeof(int); i++)
+
     for(int j = 0; j < LOOP_TIMES; j++)
     {
         random_roi();
@@ -908,7 +906,6 @@ TEST_P(Remap, Mat)
         if(interpolation == 0)
             EXPECT_MAT_NEAR(dst, cpu_dst, 1.0);
         EXPECT_MAT_NEAR(dst, cpu_dst, 2.0);
-
     }
 }
 

modules/ocl/test/test_match_template.cpp

@@ -52,8 +52,6 @@
 
 IMPLEMENT_PARAM_CLASS(TemplateSize, cv::Size);
 
-const char *TEMPLATE_METHOD_NAMES[6] = {"TM_SQDIFF", "TM_SQDIFF_NORMED", "TM_CCORR", "TM_CCORR_NORMED", "TM_CCOEFF", "TM_CCOEFF_NORMED"};
-
 #define MTEMP_SIZES testing::Values(cv::Size(128, 256), cv::Size(1024, 768))
 
 PARAM_TEST_CASE(MatchTemplate8U, cv::Size, TemplateSize, Channels, TemplateMethod)
@@ -74,12 +72,6 @@ PARAM_TEST_CASE(MatchTemplate8U, cv::Size, TemplateSize, Channels, TemplateMetho
 
 TEST_P(MatchTemplate8U, Accuracy)
 {
-
-    std::cout << "Method: " << TEMPLATE_METHOD_NAMES[method] << std::endl;
-    std::cout << "Image Size: (" << size.width << ", " << size.height << ")" << std::endl;
-    std::cout << "Template Size: (" << templ_size.width << ", " << templ_size.height << ")" << std::endl;
-    std::cout << "Channels: " << cn << std::endl;
-
     cv::Mat image = randomMat(size, CV_MAKETYPE(CV_8U, cn));
     cv::Mat templ = randomMat(templ_size, CV_MAKETYPE(CV_8U, cn));
 
@@ -101,7 +93,6 @@ PARAM_TEST_CASE(MatchTemplate32F, cv::Size, TemplateSize, Channels, TemplateMeth
     cv::Size templ_size;
     int cn;
     int method;
-    //std::vector<cv::ocl::Info> oclinfo;
 
     virtual void SetUp()
     {

modules/ocl/test/test_objdetect.cpp

@@ -239,11 +239,8 @@ TEST_P(Haar, FaceDetect)
 TEST_P(Haar, FaceDetectUseBuf)
 {
     ocl::OclCascadeClassifierBuf cascadebuf;
-    if(!cascadebuf.load(cascadeName))
-    {
-        std::cout << "ERROR: Could not load classifier cascade for FaceDetectUseBuf!" << std::endl;
-        return;
-    }
+    ASSERT_TRUE(cascadebuf.load(cascadeName)) << "could not load classifier cascade for FaceDetectUseBuf!";
+
     cascadebuf.detectMultiScale(d_img, oclfaces,  1.1, 3,
                                 flags,
                                 Size(30, 30), Size(0, 0));