Merge pull request #348 from mshabunin:contrib-tests

modules/line_descriptor/perf/perf_descriptors.cpp

@@ -51,7 +51,7 @@ using std::tr1::get;
 typedef perf::TestBaseWithParam<std::string> file_str;
 
 #define IMAGES \
-  "line_descriptor_data/cameraman.jpg", "line_descriptor_data/lena.bmp"
+  "cv/line_descriptor/cameraman.jpg", "cv/shared/lena.png"
 
 PERF_TEST_P(file_str, descriptors, testing::Values(IMAGES))
 {

modules/line_descriptor/perf/perf_detection.cpp

@@ -51,7 +51,7 @@ using std::tr1::get;
 typedef perf::TestBaseWithParam<std::string> file_str;
 
 #define IMAGES \
-  "line_descriptor_data/cameraman.jpg", "line_descriptor_data/lena.bmp"
+  "cv/line_descriptor/cameraman.jpg", "cv/shared/lena.png"
 
 void createMatFromVec( const std::vector<KeyLine>& linesVec, Mat& output );
 

modules/line_descriptor/test/test_descriptors_regression.cpp

@@ -50,7 +50,6 @@ using namespace cv::line_descriptor;
 
 const std::string LINE_DESCRIPTOR_DIR = "line_descriptor";
 const std::string IMAGE_FILENAME = "cameraman.jpg";
-const std::string DESCRIPTORS_DIR = LINE_DESCRIPTOR_DIR + "/descriptors";
 
 template<class Distance>
 class CV_BD_DescriptorsTest : public cvtest::BaseTest
@@ -120,7 +119,7 @@ class CV_BD_DescriptorsTest : public cvtest::BaseTest
   Mat readDescriptors()
   {
     Mat descriptors;
-    FileStorage fs( std::string( ts->get_data_path() ) + LINE_DESCRIPTOR_DIR + "/descriptors/" + fs_name, FileStorage::READ );
+    FileStorage fs( std::string( ts->get_data_path() ) + LINE_DESCRIPTOR_DIR + "/" + fs_name, FileStorage::READ );
     fs["descriptors"] >> descriptors;
 
     return descriptors;
@@ -128,7 +127,7 @@ class CV_BD_DescriptorsTest : public cvtest::BaseTest
 
   bool writeDescriptors( Mat& descs )
   {
-    FileStorage fs( std::string( ts->get_data_path() ) + LINE_DESCRIPTOR_DIR + "/descriptors/" + fs_name, FileStorage::WRITE );
+    FileStorage fs( std::string( ts->get_data_path() ) + LINE_DESCRIPTOR_DIR + "/" + fs_name, FileStorage::WRITE );
     fs << "descriptors" << descs;
 
     return true;
@@ -270,7 +269,7 @@ class CV_BD_DescriptorsTest : public cvtest::BaseTest
     }
 
     std::vector<KeyLine> keylines;
-    FileStorage fs( std::string( ts->get_data_path() ) + LINE_DESCRIPTOR_DIR + "/detectors/edl_detector_keylines_cameraman.yaml", FileStorage::READ );
+    FileStorage fs( std::string( ts->get_data_path() ) + LINE_DESCRIPTOR_DIR + "/edl_detector_keylines_cameraman.yaml", FileStorage::READ );
     if( fs.isOpened() )
     {
       //read( fs.getFirstTopLevelNode(), keypoints );
@@ -326,7 +325,7 @@ class CV_BD_DescriptorsTest : public cvtest::BaseTest
     else
     {
       ts->printf( cvtest::TS::LOG, "Compute and write keylines.\n" );
-      fs.open( std::string( ts->get_data_path() ) + LINE_DESCRIPTOR_DIR + "/detectors/edl_detector_keylines_cameraman.yaml", FileStorage::WRITE );
+      fs.open( std::string( ts->get_data_path() ) + LINE_DESCRIPTOR_DIR + "/edl_detector_keylines_cameraman.yaml", FileStorage::WRITE );
       if( fs.isOpened() )
       {
         bd->detect( img, keylines );

modules/line_descriptor/test/test_detector_regression.cpp

@@ -50,7 +50,6 @@ using namespace cv::line_descriptor;
 
 const std::string LINE_DESCRIPTOR_DIR = "line_descriptor";
 const std::string IMAGE_FILENAME = "cameraman.jpg";
-const std::string DETECTOR_DIR = LINE_DESCRIPTOR_DIR + "/detectors";
 
 class CV_BinaryDescriptorDetectorTest : public cvtest::BaseTest
 {
@@ -256,7 +255,7 @@ void CV_BinaryDescriptorDetectorTest::regressionTest()
 {
   assert( bd );
   std::string imgFilename = std::string( ts->get_data_path() ) + LINE_DESCRIPTOR_DIR + "/" + IMAGE_FILENAME;
-  std::string resFilename = std::string( ts->get_data_path() ) + DETECTOR_DIR + "/" + fs_name + ".yaml";
+  std::string resFilename = std::string( ts->get_data_path() ) + LINE_DESCRIPTOR_DIR + "/" + fs_name + ".yaml";
 
   // Read the test image.
   Mat image = imread( imgFilename );

modules/reg/test/test_main.cpp

@@ -43,4 +43,4 @@
 
 #include "test_precomp.hpp"
 
-CV_TEST_MAIN("reg")
+CV_TEST_MAIN("cv")

modules/reg/test/test_reg.cpp

@@ -244,7 +244,7 @@ void RegTest::testProjective()
 
 void RegTest::loadImage()
 {
-    const string imageName = cvtest::TS::ptr()->get_data_path() + "home.png";
+    const string imageName = cvtest::TS::ptr()->get_data_path() + "reg/home.png";
 
     img1 = imread(imageName, -1);
     ASSERT_TRUE(img1.data != 0);

modules/rgbd/samples/odometry_evaluation.cpp

@@ -173,7 +173,7 @@ int main(int argc, char** argv)
 
     Ptr<OdometryFrame> frame_prev = Ptr<OdometryFrame>(new OdometryFrame()),
                            frame_curr = Ptr<OdometryFrame>(new OdometryFrame());
-    Ptr<Odometry> odometry = Odometry::create("RGBD." + string(argv[3]) + "Odometry");
+    Ptr<Odometry> odometry = Odometry::create(string(argv[3]) + "Odometry");
     if(odometry.empty())
     {
         cout << "Can not create Odometry algorithm. Check the passed odometry name." << endl;

modules/rgbd/test/test_main.cpp

 #include "test_precomp.hpp"
 
-CV_TEST_MAIN("rgbd")
+CV_TEST_MAIN("cv")

modules/rgbd/test/test_normal.cpp

@@ -450,7 +450,7 @@ protected:
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-TEST(Rgbd_Normals, compute)
+TEST(DISABLED_Rgbd_Normals, compute)
 {
   cv::rgbd::CV_RgbdNormalsTest test;
   test.safe_run();

modules/rgbd/test/test_odometry.cpp

@@ -175,8 +175,8 @@ protected:
 
 bool CV_OdometryTest::readData(Mat& image, Mat& depth) const
 {
-    std::string imageFilename = std::string(ts->get_data_path()) + "/odometry/rgb.png";
-    std::string depthFilename = std::string(ts->get_data_path()) + "/odometry/depth.png";
+    std::string imageFilename = ts->get_data_path() + "rgbd/rgb.png";
+    std::string depthFilename = ts->get_data_path() + "rgbd/depth.png";
     
     image = imread(imageFilename,  0);
     depth = imread(depthFilename, -1);
@@ -286,7 +286,7 @@ void CV_OdometryTest::run(int)
         Rodrigues(calcR, calcRvec);
         calcRvec = calcRvec.reshape(rvec.channels(), rvec.rows);
         Mat calcTvec = calcRt(Rect(3,0,1,3));
-        
+
 #if SHOW_DEBUG_IMAGES
         imshow("image", image);
         imshow("warpedImage", warpedImage);
@@ -296,7 +296,7 @@ void CV_OdometryTest::run(int)
         waitKey();
 #endif
 
-    
+
         // compare rotation
         double rdiffnorm = norm(rvec - calcRvec),
                rnorm = norm(rvec);
@@ -338,18 +338,18 @@ void CV_OdometryTest::run(int)
 
 TEST(RGBD_Odometry_Rgbd, algorithmic)
 {
-    cv::rgbd::CV_OdometryTest test(cv::rgbd::Odometry::create("RGBD.RgbdOdometry"), 0.99, 0.94);
+    cv::rgbd::CV_OdometryTest test(cv::rgbd::Odometry::create("RgbdOdometry"), 0.99, 0.94);
     test.safe_run();
 }
 
-TEST(RGBD_Odometry_ICP, algorithmic)
+TEST(DISABLED_RGBD_Odometry_ICP, algorithmic)
 {
-    cv::rgbd::CV_OdometryTest test(cv::rgbd::Odometry::create("RGBD.ICPOdometry"), 0.99, 0.99);
+    cv::rgbd::CV_OdometryTest test(cv::rgbd::Odometry::create("ICPOdometry"), 0.99, 0.99);
     test.safe_run();
 }
 
-TEST(RGBD_Odometry_RgbdICP, algorithmic)
+TEST(DISABLED_RGBD_Odometry_RgbdICP, algorithmic)
 {
-    cv::rgbd::CV_OdometryTest test(cv::rgbd::Odometry::create("RGBD.RgbdICPOdometry"), 0.99, 0.99);
+    cv::rgbd::CV_OdometryTest test(cv::rgbd::Odometry::create("RgbdICPOdometry"), 0.99, 0.99);
     test.safe_run();
 }

modules/xfeatures2d/perf/perf_daisy.cpp

@@ -25,7 +25,7 @@ PERF_TEST_P(daisy, extract, testing::Values(DAISY_IMAGES))
     Ptr<DAISY> descriptor = DAISY::create();
 
     vector<KeyPoint> points;
-    vector<float> descriptors;
+    Mat_<float> descriptors;
     // compute all daisies in image
     TEST_CYCLE() descriptor->compute(frame, descriptors);
 

modules/xfeatures2d/src/daisy.cpp

@@ -602,10 +602,10 @@ static void bi_get_histogram( float* histogram, const double y, const double x,
 
     // A C --> pixel positions
     // B D
-    const float* A = hcube->ptr<float>(0,  mny   *_hist_th_q_no,  mnx   *_hist_th_q_no);
-    const float* B = hcube->ptr<float>(0, (mny+1)*_hist_th_q_no,  mnx   *_hist_th_q_no);
-    const float* C = hcube->ptr<float>(0,  mny   *_hist_th_q_no, (mnx+1)*_hist_th_q_no);
-    const float* D = hcube->ptr<float>(0, (mny+1)*_hist_th_q_no, (mnx+1)*_hist_th_q_no);
+    const float* A = hcube->ptr<float>(0,  mny   ,  mnx   );
+    const float* B = hcube->ptr<float>(0, (mny+1),  mnx   );
+    const float* C = hcube->ptr<float>(0,  mny   , (mnx+1));
+    const float* D = hcube->ptr<float>(0, (mny+1), (mnx+1));
 
     double alpha = mnx+1-x;
     double beta  = mny+1-y;
@@ -1156,7 +1156,7 @@ struct ComputeHistogramsInvoker : ParallelLoopBody
                Rect( 0, 0, layers->at(r).size[2]-1, layers->at(r).size[1]-1 ) )
              ) continue;
 
-          float* hist = layers->at(r).ptr<float>(0,y*_hist_th_q_no,x*_hist_th_q_no);
+          float* hist = layers->at(r).ptr<float>(0,y,x);
 
           for( int h = 0; h < _hist_th_q_no; h++ )
             hist[h] = layers->at(r+1).at<float>(h,y,x);

modules/xfeatures2d/test/test_rotation_and_scale_invariance.cpp

@@ -660,7 +660,7 @@ TEST(Features2d_RotationInvariance_Descriptor_LATCH, regression)
     test.safe_run();
 }
 
-TEST(Features2d_RotationInvariance_Descriptor_DAISY, regression)
+TEST(DISABLED_Features2d_RotationInvariance_Descriptor_DAISY, regression)
 {
     DescriptorRotationInvarianceTest test(BRISK::create(),
                                           DAISY::create(15, 3, 8, 8, DAISY::NRM_NONE, noArray(), true, true),
@@ -754,7 +754,7 @@ TEST(Features2d_RotationInvariance2_Detector_SURF, regression)
     ASSERT_LT( fabs(keypoints[1].response - keypoints[4].response), 1e-6);
 }
 
-TEST(Features2d_ScaleInvariance_Descriptor_DAISY, regression)
+TEST(DISABLED_Features2d_ScaleInvariance_Descriptor_DAISY, regression)
 {
     DescriptorScaleInvarianceTest test(BRISK::create(),
                                        DAISY::create(15, 3, 8, 8, DAISY::NRM_NONE, noArray(), true, true),

modules/ximgproc/testdata/disparityfilter/ROI.xml

-<?xml version="1.0"?>
-<opencv_storage>
-<x>166</x>
-<y>7</y>
-<width>851</width>
-<height>422</height>
-</opencv_storage>

modules/ximgproc/testdata/disparityfilter/reference_accuracy.xml

-<?xml version="1.0"?>
-<opencv_storage>
-<MSE_before>5043.6495</MSE_before>
-<MSE_after>128.3773</MSE_after>
-<BadPercent_before>48.5417</BadPercent_before>
-<BadPercent_after>45.8749</BadPercent_after>
-</opencv_storage>

modules/xphoto/test/simple_color_balance.cpp

@@ -4,8 +4,7 @@ namespace cvtest
 {
     TEST(xphoto_simplecolorbalance, regression)
     {
-        cv::String subfolder = "cv/xphoto/";
-        cv::String dir = cvtest::TS::ptr()->get_data_path() + subfolder + "simple_white_balance/";
+        cv::String dir = cvtest::TS::ptr()->get_data_path() + "cv/xphoto/simple_white_balance/";
         int nTests = 12;
         float threshold = 0.005f;
 
@@ -28,4 +27,4 @@ namespace cvtest
             EXPECT_LE( mse[0]+mse[1]+mse[2]+mse[3], threshold );
         }
     }
-}
+}
\ No newline at end of file

modules/xphoto/test/test_grayworld.cpp

@@ -65,8 +65,7 @@ namespace cvtest {
 
     TEST(xphoto_grayworld_white_balance, regression)
     {
-        String subfolder = "/xphoto/";
-        String dir = cvtest::TS::ptr()->get_data_path() + subfolder + "simple_white_balance/";
+        String dir = cvtest::TS::ptr()->get_data_path() + "cv/xphoto/simple_white_balance/";
         const int nTests = 14;
         const float wb_thresh = 0.5f;
         const float acc_thresh = 2.f;