cnn_3dobj: use ocv_add_testdata

modules/cnn_3dobj/CMakeLists.txt

@@ -33,6 +33,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${Caffe_INCLUDE_DIR})
 set(the_description "CNN for 3D object recognition and pose estimation including a completed Sphere View on 3D objects")
 ocv_define_module(cnn_3dobj opencv_core opencv_imgproc ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS} OPTIONAL opencv_features2d opencv_viz opencv_calib3d WRAP python)
+ocv_add_testdata(testdata/cv contrib/cnn_3dobj)
 
 if(TARGET opencv_test_cnn_3dobj)
   target_link_libraries(opencv_test_cnn_3dobj boost_system)

modules/cnn_3dobj/test/test_cnn_3dobj_feature_extract.cpp

@@ -26,11 +26,11 @@ CV_CNN_Feature_Test::CV_CNN_Feature_Test()
  */
 void CV_CNN_Feature_Test::run(int)
 {
-    String caffemodel = String(ts->get_data_path()) + "3d_triplet_iter_30000.caffemodel";
-    String network_forIMG = cvtest::TS::ptr()->get_data_path() + "3d_triplet_testIMG.prototxt";
+    String caffemodel = cvtest::findDataFile("contrib/cnn_3dobj/3d_triplet_iter_30000.caffemodel");
+    String network_forIMG = cvtest::findDataFile("contrib/cnn_3dobj/3d_triplet_testIMG.prototxt");
     String mean_file = "no";
     std::vector<String> ref_img;
-    String target_img = String(ts->get_data_path()) + "4_78.png";
+    String target_img = cvtest::findDataFile("contrib/cnn_3dobj/4_78.png");
     String feature_blob = "feat";
     String device = "CPU";
     int dev_id = 0;