Merge pull request #1542 from alalek:refactor_test_files

modules/aruco/test/test_arucodetection.cpp

@@ -38,12 +38,8 @@ the use of this software, even if advised of the possibility of such damage.
 
 
 #include "test_precomp.hpp"
-#include <opencv2/aruco.hpp>
-#include <string>
-
-using namespace std;
-using namespace cv;
 
+namespace opencv_test { namespace {
 
 /**
  * @brief Draw 2D synthetic markers and detect them
@@ -118,7 +114,7 @@ void CV_ArucoDetectionSimple::run(int) {
             }
 
             for(int c = 0; c < 4; c++) {
-                double dist = norm(groundTruthCorners[m][c] - corners[idx][c]);
+                double dist = cv::norm(groundTruthCorners[m][c] - corners[idx][c]);  // TODO cvtest
                 if(dist > 0.001) {
                     ts->printf(cvtest::TS::LOG, "Incorrect marker corners position");
                     ts->set_failed_test_info(cvtest::TS::FAIL_BAD_ACCURACY);
@@ -290,7 +286,7 @@ void CV_ArucoDetectionPerspective::run(int) {
                     return;
                 }
                 for(int c = 0; c < 4; c++) {
-                    double dist = norm(groundTruthCorners[c] - corners[0][c]);
+                    double dist = cv::norm(groundTruthCorners[c] - corners[0][c]);  // TODO cvtest
                     if(dist > 5) {
                         ts->printf(cvtest::TS::LOG, "Incorrect marker corners position");
                         ts->set_failed_test_info(cvtest::TS::FAIL_BAD_ACCURACY);
@@ -507,3 +503,5 @@ TEST(CV_ArucoBitCorrection, algorithmic) {
     CV_ArucoBitCorrection test;
     test.safe_run();
 }
+
+}} // namespace

modules/aruco/test/test_boarddetection.cpp

@@ -38,12 +38,8 @@ the use of this software, even if advised of the possibility of such damage.
 
 
 #include "test_precomp.hpp"
-#include <string>
-#include <opencv2/aruco.hpp>
-
-using namespace std;
-using namespace cv;
 
+namespace opencv_test { namespace {
 
 static double deg2rad(double deg) { return deg * CV_PI / 180.; }
 
@@ -237,7 +233,7 @@ void CV_ArucoBoardPose::run(int) {
                                   projectedCorners);
 
                     for(int c = 0; c < 4; c++) {
-                        double repError = norm(projectedCorners[c] - corners[i][c]);
+                        double repError = cv::norm(projectedCorners[c] - corners[i][c]);  // TODO cvtest
                         if(repError > 5.) {
                             ts->printf(cvtest::TS::LOG, "Corner reprojection error too high");
                             ts->set_failed_test_info(cvtest::TS::FAIL_MISMATCH);
@@ -407,3 +403,5 @@ TEST(CV_ArucoBoardPose, CheckNegativeZ)
     out = cv::Point3d(tvec) + rotm*Point3d(board.objPoints[0][0]);
     ASSERT_GT(out.z, 0);
 }
+
+}} // namespace

modules/aruco/test/test_charucodetection.cpp

@@ -38,12 +38,8 @@ the use of this software, even if advised of the possibility of such damage.
 
 
 #include "test_precomp.hpp"
-#include <opencv2/aruco/charuco.hpp>
-#include <string>
-
-using namespace std;
-using namespace cv;
 
+namespace opencv_test { namespace {
 
 static double deg2rad(double deg) { return deg * CV_PI / 180.; }
 
@@ -289,7 +285,7 @@ void CV_CharucoDetection::run(int) {
                         return;
                     }
 
-                    double repError = norm(charucoCorners[i] - projectedCharucoCorners[currentId]);
+                    double repError = cv::norm(charucoCorners[i] - projectedCharucoCorners[currentId]);  // TODO cvtest
 
 
                     if(repError > 5.) {
@@ -394,7 +390,7 @@ void CV_CharucoPoseEstimation::run(int) {
                         return;
                     }
 
-                    double repError = norm(charucoCorners[i] - projectedCharucoCorners[currentId]);
+                    double repError = cv::norm(charucoCorners[i] - projectedCharucoCorners[currentId]);  // TODO cvtest
 
 
                     if(repError > 5.) {
@@ -504,8 +500,7 @@ void CV_CharucoDiamondDetection::run(int) {
 
                 for(unsigned int i = 0; i < 4; i++) {
 
-                    double repError =
-                        norm(diamondCorners[0][i] - projectedDiamondCornersReorder[i]);
+                    double repError = cv::norm(diamondCorners[0][i] - projectedDiamondCornersReorder[i]);  // TODO cvtest
 
                     if(repError > 5.) {
                         ts->printf(cvtest::TS::LOG, "Diamond corner reprojection error too high");
@@ -530,8 +525,7 @@ void CV_CharucoDiamondDetection::run(int) {
                               distCoeffs, projectedDiamondCornersPose);
 
                 for(unsigned int i = 0; i < 4; i++) {
-                    double repError =
-                        norm(projectedDiamondCornersReorder[i] - projectedDiamondCornersPose[i]);
+                    double repError = cv::norm(projectedDiamondCornersReorder[i] - projectedDiamondCornersPose[i]);  // TODO cvtest
 
                     if(repError > 5.) {
                         ts->printf(cvtest::TS::LOG, "Charuco pose error too high");
@@ -562,3 +556,5 @@ TEST(CV_CharucoDiamondDetection, accuracy) {
     CV_CharucoDiamondDetection test;
     test.safe_run();
 }
+
+}} // namespace

modules/aruco/test/test_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN("cv")

modules/aruco/test/test_misc.cpp

@@ -3,7 +3,8 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "test_precomp.hpp"
-#include <opencv2/aruco/charuco.hpp>
+
+namespace opencv_test { namespace {
 
 TEST(CV_ArucoDrawMarker, regression_1226)
 {
@@ -22,3 +23,5 @@ TEST(CV_ArucoDrawMarker, regression_1226)
         board->draw(sz, mat, 0, 1);
     });
 }
+
+}} // namespace

modules/aruco/test/test_precomp.hpp

@@ -1,18 +1,13 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
-#include <iostream>
 #include "opencv2/ts.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/calib3d.hpp"
 #include "opencv2/aruco.hpp"
+#include <opencv2/aruco/charuco.hpp>
 
 #endif

modules/bgsegm/test/test_backgroundsubtractor_gbh.cpp

@@ -1,14 +1,11 @@
-/*
- * BackgroundSubtractorGBH_test.cpp
- *
- *  Created on: Jun 14, 2012
- *      Author: andrewgodbehere
- */
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Author: andrewgodbehere
 #include "test_precomp.hpp"
 
-using namespace cv;
-using namespace cv::bgsegm;
+namespace opencv_test { namespace {
 
 class CV_BackgroundSubtractorTest : public cvtest::BaseTest
 {
@@ -136,3 +133,5 @@ void CV_BackgroundSubtractorTest::run(int)
 }
 
 TEST(VIDEO_BGSUBGMG, accuracy) { CV_BackgroundSubtractorTest test; test.safe_run(); }
+
+}} // namespace

modules/bgsegm/test/test_backgroundsubtractor_lsbp.cpp

@@ -1,9 +1,10 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 #include <set>
 
-using namespace std;
-using namespace cv;
-using namespace cvtest;
+namespace opencv_test { namespace {
 
 static string getDataDir() { return TS::ptr()->get_data_path(); }
 
@@ -135,3 +136,5 @@ TEST(BackgroundSubtractor_LSBP, Accuracy)
     EXPECT_GE(evaluateBGSAlgorithm(bgsegm::createBackgroundSubtractorGSOC()), 0.9);
     EXPECT_GE(evaluateBGSAlgorithm(bgsegm::createBackgroundSubtractorLSBP()), 0.25);
 }
+
+}} // namespace

modules/bgsegm/test/test_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN("cv")

modules/bgsegm/test/test_precomp.hpp

@@ -1,18 +1,16 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
-#include <iostream>
 #include "opencv2/ts.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/bgsegm.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/bgsegm.hpp"
+
+namespace opencv_test {
+using namespace cv::bgsegm;
+}
 
 #endif

modules/bioinspired/perf/opencl/perf_retina.ocl.cpp

@@ -1,12 +1,10 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "../perf_precomp.hpp"
 #include "opencv2/ts/ocl_perf.hpp"
 
-using namespace std::tr1;
-using namespace cv;
-using namespace perf;
-
-namespace cvtest {
-namespace ocl {
+namespace opencv_test { namespace {
 
 ///////////////////////// Retina ////////////////////////
 
@@ -44,4 +42,4 @@ OCL_PERF_TEST_P(RetinaFixture, Retina,
     SANITY_CHECK_NOTHING();
 }
 
-} } // namespace cvtest::ocl
+}} // namespace

modules/bioinspired/perf/perf_precomp.hpp

@@ -1,11 +1,6 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
@@ -14,4 +9,6 @@
 #include "opencv2/ts/ts_perf.hpp"
 #include "opencv2/bioinspired.hpp"
 
+using namespace perf;
+
 #endif

modules/bioinspired/test/test_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN("cv")

modules/bioinspired/test/test_precomp.hpp

@@ -1,16 +1,10 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
 #include "opencv2/bioinspired.hpp"
-#include <iostream>
 
 #endif

modules/bioinspired/test/test_retina_ocl.cpp

@@ -48,8 +48,7 @@
 
 #define RETINA_ITERATIONS 5
 
-namespace cvtest {
-namespace ocl {
+namespace opencv_test { namespace {
 
 PARAM_TEST_CASE(Retina_OCL, bool, int, bool, double, double)
 {
@@ -113,4 +112,4 @@ OCL_INSTANTIATE_TEST_CASE_P(Contrib, Retina_OCL, testing::Combine(
                             testing::Values(1.0, 0.5),
                             testing::Values(10.0, 5.0)));
 
-} } // namespace cvtest::ocl
+}} // namespace

modules/cnn_3dobj/test/test_cnn_3dobj_feature_extract.cpp

@@ -1,11 +1,11 @@
-/*
- *  Created on: Aug 14, 2015
- *      Author: Yida Wang
- */
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Author: Yida Wang
 #include "test_precomp.hpp"
 
-using namespace cv;
+namespace opencv_test { namespace {
 using namespace cv::cnn_3dobj;
 
 class CV_CNN_Feature_Test : public cvtest::BaseTest
@@ -62,3 +62,5 @@ void CV_CNN_Feature_Test::run(int)
 }
 
 TEST(CNN_FEATURE, accuracy) { CV_CNN_Feature_Test test; test.safe_run(); }
+
+}} // namespace

modules/cnn_3dobj/test/test_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN("cv")

modules/cnn_3dobj/test/test_precomp.hpp

@@ -1,11 +1,6 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 

modules/cvv/test/test_debug_flag.cpp

@@ -1,5 +1,10 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
+namespace opencv_test { namespace {
+
 /**
  * Tests whether cvv::debugMode() and cvv::setDebugFlag(bool)`  
  * (from /include/opencv2/debug_mode.hpp) behave correctly.
@@ -13,3 +18,5 @@ TEST(DebugFlagTest, SetAndUnsetDebugMode)
 	cvv::setDebugFlag(true);
 	EXPECT_EQ(cvv::debugMode(), true);
 }
+
+}} // namespace

modules/cvv/test/test_is_any_of.cpp

@@ -1,7 +1,12 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 #include "../src/util/util.hpp"
 
+namespace opencv_test { namespace {
+
 /**
  * Tests whether the `cvv::util::isAnyOf()` function (from /src/util/util.hpp) correctly recognises 
  * the first parameter as element or not element of the data structure in the second parameter 
@@ -37,3 +42,5 @@ TEST(IsAnyOfTest, VectorLongInt)
 	EXPECT_EQ(isAnyOf(3, std::vector<long>{ 1, 2, 3, 4 }), true);
 	EXPECT_EQ(isAnyOf(3, std::vector<long>{ 1, 2, 4 }), false);
 }
+
+}} // namespace

modules/cvv/test/test_location.cpp

@@ -1,5 +1,10 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
+namespace opencv_test { namespace {
+
 /**
  * Tests whether the `CVVISUAL_LOCATION` macro (from /include/opencv2/call_meta_data.hpp)
  * works as expected, i.e. the instance of `cvv::impl::CallMetaData` as which it gets defined has the correct data.
@@ -24,3 +29,5 @@ TEST(LocationTest, EmptyLocation)
 	cvv::impl::CallMetaData loc{};
 	EXPECT_EQ(loc.isKnown, false);
 }
+
+}} // namespace

modules/cvv/test/test_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN(".", /*Empty VA_ARGS for C++11*/)

modules/cvv/test/test_observer_ptr.cpp

@@ -1,7 +1,12 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 #include "../src/util/observer_ptr.hpp"
 
+namespace opencv_test { namespace {
+
 /**
  * Verifies that assigning `nullptr` and a nonzero value to a `cvv::util::ObserverPtr<Int>` 
  * (from /src/util/observer_ptr.hpp) work and that `isNull()` and `getPtr()` return the correct result.
@@ -18,3 +23,5 @@ TEST(ObserverPtrTest, ConstructionAssignment)
 	EXPECT_FALSE(ptr.isNull());
 	EXPECT_EQ(&x, ptr.getPtr());
 }
+
+}} // namespace

modules/cvv/test/test_precomp.hpp

@@ -1,11 +1,6 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 

modules/cvv/test/test_reference.cpp

@@ -2,6 +2,8 @@
 
 #include "../src/util/util.hpp"
 
+namespace opencv_test { namespace {
+
 /**
  * Makes sure that
  * - creating, reassigning and comparing `cvv::util::Reference<int>`s (from /src/util/util.hpp) works, 
@@ -103,3 +105,5 @@ TEST(ReferenceTest, castTo)
 	// should result in a compiler-error:
 	// EXPECT_THROW(baseRef.castTo<std::vector<int>>(), std::bad_cast);
 }
+
+}} // namespace

modules/face/test/test_bif.cpp

@@ -38,6 +38,8 @@ the use of this software, even if advised of the possibility of such damage.
 
 #include "test_precomp.hpp"
 
+namespace opencv_test { namespace {
+
 TEST(CV_Face_BIF, can_create_default) {
     cv::Ptr<cv::face::BIF> bif;
     EXPECT_NO_THROW(bif = cv::face::BIF::create());
@@ -65,3 +67,5 @@ TEST(CV_Face_BIF, can_compute) {
     EXPECT_NO_THROW(bif->compute(image, fea));
     EXPECT_EQ(cv::Size(1, 13188), fea.size());
 }
+
+}} // namespace

modules/face/test/test_face_align.cpp

@@ -1,15 +1,9 @@
 // This file is part of OpenCV project.
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html.
-
 #include "test_precomp.hpp"
-#include "opencv2/imgcodecs.hpp"
-#include "opencv2/face.hpp"
-#include "opencv2/objdetect.hpp"
-#include <vector>
-#include <string>
-using namespace std;
-using namespace cv;
+
+namespace opencv_test { namespace {
 using namespace cv::face;
 
 static bool myDetector( InputArray image, OutputArray ROIs, CascadeClassifier* face_cascade)
@@ -95,3 +89,5 @@ TEST(CV_Face_FacemarkKazemi, can_detect_landmarks) {
     EXPECT_NO_THROW(facemark->fit(img,faces,shapes));
     shapes.clear();
 }
+
+}} // namespace

modules/face/test/test_facemark.cpp

@@ -35,13 +35,8 @@ Mentor: Delia Passalacqua
 */
 
 #include "test_precomp.hpp"
-#include "opencv2/imgcodecs.hpp"
-#include "opencv2/face.hpp"
-#include <vector>
-#include <string>
-using namespace std;
-using namespace cv;
-using namespace cv::face;
+
+namespace opencv_test { namespace {
 
 TEST(CV_Face_Facemark, test_utilities) {
     string image_file = cvtest::findDataFile("face/david1.jpg", true);
@@ -59,3 +54,5 @@ TEST(CV_Face_Facemark, test_utilities) {
     std::vector<Rect> faces;
     EXPECT_TRUE(getFaces(img, faces, &params));
 }
+
+}} // namespace

modules/face/test/test_facemark_aam.cpp

@@ -42,13 +42,8 @@ Mentor: Delia Passalacqua
 */
 
 #include "test_precomp.hpp"
-#include "opencv2/imgcodecs.hpp"
-#include "opencv2/face.hpp"
-#include <vector>
-#include <string>
-using namespace std;
-using namespace cv;
-using namespace cv::face;
+
+namespace opencv_test { namespace {
 
 static bool customDetector( InputArray image, OutputArray ROIs, CascadeClassifier *face_detector){
     Mat gray;
@@ -142,3 +137,5 @@ TEST(CV_Face_FacemarkAAM, test_workflow) {
     EXPECT_TRUE(facemark->getData(&data));
     EXPECT_TRUE(data.s0.size()>0);
 }
+
+}} // namespace

modules/face/test/test_facemark_lbf.cpp

@@ -42,13 +42,8 @@ Mentor: Delia Passalacqua
 */
 
 #include "test_precomp.hpp"
-#include "opencv2/imgcodecs.hpp"
-#include "opencv2/face.hpp"
-#include <vector>
-#include <string>
-using namespace std;
-using namespace cv;
-using namespace cv::face;
+
+namespace opencv_test { namespace {
 
 CascadeClassifier cascade_detector;
 static bool myCustomDetector( InputArray image, OutputArray ROIs, void * config = 0 ){
@@ -141,3 +136,5 @@ TEST(CV_Face_FacemarkLBF, test_workflow) {
     EXPECT_TRUE(facemark->fit(image, rects, facial_points));
     EXPECT_TRUE(facial_points[0].size()>0);
 }
+
+}} // namespace

modules/face/test/test_loadsave.cpp

@@ -38,6 +38,8 @@ the use of this software, even if advised of the possibility of such damage.
 
 #include "test_precomp.hpp"
 
+namespace opencv_test { namespace {
+
 // regression for #1267
 // let's make sure, that both Algorithm::save(String) and
 // FaceRecognizer::write(String) lead to the same result
@@ -78,3 +80,5 @@ TEST(CV_Face_SAVELOAD, use_write) {
     EXPECT_EQ(model2->empty(), false);
     EXPECT_EQ(p1, model2->predict(images[2]));
 }
+
+}} // namespace

modules/face/test/test_precomp.hpp

@@ -1,56 +1,17 @@
-/*
-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)
-
-Copyright (C) 2013, OpenCV Foundation, all rights reserved.
-Third party copyrights are property of their respective owners.
-
-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. In no event shall copyright holders or contributors be liable for
-any direct, indirect, incidental, special, exemplary, or consequential damages
-(including, but not limited to, procurement of substitute goods or services;
-loss of use, data, or profits; or business interruption) however caused
-and on any theory of liability, whether in contract, strict liability,
-or tort (including negligence or otherwise) arising in any way out of
-the use of this software, even if advised of the possibility of such damage.
-*/
-
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
-#include <iostream>
 #include "opencv2/ts.hpp"
 #include "opencv2/imgproc.hpp"
+#include "opencv2/objdetect.hpp"
 #include "opencv2/face.hpp"
 #include "opencv2/face/bif.hpp"
 
+namespace opencv_test {
+using namespace cv::face;
+}
+
 #endif

modules/fuzzy/test/test_f0.cpp

@@ -41,10 +41,7 @@
 
 #include "test_precomp.hpp"
 
-#include <string>
-
-using namespace std;
-using namespace cv;
+namespace opencv_test { namespace {
 
 TEST(fuzzy_f0, components)
 {
@@ -231,4 +228,6 @@ TEST(fuzzy_f0, FL_process_float)
     double n1 = cvtest::norm(exp6, res6, NORM_INF);
 
     EXPECT_LE(n1, 1);
-}
+}
+
+}} // namespace

modules/fuzzy/test/test_f1.cpp

@@ -41,10 +41,7 @@
 
 #include "test_precomp.hpp"
 
-#include <string>
-
-using namespace std;
-using namespace cv;
+namespace opencv_test { namespace {
 
 TEST(fuzzy_f1, elements)
 {
@@ -397,3 +394,5 @@ TEST(fuzzy_f1, inversion)
 
     EXPECT_DOUBLE_EQ(n1, 0);
 }
+
+}} // namespace

modules/fuzzy/test/test_image.cpp

@@ -41,10 +41,7 @@
 
 #include "test_precomp.hpp"
 
-#include <string>
-
-using namespace std;
-using namespace cv;
+namespace opencv_test { namespace {
 
 TEST(fuzzy_image, inpainting)
 {
@@ -111,4 +108,6 @@ TEST(fuzzy_image, kernel)
     double diff = cvtest::norm(kernel1, kernel2, NORM_INF);
 
     EXPECT_DOUBLE_EQ(diff, 0);
-}
+}
+
+}} // namespace

modules/fuzzy/test/test_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN("cv")

modules/fuzzy/test/test_precomp.hpp

@@ -1,11 +1,6 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 

modules/hdf/test/test_hdf5.cpp

@@ -6,14 +6,10 @@
  * @file test_hdf5.cpp
  * @author Fangjun Kuang <csukuangfj dot at gmail dot com>
  * @date December 2017
- *
  */
-#include<stdio.h> // for remove()
-
 #include "test_precomp.hpp"
-#include <vector>
 
-using namespace cv;
+namespace opencv_test { namespace {
 
 struct HDF5_Test : public testing::Test
 {
@@ -150,14 +146,14 @@ TEST_F(HDF5_Test, write_read_dataset_1)
     m_hdf_io->dsread(single, dataset_single_channel);
     EXPECT_EQ(single.type(), m_single_channel.type());
     EXPECT_EQ(single.size(), m_single_channel.size());
-    EXPECT_NEAR(norm(single-m_single_channel), 0, 1e-10);
+    EXPECT_LE(cvtest::norm(single, m_single_channel, NORM_L2), 1e-10);
 
     // read dual channel matrix
     Mat dual;
     m_hdf_io->dsread(dual, dataset_two_channels);
     EXPECT_EQ(dual.type(), m_two_channels.type());
     EXPECT_EQ(dual.size(), m_two_channels.size());
-    EXPECT_NEAR(norm(dual-m_two_channels), 0, 1e-10);
+    EXPECT_LE(cvtest::norm(dual, m_two_channels, NORM_L2), 1e-10);
 
     m_hdf_io->close();
 }
@@ -202,14 +198,14 @@ TEST_F(HDF5_Test, write_read_dataset_2)
     m_hdf_io->dsread(single, dataset_single_channel);
     EXPECT_EQ(single.type(), m_single_channel.type());
     EXPECT_EQ(single.size(), m_single_channel.size());
-    EXPECT_NEAR(norm(single-m_single_channel), 0, 1e-10);
+    EXPECT_LE(cvtest::norm(single, m_single_channel, NORM_L2), 1e-10);
 
     // read dual channel matrix
     Mat dual;
     m_hdf_io->dsread(dual, dataset_two_channels);
     EXPECT_EQ(dual.type(), m_two_channels.type());
     EXPECT_EQ(dual.size(), m_two_channels.size());
-    EXPECT_NEAR(norm(dual-m_two_channels), 0, 1e-10);
+    EXPECT_LE(cvtest::norm(dual, m_two_channels, NORM_L2), 1e-10);
 
     m_hdf_io->close();
 }
@@ -347,8 +343,8 @@ TEST_F(HDF5_Test, test_attribute_InutArray_OutputArray_2d)
         m_hdf_io->atwrite(attr_value, attr_name);
         m_hdf_io->atread(expected_attr_value, attr_name);
 
-        double diff = norm(attr_value - expected_attr_value);
-        EXPECT_NEAR(diff, 0, 1e-6);
+        double diff = cvtest::norm(attr_value, expected_attr_value, NORM_L2);
+        EXPECT_LE(diff, 1e-6);
 
         EXPECT_EQ(attr_value.size, expected_attr_value.size);
         EXPECT_EQ(attr_value.type(), expected_attr_value.type());
@@ -356,3 +352,5 @@ TEST_F(HDF5_Test, test_attribute_InutArray_OutputArray_2d)
 
     m_hdf_io->close();
 }
+
+}} // namespace

modules/hdf/test/test_precomp.hpp

@@ -1,15 +1,6 @@
 // This file is part of OpenCV project.
 // It is subject to the license terms in the LICENSE file found in the top-level directory
 // of this distribution and at http://opencv.org/license.html.
-
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 

modules/img_hash/test/test_average_hash.cpp

@@ -6,7 +6,7 @@
 
 #include <bitset>
 
-using namespace cv;
+namespace opencv_test { namespace {
 
 class CV_AverageHashTest : public cvtest::BaseTest
 {
@@ -56,3 +56,5 @@ void CV_AverageHashTest::run(int )
 }
 
 TEST(average_hash_test, accuracy) { CV_AverageHashTest test; test.safe_run(); }
+
+}} // namespace

modules/img_hash/test/test_block_mean_hash.cpp

@@ -6,7 +6,7 @@
 
 #include <bitset>
 
-using namespace cv;
+namespace opencv_test { namespace {
 using namespace cv::img_hash;
 
 /**
@@ -210,3 +210,5 @@ void CV_BlockMeanHashTest::run(int)
 }
 
 TEST(block_mean_hash_test, accuracy) { CV_BlockMeanHashTest test; test.safe_run(); }
+
+}} // namespace

modules/img_hash/test/test_marr_hildreth_hash.cpp

@@ -4,7 +4,7 @@
 
 #include "test_precomp.hpp"
 
-using namespace cv;
+namespace opencv_test { namespace {
 
 class CV_MarrHildrethTest : public cvtest::BaseTest
 {
@@ -58,3 +58,5 @@ void CV_MarrHildrethTest::run(int )
 }
 
 TEST(marr_hildreth_test, accuracy) { CV_MarrHildrethTest test; test.safe_run(); }
+
+}} // namespace

modules/img_hash/test/test_phash.cpp

@@ -6,7 +6,7 @@
 
 #include <bitset>
 
-using namespace cv;
+namespace opencv_test { namespace {
 
 class CV_PHashTest : public cvtest::BaseTest
 {
@@ -56,3 +56,5 @@ void CV_PHashTest::run(int )
 }
 
 TEST(average_phash_test, accuracy) { CV_PHashTest test; test.safe_run(); }
+
+}} // namespace

modules/img_hash/test/test_precomp.hpp

@@ -1,20 +1,10 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
-#include <iostream>
 #include "opencv2/ts.hpp"
 #include "opencv2/img_hash.hpp"
-#include "opencv2/imgproc.hpp"
-#include "opencv2/core/cvdef.h"
-#include "opencv2/core.hpp"
-#include "opencv2/highgui.hpp"
 
 #endif

modules/img_hash/test/test_radial_variance_hash.cpp

@@ -4,7 +4,7 @@
 
 #include "test_precomp.hpp"
 
-using namespace cv;
+namespace opencv_test { namespace {
 using namespace cv::img_hash;
 
 
@@ -24,7 +24,7 @@ protected:
     //the function "ph_feature_vector" to avoid NaN value
     void testComputeHash();
     void testFeatures();
-    void testHash();
+    //void testHash();  // TODO unused
     void testPixPerLine();
     void testProjection();
 
@@ -76,6 +76,7 @@ void CV_RadialVarianceHashTest::testFeatures()
     }
 }
 
+#if 0 // unused
 void CV_RadialVarianceHashTest::testHash()
 {
     cv::Mat const hash = rvh->getHash();
@@ -95,6 +96,7 @@ void CV_RadialVarianceHashTest::testHash()
         EXPECT_EQ(hash.at<uchar>(0, i), expectResult[i]);
     }
 }
+#endif
 
 void CV_RadialVarianceHashTest::testPixPerLine()
 {
@@ -148,3 +150,5 @@ void CV_RadialVarianceHashTest::run(int)
 }
 
 TEST(radial_variance_hash_test, accuracy) { CV_RadialVarianceHashTest test; test.safe_run(); }
+
+}} // namespace

modules/line_descriptor/perf/perf_descriptors.cpp

@@ -41,12 +41,7 @@
 
 #include "perf_precomp.hpp"
 
-using namespace cv;
-using namespace cv::line_descriptor;
-using namespace std;
-using namespace perf;
-using std::tr1::make_tuple;
-using std::tr1::get;
+namespace opencv_test { namespace {
 
 typedef perf::TestBaseWithParam<std::string> file_str;
 
@@ -75,3 +70,5 @@ PERF_TEST_P(file_str, descriptors, testing::Values(IMAGES))
   SANITY_CHECK_NOTHING();
 
 }
+
+}} // namespace

modules/line_descriptor/perf/perf_detection.cpp

@@ -41,12 +41,7 @@
 
 #include "perf_precomp.hpp"
 
-using namespace cv;
-using namespace cv::line_descriptor;
-using namespace std;
-using namespace perf;
-using std::tr1::make_tuple;
-using std::tr1::get;
+namespace opencv_test { namespace {
 
 typedef perf::TestBaseWithParam<std::string> file_str;
 
@@ -136,3 +131,5 @@ PERF_TEST_P(file_str, detect_lsd, testing::Values(IMAGES))
   SANITY_CHECK_NOTHING();
 
 }
+
+}} // namespace

modules/line_descriptor/perf/perf_matching.cpp

@@ -41,12 +41,7 @@
 
 #include "perf_precomp.hpp"
 
-using namespace cv;
-using namespace cv::line_descriptor;
-using namespace std;
-using namespace perf;
-using std::tr1::make_tuple;
-using std::tr1::get;
+namespace opencv_test { namespace {
 
 #define QUERY_DES_COUNT  300
 #define DIM  32
@@ -185,3 +180,5 @@ PERF_TEST(radius_match, radius_match_distances_test)
 
 }
 
+
+}} // namespace

modules/line_descriptor/perf/perf_precomp.hpp

@@ -38,16 +38,6 @@
  // the use of this software, even if advised of the possibility of such damage.
  //
  //M*/
-
-
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
 #ifndef __OPENCV_PERF_PRECOMP_HPP__
 #define __OPENCV_PERF_PRECOMP_HPP__
 
@@ -55,8 +45,8 @@
 #include "opencv2/highgui.hpp"
 #include "opencv2/line_descriptor.hpp"
 
-#ifdef GTEST_CREATE_SHARED_LIBRARY
-#error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined
-#endif
+namespace opencv_test {
+using namespace cv::line_descriptor;
+}
 
 #endif

modules/line_descriptor/test/test_descriptors_regression.cpp

@@ -41,8 +41,7 @@
 
 #include "test_precomp.hpp"
 
-using namespace cv;
-using namespace cv::line_descriptor;
+namespace opencv_test { namespace {
 
 /****************************************************************************************\
 *            Regression tests for line detector comparing keylines.                 *
@@ -387,3 +386,5 @@ TEST( BinaryDescriptor, no_lines_found )
   binDescriptor->detect(Image, keyLines);
   ASSERT_EQ(keyLines.size(), 0u);
 }
+
+}} // namespace

modules/line_descriptor/test/test_detector_regression.cpp

@@ -41,8 +41,7 @@
 
 #include "test_precomp.hpp"
 
-using namespace cv;
-using namespace cv::line_descriptor;
+namespace opencv_test { namespace {
 
 /****************************************************************************************\
 *            Regression tests for line detector comparing keylines.                 *
@@ -195,7 +194,7 @@ bool CV_BinaryDescriptorDetectorTest::isSimilarKeylines( const KeyLine& k1, cons
   const float maxAngleDif = 2.f;
   const float maxResponseDif = 0.1f;
 
-  float dist = (float) norm( k1.pt - k2.pt );
+  float dist = (float)cv::norm(k1.pt - k2.pt);
   return ( dist < maxPtDif && fabs( k1.size - k2.size ) < maxSizeDif && abs( k1.angle - k2.angle ) < maxAngleDif
       && abs( k1.response - k2.response ) < maxResponseDif && k1.octave == k2.octave && k1.class_id == k2.class_id );
 }
@@ -225,7 +224,7 @@ void CV_BinaryDescriptorDetectorTest::compareKeylineSets( const std::vector<KeyL
     for ( size_t c = 0; c < calcKeylines.size(); c++ )
     {
       progress = update_progress( progress, (int) ( v * calcKeylines.size() + c ), progressCount, 0 );
-      float curDist = (float) norm( calcKeylines[c].pt - validKeylines[v].pt );
+      float curDist = (float)cv::norm(calcKeylines[c].pt - validKeylines[v].pt);
       if( curDist < minDist )
       {
         minDist = curDist;
@@ -337,3 +336,5 @@ TEST( BinaryDescriptor_Detector, regression )
   CV_BinaryDescriptorDetectorTest test( std::string( "edl_detector_keylines_cameraman" ) );
   test.safe_run();
 }
+
+}} // namespace

modules/line_descriptor/test/test_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN("cv")

modules/line_descriptor/test/test_matcher_regression.cpp

@@ -41,8 +41,7 @@
 
 #include "test_precomp.hpp"
 
-using namespace cv;
-using namespace cv::line_descriptor;
+namespace opencv_test { namespace {
 
 class CV_BinaryDescriptorMatcherTest : public cvtest::BaseTest
 {
@@ -577,3 +576,5 @@ TEST( BinaryDescriptor_Matcher, regression)
   CV_BinaryDescriptorMatcherTest test( 0.01f );
   test.safe_run();
 }
+
+}} // namespace

modules/line_descriptor/test/test_precomp.hpp

@@ -1,22 +1,14 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/imgproc.hpp"
-#include "opencv2/highgui.hpp"
 #include "opencv2/line_descriptor.hpp"
-#include <opencv2/core.hpp>
-
 
-#include <iostream>
-#include <string.h>
+namespace opencv_test {
+using namespace cv::line_descriptor;
+}
 
 #endif

modules/optflow/perf/opencl/perf_dis_optflow.cpp

@@ -1,54 +1,13 @@
-/*
- *  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.
- *  In no event shall copyright holders or contributors be liable for any direct,
- *  indirect, incidental, special, exemplary, or consequential damages
- *  (including, but not limited to, procurement of substitute goods or services;
- *  loss of use, data, or profits; or business interruption) however caused
- *  and on any theory of liability, whether in contract, strict liability,
- *  or tort(including negligence or otherwise) arising in any way out of
- *  the use of this software, even if advised of the possibility of such damage.
- */
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "../perf_precomp.hpp"
 #include "opencv2/ts/ocl_perf.hpp"
 
-using std::tr1::tuple;
-using std::tr1::get;
-using namespace perf;
-using namespace testing;
-using namespace cv;
-using namespace cv::optflow;
+namespace opencv_test { namespace {
 
 #ifdef HAVE_OPENCL
 
-namespace cvtest {
-namespace ocl {
-
 void MakeArtificialExample(UMat &dst_frame1, UMat &dst_frame2);
 
 typedef tuple<String, Size> DISParams;
@@ -108,6 +67,6 @@ void MakeArtificialExample(UMat &dst_frame1, UMat &dst_frame2)
     remap(dst_frame2, dst_frame2, displacement_field, Mat(), INTER_LINEAR, BORDER_REPLICATE);
 }
 
-} } // namespace cvtest::ocl
-
 #endif // HAVE_OPENCL
+
+}} // namespace

modules/optflow/perf/perf_deepflow.cpp

@@ -1,47 +1,9 @@
-/*
- *  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.
- *  In no event shall copyright holders or contributors be liable for any direct,
- *  indirect, incidental, special, exemplary, or consequential damages
- *  (including, but not limited to, procurement of substitute goods or services;
- *  loss of use, data, or profits; or business interruption) however caused
- *  and on any theory of liability, whether in contract, strict liability,
- *  or tort(including negligence or otherwise) arising in any way out of
- *  the use of this software, even if advised of the possibility of such damage.
- */
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "perf_precomp.hpp"
 
-using std::tr1::tuple;
-using std::tr1::get;
-using namespace perf;
-using namespace testing;
-using namespace cv;
-using namespace cv::optflow;
+namespace opencv_test { namespace {
 
 typedef tuple<Size> DFParams;
 typedef TestBaseWithParam<DFParams> DenseOpticalFlow_DeepFlow;
@@ -67,3 +29,5 @@ PERF_TEST_P(DenseOpticalFlow_DeepFlow, perf, Values(szVGA, sz720p))
 
     SANITY_CHECK_NOTHING();
 }
+
+}} // namespace

modules/optflow/perf/perf_disflow.cpp

@@ -1,47 +1,9 @@
-/*
- *  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.
- *  In no event shall copyright holders or contributors be liable for any direct,
- *  indirect, incidental, special, exemplary, or consequential damages
- *  (including, but not limited to, procurement of substitute goods or services;
- *  loss of use, data, or profits; or business interruption) however caused
- *  and on any theory of liability, whether in contract, strict liability,
- *  or tort(including negligence or otherwise) arising in any way out of
- *  the use of this software, even if advised of the possibility of such damage.
- */
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "perf_precomp.hpp"
 
-using std::tr1::tuple;
-using std::tr1::get;
-using namespace perf;
-using namespace testing;
-using namespace cv;
-using namespace cv::optflow;
+namespace opencv_test { namespace {
 
 void MakeArtificialExample(Mat &dst_frame1, Mat &dst_frame2);
 
@@ -101,3 +63,5 @@ void MakeArtificialExample(Mat &dst_frame1, Mat &dst_frame2)
 
     remap(dst_frame2, dst_frame2, displacement_field, Mat(), INTER_LINEAR, BORDER_REPLICATE);
 }
+
+}} // namespace

modules/optflow/perf/perf_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "perf_precomp.hpp"
 
 CV_PERF_TEST_MAIN(optflow)

modules/optflow/perf/perf_precomp.hpp

@@ -1,17 +1,15 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_PERF_PRECOMP_HPP__
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/imgproc.hpp"
 #include "opencv2/optflow.hpp"
-#include "opencv2/highgui.hpp"
+
+namespace opencv_test {
+using namespace perf;
+using namespace cv::optflow;
+}
 
 #endif

modules/optflow/perf/perf_variational_refinement.cpp

@@ -1,47 +1,9 @@
-/*
-*  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.
-*  In no event shall copyright holders or contributors be liable for any direct,
-*  indirect, incidental, special, exemplary, or consequential damages
-*  (including, but not limited to, procurement of substitute goods or services;
-*  loss of use, data, or profits; or business interruption) however caused
-*  and on any theory of liability, whether in contract, strict liability,
-*  or tort(including negligence or otherwise) arising in any way out of
-*  the use of this software, even if advised of the possibility of such damage.
-*/
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "perf_precomp.hpp"
 
-using std::tr1::tuple;
-using std::tr1::get;
-using namespace perf;
-using namespace testing;
-using namespace cv;
-using namespace cv::optflow;
+namespace opencv_test { namespace {
 
 typedef tuple<Size, int, int> VarRefParams;
 typedef TestBaseWithParam<VarRefParams> DenseOpticalFlow_VariationalRefinement;
@@ -75,3 +37,5 @@ PERF_TEST_P(DenseOpticalFlow_VariationalRefinement, perf, Combine(Values(szQVGA,
 
     SANITY_CHECK_NOTHING();
 }
+
+}} // namespace

modules/optflow/test/ocl/test_dis.cpp

@@ -44,11 +44,7 @@
 
 #ifdef HAVE_OPENCL
 
-using namespace cv;
-using namespace optflow;
-
-namespace cvtest {
-namespace ocl {
+namespace opencv_test { namespace {
 
 PARAM_TEST_CASE(OCL_DenseOpticalFlow_DIS, int)
 {
@@ -75,7 +71,7 @@ OCL_TEST_P(OCL_DenseOpticalFlow_DIS, Mat)
     Ptr<DenseOpticalFlow> algo;
 
     // iterate over presets:
-    for (int i = 0; i < test_loop_times; i++)
+    for (int i = 0; i < cvtest::ocl::test_loop_times; i++)
     {
         Mat flow;
         UMat ocl_flow;
@@ -95,6 +91,6 @@ OCL_INSTANTIATE_TEST_CASE_P(Contrib, OCL_DenseOpticalFlow_DIS,
                                    DISOpticalFlow::PRESET_FAST,
                                    DISOpticalFlow::PRESET_MEDIUM));
 
-} } // namespace cvtest::ocl
+}} // namespace
 
 #endif // HAVE_OPENCL

modules/optflow/test/ocl/test_motempl.cpp

@@ -10,8 +10,7 @@
 
 #ifdef HAVE_OPENCL
 
-namespace cvtest {
-namespace ocl {
+namespace opencv_test { namespace {
 
 PARAM_TEST_CASE(UpdateMotionHistory, bool)
 {
@@ -47,7 +46,7 @@ PARAM_TEST_CASE(UpdateMotionHistory, bool)
 
 OCL_TEST_P(UpdateMotionHistory, Mat)
 {
-    for (int j = 0; j < test_loop_times; j++)
+    for (int j = 0; j < cvtest::ocl::test_loop_times; j++)
     {
         generateTestData();
 
@@ -62,6 +61,6 @@ OCL_TEST_P(UpdateMotionHistory, Mat)
 
 OCL_INSTANTIATE_TEST_CASE_P(Video, UpdateMotionHistory, Values(false, true));
 
-} } // namespace cvtest::ocl
+}} // namespace
 
 #endif // HAVE_OPENCL

modules/optflow/test/test_OF_accuracy.cpp

@@ -40,12 +40,8 @@
 //M*/
 
 #include "test_precomp.hpp"
-#include <fstream>
 
-using namespace std;
-using namespace cv;
-using namespace cvtest;
-using namespace optflow;
+namespace opencv_test { namespace {
 
 static string getDataDir() { return TS::ptr()->get_data_path(); }
 
@@ -283,3 +279,6 @@ TEST(DenseOpticalFlow_GlobalPatchColliderWHT, ReferenceAccuracy)
     ASSERT_LE(7000U, corr.size());
     ASSERT_LE(calcAvgEPE(corr, GT), 0.5f);
 }
+
+
+}} // namespace

modules/optflow/test/test_OF_reproducibility.cpp

@@ -40,15 +40,8 @@
 //M*/
 
 #include "test_precomp.hpp"
-#include <fstream>
 
-using namespace std;
-using namespace std::tr1;
-using namespace cv;
-using namespace cvtest;
-using namespace perf;
-using namespace testing;
-using namespace optflow;
+namespace opencv_test { namespace {
 
 typedef tuple<Size> OFParams;
 typedef TestWithParam<OFParams> DenseOpticalFlow_DIS;
@@ -157,3 +150,5 @@ TEST_P(DenseOpticalFlow_VariationalRefinement, MultithreadReproducibility)
 }
 
 INSTANTIATE_TEST_CASE_P(FullSet, DenseOpticalFlow_VariationalRefinement, Values(szODD, szQVGA));
+
+}} // namespace

modules/optflow/test/test_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN("cv")

modules/optflow/test/test_motiontemplates.cpp

@@ -41,8 +41,7 @@
 
 #include "test_precomp.hpp"
 
-using namespace cv;
-using namespace std;
+namespace opencv_test { namespace {
 
 ///////////////////// base MHI class ///////////////////////
 class CV_MHIBaseTest : public cvtest::ArrayTest
@@ -498,3 +497,5 @@ int CV_MHIGlobalOrientTest::validate_test_results( int test_case_idx )
 TEST(Video_MHIUpdate, accuracy) { CV_UpdateMHITest test; test.safe_run(); }
 TEST(Video_MHIGradient, accuracy) { CV_MHIGradientTest test; test.safe_run(); }
 TEST(Video_MHIGlobalOrient, accuracy) { CV_MHIGlobalOrientTest test; test.safe_run(); }
+
+}} // namespace

modules/optflow/test/test_precomp.hpp

@@ -1,18 +1,15 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
-#include <iostream>
 #include "opencv2/ts.hpp"
-#include "opencv2/imgproc.hpp"
 #include "opencv2/optflow.hpp"
-#include "opencv2/imgcodecs.hpp"
+
+namespace opencv_test {
+using namespace cv::optflow;
+using namespace perf;
+}
 
 #endif

modules/phase_unwrapping/test/test_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN("cv")

modules/phase_unwrapping/test/test_precomp.hpp

@@ -1,16 +1,10 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
 #include "opencv2/phase_unwrapping.hpp"
-#include <iostream>
 
 #endif

modules/phase_unwrapping/test/test_unwrapping.cpp

@@ -1,48 +1,9 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
- //
- //  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
- //
- //  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
- //
- // Copyright (C) 2015, OpenCV Foundation, all rights reserved.
- // Third party copyrights are property of their respective owners.
- //
- // Redistribution and use in source and binary forms, with or without modification,
- // are permitted provided that the following conditions are met:
- //
- //   * Redistribution's of source code must retain the above copyright notice,
- //     this list of conditions and the following disclaimer.
- //
- //   * Redistribution's 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.
- //
- //   * The name of the copyright holders may not 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.
- // In no event shall the Intel Corporation or contributors be liable for any direct,
- // indirect, incidental, special, exemplary, or consequential damages
- // (including, but not limited to, procurement of substitute goods or services;
- // loss of use, data, or profits; or business interruption) however caused
- // and on any theory of liability, whether in contract, strict liability,
- // or tort (including negligence or otherwise) arising in any way out of
- // the use of this software, even if advised of the possibility of such damage.
- //
- //M*/
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
-using namespace std;
-using namespace cv;
+namespace opencv_test { namespace {
 
 class CV_Unwrapping : public cvtest::BaseTest
 {
@@ -100,4 +61,6 @@ TEST( HistogramPhaseUnwrapping, unwrapPhaseMap )
 {
     CV_Unwrapping test;
     test.safe_run();
-}
+}
+
+}} // namespace

modules/reg/perf/perf_precomp.hpp

@@ -40,23 +40,23 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
 #ifndef __OPENCV_PERF_PRECOMP_HPP__
 #define __OPENCV_PERF_PRECOMP_HPP__
 
-#include "opencv2/core.hpp"
 #include "opencv2/ts.hpp"
 
-#ifdef GTEST_CREATE_SHARED_LIBRARY
-#error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined
-#endif
+#include "opencv2/reg/mapaffine.hpp"
+#include "opencv2/reg/mapshift.hpp"
+#include "opencv2/reg/mapprojec.hpp"
+#include "opencv2/reg/mappergradshift.hpp"
+#include "opencv2/reg/mappergradeuclid.hpp"
+#include "opencv2/reg/mappergradsimilar.hpp"
+#include "opencv2/reg/mappergradaffine.hpp"
+#include "opencv2/reg/mappergradproj.hpp"
+#include "opencv2/reg/mapperpyramid.hpp"
+
+namespace opencv_test {
+using namespace cv::reg;
+}
 
 #endif

modules/reg/perf/perf_reg.cpp

@@ -42,25 +42,10 @@
 //M*/
 
 #include "perf_precomp.hpp"
-#include "opencv2/ts.hpp"
-
-#include "opencv2/reg/mapaffine.hpp"
-#include "opencv2/reg/mapshift.hpp"
-#include "opencv2/reg/mapprojec.hpp"
-#include "opencv2/reg/mappergradshift.hpp"
-#include "opencv2/reg/mappergradeuclid.hpp"
-#include "opencv2/reg/mappergradsimilar.hpp"
-#include "opencv2/reg/mappergradaffine.hpp"
-#include "opencv2/reg/mappergradproj.hpp"
-#include "opencv2/reg/mapperpyramid.hpp"
-
-using namespace std;
-using namespace std::tr1;
-using namespace testing;
-using namespace perf;
-using namespace cv;
-using namespace cv::reg;
 
+namespace opencv_test { namespace {
+
+using namespace perf;
 
 Vec<double, 2> perfShift(const Mat& img1)
 {
@@ -274,3 +259,5 @@ PERF_TEST_P(Size_MatType, Registration_Projective,
 
     SANITY_CHECK_NOTHING();
 }
+
+}} // namespace

modules/reg/test/test_precomp.hpp

@@ -40,21 +40,23 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
-#include "opencv2/opencv_modules.hpp"
-#include "opencv2/core.hpp"
-#include "opencv2/imgproc.hpp"
 #include "opencv2/ts.hpp"
 
+#include "opencv2/reg/mapaffine.hpp"
+#include "opencv2/reg/mapshift.hpp"
+#include "opencv2/reg/mapprojec.hpp"
+#include "opencv2/reg/mappergradshift.hpp"
+#include "opencv2/reg/mappergradeuclid.hpp"
+#include "opencv2/reg/mappergradsimilar.hpp"
+#include "opencv2/reg/mappergradaffine.hpp"
+#include "opencv2/reg/mappergradproj.hpp"
+#include "opencv2/reg/mapperpyramid.hpp"
+
+namespace opencv_test {
+using namespace cv::reg;
+}
+
 #endif

modules/reg/test/test_reg.cpp

@@ -42,22 +42,8 @@
 //M*/
 
 #include "test_precomp.hpp"
-#include <opencv2/imgcodecs.hpp>
-#include <opencv2/core.hpp>
-
-#include "opencv2/reg/mapaffine.hpp"
-#include "opencv2/reg/mapshift.hpp"
-#include "opencv2/reg/mapprojec.hpp"
-#include "opencv2/reg/mappergradshift.hpp"
-#include "opencv2/reg/mappergradeuclid.hpp"
-#include "opencv2/reg/mappergradsimilar.hpp"
-#include "opencv2/reg/mappergradaffine.hpp"
-#include "opencv2/reg/mappergradproj.hpp"
-#include "opencv2/reg/mapperpyramid.hpp"
-
-using namespace std;
-using namespace cv;
-using namespace cv::reg;
+
+namespace opencv_test { namespace {
 
 #define REG_DEBUG_OUTPUT 0
 
@@ -100,7 +86,7 @@ void RegTest::testShift()
     // Check accuracy
     Ptr<Map> mapInv(mapShift->inverseMap());
     mapTest.compose(mapInv);
-    double shNorm = norm(mapTest.getShift());
+    double shNorm = cv::norm(mapTest.getShift());
     EXPECT_LE(shNorm, 0.1);
 }
 
@@ -134,9 +120,9 @@ void RegTest::testEuclidean()
     // Check accuracy
     Ptr<Map> mapInv(mapAff->inverseMap());
     mapTest.compose(mapInv);
-    double shNorm = norm(mapTest.getShift());
+    double shNorm = cv::norm(mapTest.getShift());
     EXPECT_LE(shNorm, 0.1);
-    double linTrNorm = norm(mapTest.getLinTr());
+    double linTrNorm = cv::norm(mapTest.getLinTr());
     EXPECT_LE(linTrNorm, sqrt(2.) + 0.01);
     EXPECT_GE(linTrNorm, sqrt(2.) - 0.01);
 }
@@ -173,9 +159,9 @@ void RegTest::testSimilarity()
     // Check accuracy
     Ptr<Map> mapInv(mapAff->inverseMap());
     mapTest.compose(mapInv);
-    double shNorm = norm(mapTest.getShift());
+    double shNorm = cv::norm(mapTest.getShift());
     EXPECT_LE(shNorm, 0.1);
-    double linTrNorm = norm(mapTest.getLinTr());
+    double linTrNorm = cv::norm(mapTest.getLinTr());
     EXPECT_LE(linTrNorm, sqrt(2.) + 0.01);
     EXPECT_GE(linTrNorm, sqrt(2.) - 0.01);
 }
@@ -208,9 +194,9 @@ void RegTest::testAffine()
     // Check accuracy
     Ptr<Map> mapInv(mapAff->inverseMap());
     mapTest.compose(mapInv);
-    double shNorm = norm(mapTest.getShift());
+    double shNorm = cv::norm(mapTest.getShift());
     EXPECT_LE(shNorm, 0.1);
-    double linTrNorm = norm(mapTest.getLinTr());
+    double linTrNorm = cv::norm(mapTest.getLinTr());
     EXPECT_LE(linTrNorm, sqrt(2.) + 0.01);
     EXPECT_GE(linTrNorm, sqrt(2.) - 0.01);
 }
@@ -242,7 +228,7 @@ void RegTest::testProjective()
     // Check accuracy
     Ptr<Map> mapInv(mapProj->inverseMap());
     mapTest.compose(mapInv);
-    double projNorm = norm(mapTest.getProjTr());
+    double projNorm = cv::norm(mapTest.getProjTr());
     EXPECT_LE(projNorm, sqrt(3.) + 0.01);
     EXPECT_GE(projNorm, sqrt(3.) - 0.01);
 }
@@ -298,3 +284,5 @@ TEST_F(RegTest, projective_dt64fc1)
     loadImage(CV_64FC1);
     testProjective();
 }
+
+}} // namespace

modules/rgbd/test/test_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN("cv")

modules/rgbd/test/test_normal.cpp

@@ -37,65 +37,25 @@
 #include <opencv2/rgbd.hpp>
 #include <opencv2/calib3d.hpp>
 
-namespace cv
-{
-namespace rgbd
-{
-
-class TickMeter
-{
-public:
-    TickMeter();
-    void start();
-    void stop();
-
-    int64 getTimeTicks() const;
-    double getTimeMicro() const;
-    double getTimeMilli() const;
-    double getTimeSec()   const;
-    int64 getCounter() const;
-
-    void reset();
-private:
-    int64 counter;
-    int64 sumTime;
-    int64 startTime;
-};
+namespace opencv_test { namespace {
 
-TickMeter::TickMeter() { reset(); }
-int64 TickMeter::getTimeTicks() const { return sumTime; }
-double TickMeter::getTimeSec()   const { return (double)getTimeTicks()/getTickFrequency(); }
-double TickMeter::getTimeMilli() const { return getTimeSec()*1e3; }
-double TickMeter::getTimeMicro() const { return getTimeMilli()*1e3; }
-int64 TickMeter::getCounter() const { return counter; }
-void  TickMeter::reset() {startTime = 0; sumTime = 0; counter = 0; }
-
-void TickMeter::start(){ startTime = getTickCount(); }
-void TickMeter::stop()
+#if 0
+Point3f
+rayPlaneIntersection(Point2f uv, const Mat& centroid, const Mat& normal, const Mat_<float>& Kinv)
 {
-    int64 time = getTickCount();
-    if ( startTime == 0 )
-        return;
-
-    ++counter;
-
-    sumTime += ( time - startTime );
-    startTime = 0;
+  Matx33d dKinv(Kinv);
+  Vec3d dNormal(normal);
+  return rayPlaneIntersection(Vec3d(uv.x, uv.y, 1), centroid.dot(normal), dNormal, dKinv);
 }
-
-Point3f
-rayPlaneIntersection(Point2f uv, const Mat& centroid, const Mat& normal, const Mat_<float>& Kinv);
+#endif
 
-Vec3f
-rayPlaneIntersection(const Vec3d& uv1, double centroid_dot_normal, const Vec3d& normal,
-                     const Matx33d& Kinv);
 Vec3f
 rayPlaneIntersection(const Vec3d& uv1, double centroid_dot_normal, const Vec3d& normal, const Matx33d& Kinv)
 {
 
   Matx31d L = Kinv * uv1; //a ray passing through camera optical center
   //and uv.
-  L = L * (1.0 / norm(L));
+  L = L * (1.0 / cv::norm(L));
   double LdotNormal = L.dot(normal);
   double d;
   if (std::fabs(LdotNormal) > 1e-9)
@@ -111,18 +71,9 @@ rayPlaneIntersection(const Vec3d& uv1, double centroid_dot_normal, const Vec3d&
   Vec3f xyz((float)(d * L(0)), (float)(d * L(1)), (float)(d * L(2)));
   return xyz;
 }
-
-Point3f
-rayPlaneIntersection(Point2f uv, const Mat& centroid, const Mat& normal, const Mat_<float>& Kinv)
-{
-  Matx33d dKinv(Kinv);
-  Vec3d dNormal(normal);
-  return rayPlaneIntersection(Vec3d(uv.x, uv.y, 1), centroid.dot(normal), dNormal, dKinv);
-}
-
 const int W = 640;
 const int H = 480;
-int window_size = 5;
+//int window_size = 5;
 float focal_length = 525;
 float cx = W / 2.f + 0.5f;
 float cy = H / 2.f + 0.5f;
@@ -170,7 +121,7 @@ struct Plane
     n[0] = rng.uniform(-0.5, 0.5);
     n[1] = rng.uniform(-0.5, 0.5);
     n[2] = -0.3; //rng.uniform(-1.f, 0.5f);
-    n = n / norm(n);
+    n = n / cv::norm(n);
     set_d((float)rng.uniform(-2.0, 0.6));
   }
 
@@ -188,9 +139,6 @@ struct Plane
   }
 };
 
-void
-gen_points_3d(std::vector<Plane>& planes_out, Mat_<unsigned char> &plane_mask, Mat& points3d, Mat& normals,
-              int n_planes);
 void
 gen_points_3d(std::vector<Plane>& planes_out, Mat_<unsigned char> &plane_mask, Mat& points3d, Mat& normals,
               int n_planes)
@@ -391,8 +339,8 @@ protected:
       for (int x = 0; x < normals.cols; ++x)
       {
         Vec3f vec1 = normals(y, x), vec2 = ground_normals(y, x);
-        vec1 = vec1 / norm(vec1);
-        vec2 = vec2 / norm(vec2);
+        vec1 = vec1 / cv::norm(vec1);
+        vec2 = vec2 / cv::norm(vec2);
 
         float dot = vec1.dot(vec2);
         // Just for rounding errors
@@ -508,19 +456,18 @@ protected:
   }
 };
 
-}
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 TEST(Rgbd_Normals, compute)
 {
-  cv::rgbd::CV_RgbdNormalsTest test;
+  CV_RgbdNormalsTest test;
   test.safe_run();
 }
 
 TEST(Rgbd_Plane, compute)
 {
-  cv::rgbd::CV_RgbdPlaneTest test;
+  CV_RgbdPlaneTest test;
   test.safe_run();
 }
+
+}} // namespace

modules/rgbd/test/test_odometry.cpp

@@ -35,14 +35,7 @@
 
 #include "test_precomp.hpp"
 
-#include <opencv2/calib3d.hpp>
-#include <opencv2/highgui.hpp>
-#include <opencv2/imgproc.hpp>
-
-namespace cv
-{
-namespace rgbd
-{
+namespace opencv_test { namespace {
 
 #define SHOW_DEBUG_LOG     0
 #define SHOW_DEBUG_IMAGES  0
@@ -254,7 +247,7 @@ void CV_OdometryTest::run(int)
         ts->printf(cvtest::TS::LOG, "Can not find Rt between the same frame");
         ts->set_failed_test_info(cvtest::TS::FAIL_INVALID_OUTPUT);
     }
-    double diff = norm(calcRt, Mat::eye(4,4,CV_64FC1));
+    double diff = cv::norm(calcRt, Mat::eye(4,4,CV_64FC1));
     if(diff > DBL_EPSILON)
     {
         ts->printf(cvtest::TS::LOG, "Incorrect transformation between the same frame (not the identity matrix), diff = %f", diff);
@@ -298,10 +291,10 @@ void CV_OdometryTest::run(int)
 
 
         // compare rotation
-        double rdiffnorm = norm(rvec - calcRvec),
-               rnorm = norm(rvec);
-        double tdiffnorm = norm(tvec - calcTvec), 
-               tnorm = norm(tvec);
+        double rdiffnorm = cv::norm(rvec - calcRvec),
+               rnorm = cv::norm(rvec);
+        double tdiffnorm = cv::norm(tvec - calcTvec),
+               tnorm = cv::norm(tvec);
         if(rdiffnorm < rnorm &&  tdiffnorm < tnorm)
             better_1time_count++;
         if(5. * rdiffnorm < rnorm && 5 * tdiffnorm < tnorm)
@@ -333,23 +326,24 @@ void CV_OdometryTest::run(int)
 /****************************************************************************************\
 *                                Tests registrations                                     *
 \****************************************************************************************/
-}
-}
 
 TEST(RGBD_Odometry_Rgbd, algorithmic)
 {
-    cv::rgbd::CV_OdometryTest test(cv::rgbd::Odometry::create("RgbdOdometry"), 0.99, 0.94);
+    CV_OdometryTest test(cv::rgbd::Odometry::create("RgbdOdometry"), 0.99, 0.94);
     test.safe_run();
 }
 
 TEST(DISABLED_RGBD_Odometry_ICP, algorithmic)
 {
-    cv::rgbd::CV_OdometryTest test(cv::rgbd::Odometry::create("ICPOdometry"), 0.99, 0.99);
+    CV_OdometryTest test(cv::rgbd::Odometry::create("ICPOdometry"), 0.99, 0.99);
     test.safe_run();
 }
 
 TEST(DISABLED_RGBD_Odometry_RgbdICP, algorithmic)
 {
-    cv::rgbd::CV_OdometryTest test(cv::rgbd::Odometry::create("RgbdICPOdometry"), 0.99, 0.99);
+    CV_OdometryTest test(cv::rgbd::Odometry::create("RgbdICPOdometry"), 0.99, 0.99);
     test.safe_run();
 }
+
+
+}} // namespace

modules/rgbd/test/test_precomp.hpp

@@ -1,8 +1,15 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
 #include <opencv2/ts.hpp>
 #include <opencv2/rgbd.hpp>
-#include <iostream>
+#include <opencv2/calib3d.hpp>
+
+namespace opencv_test {
+using namespace cv::rgbd;
+}
 
 #endif

modules/rgbd/test/test_registration.cpp

@@ -44,11 +44,7 @@
 
 #include "test_precomp.hpp"
 
-
-namespace cv
-{
-namespace rgbd
-{
+namespace opencv_test { namespace {
 
 class CV_RgbdDepthRegistrationTest: public cvtest::BaseTest
 {
@@ -149,12 +145,11 @@ private:
 
 };
 
-
-}
-}
-
 TEST(Rgbd_DepthRegistration, compute)
 {
-  cv::rgbd::CV_RgbdDepthRegistrationTest test;
+  CV_RgbdDepthRegistrationTest test;
   test.safe_run();
 }
+
+
+}} // namespace

modules/rgbd/test/test_utils.cpp

@@ -1,11 +1,9 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
-#include <opencv2/calib3d.hpp>
-
-namespace cv
-{
-namespace rgbd
-{
+namespace opencv_test { namespace {
 
 class CV_RgbdDepthTo3dTest: public cvtest::BaseTest
 {
@@ -47,7 +45,7 @@ protected:
       float avg_diff = 0;
       for (int y = 0; y < rows; ++y)
         for (int x = 0; x < cols; ++x)
-          avg_diff += (float)norm(image_points.at<Vec2f>(y,x) - Vec2f((float)x,(float)y));
+          avg_diff += (float)cv::norm(image_points.at<Vec2f>(y,x) - Vec2f((float)x,(float)y));
 
       // Verify the function works
       ASSERT_LE(avg_diff/rows/cols, 1e-4) << "Average error for ground truth is: " << (avg_diff / rows / cols);
@@ -59,11 +57,12 @@ protected:
   }
 };
 
-}
-}
 
 TEST(Rgbd_DepthTo3d, compute)
 {
-  cv::rgbd::CV_RgbdDepthTo3dTest test;
+  CV_RgbdDepthTo3dTest test;
   test.safe_run();
 }
+
+
+}} // namespace

modules/sfm/test/test_common.cpp

@@ -1,16 +1,11 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
-#include <fstream>
-#include <cstdlib>
+namespace opencv_test {
 
-using namespace cv;
-using namespace cv::sfm;
-using namespace std;
-
-namespace cvtest
-{
-
-void generateTwoViewRandomScene( cvtest::TwoViewDataSet &data )
+void generateTwoViewRandomScene( TwoViewDataSet &data )
 {
     vector<Mat_<double> > points2d;
     vector<cv::Matx33d> Rs;
@@ -83,7 +78,7 @@ expectFundamentalProperties( const cv::Matx33d &F,
 void
 parser_2D_tracks(const string &_filename, std::vector<Mat> &points2d )
 {
-  ifstream myfile(_filename.c_str());
+  std::ifstream myfile(_filename.c_str());
 
   if (!myfile.is_open())
       CV_Error(cv::Error::StsError, string("Unable to read file: ") + _filename + "\n");
@@ -96,7 +91,7 @@ parser_2D_tracks(const string &_filename, std::vector<Mat> &points2d )
 
     while ( getline(myfile, line_str) )
     {
-      istringstream line(line_str);
+      std::istringstream line(line_str);
 
       if ( track > n_tracks )
       {
@@ -126,4 +121,4 @@ parser_2D_tracks(const string &_filename, std::vector<Mat> &points2d )
 
 }
 
-} // namespace cvtest
+} // namespace

modules/sfm/test/test_conditioning.cpp

@@ -35,9 +35,7 @@
 
 #include "test_precomp.hpp"
 
-using namespace cv;
-using namespace cv::sfm;
-using namespace std;
+namespace opencv_test { namespace {
 
 TEST(Sfm_conditioning, normalizePoints)
 {
@@ -62,3 +60,5 @@ TEST(Sfm_conditioning, normalizeIsotropicPoints)
 {
   //TODO: implement me
 }
+
+}} // namespace

modules/sfm/test/test_fundamental.cpp

@@ -35,10 +35,7 @@
 
 #include "test_precomp.hpp"
 
-using namespace cv;
-using namespace cv::sfm;
-using namespace cvtest;
-using namespace std;
+namespace opencv_test { namespace {
 
 TEST(Sfm_fundamental, fundamentalFromProjections)
 {
@@ -88,7 +85,7 @@ TEST(Sfm_fundamental, motionFromEssential)
 {
     double tolerance = 1e-8;
 
-    cvtest::TwoViewDataSet d;
+    TwoViewDataSet d;
     generateTwoViewRandomScene(d);
 
     Matx33d E;
@@ -105,7 +102,7 @@ TEST(Sfm_fundamental, motionFromEssential)
     bool one_solution_is_correct = false;
     for ( int i = 0; i < Rs.size(); ++i )
     {
-        if ( (norm(Rs[i], R) < tolerance) && (norm(ts[i], t) < tolerance) )
+        if ( (cvtest::norm(Rs[i], R, NORM_L2) < tolerance) && (cvtest::norm(ts[i], t, NORM_L2) < tolerance) )
         {
             one_solution_is_correct = true;
             break;
@@ -171,6 +168,8 @@ TEST(Sfm_fundamental, motionFromEssentialChooseSolution)
 
     EXPECT_LE(0, solution);
     EXPECT_LE(solution, 3);
-    EXPECT_LE(norm(Rs[solution]-Mat(R)), 1e-8);
-    EXPECT_LE(norm(ts[solution]-Mat(t)), 1e-8);
-}
+    EXPECT_LE(cvtest::norm(Rs[solution], Mat(R), NORM_L2), 1e-8);
+    EXPECT_LE(cvtest::norm(ts[solution], Mat(t), NORM_L2), 1e-8);
+}
+
+}} // namespace

modules/sfm/test/test_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN("cv")

modules/sfm/test/test_numeric.cpp

@@ -35,10 +35,7 @@
 
 #include "test_precomp.hpp"
 
-using namespace cv;
-using namespace cv::sfm;
-using namespace std;
-
+namespace opencv_test { namespace {
 
 template<typename T>
 static void
@@ -89,3 +86,6 @@ TEST(Sfm_numeric, skewMat)
   EXPECT_DOUBLE_EQ( bx(0,2), -bx(2,0) );
   EXPECT_DOUBLE_EQ( bx(1,2), -bx(2,1) );
 }
+
+
+}} // namespace

modules/sfm/test/test_precomp.hpp

@@ -1,7 +1,6 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
@@ -20,8 +19,9 @@
         return;\
     }
 
-namespace cvtest
+namespace opencv_test
 {
+  using namespace cv::sfm;
 
   template<typename T>
   inline void
@@ -64,7 +64,7 @@ namespace cvtest
   cosinusBetweenMatrices(const T &a, const T &b)
   {
     double s = cv::sum( a.mul(b) )[0];
-    return ( s / norm(a) / norm(b) );
+    return ( s / cv::norm(a) / cv::norm(b) );
   }
 
   // Check that sin(angle(a, b)) < tolerance
@@ -135,6 +135,6 @@ namespace cvtest
   void
   parser_2D_tracks(const std::string &_filename, std::vector<cv::Mat> &points2d );
 
-} // namespace cvtest
+} // namespace
 
 #endif

modules/sfm/test/test_projection.cpp

@@ -36,10 +36,7 @@
 #include "test_precomp.hpp"
 #include <opencv2/sfm/projection.hpp>
 
-using namespace cv;
-using namespace cv::sfm;
-using namespace cvtest;
-using namespace std;
+namespace opencv_test { namespace {
 
 TEST(Sfm_projection, homogeneousToEuclidean)
 {
@@ -117,3 +114,6 @@ TEST(Sfm_projection, P_From_KRt)
   // TODO: Change the code to ensure det(R) == 1, which is not currently
   // the case. Also add a test for that here.
 }
+
+
+}} // namespace

modules/sfm/test/test_reconstruct.cpp

@@ -35,9 +35,7 @@
 
 #include "test_precomp.hpp"
 
-using namespace cv;
-using namespace cv::sfm;
-using namespace std;
+namespace opencv_test { namespace {
 
 /* Check projection errors */
 static void
@@ -94,3 +92,5 @@ TEST(Sfm_reconstruct, twoViewProjectiveOutliers)
 }
 
 #endif /* CERES_FOUND */
+
+}} // namespace

modules/sfm/test/test_robust.cpp

@@ -36,11 +36,7 @@
 #include "test_precomp.hpp"
 #include "opencv2/sfm/robust.hpp"
 
-using namespace cv;
-using namespace cv::sfm;
-using namespace cvtest;
-using namespace std;
-
+namespace opencv_test { namespace {
 
 TEST(Sfm_robust, fundamentalFromCorrespondences8PointRobust)
 {
@@ -81,7 +77,7 @@ TEST(Sfm_robust, fundamentalFromCorrespondences8PointRobust)
 TEST(Sfm_robust, fundamentalFromCorrespondences8PointRealisticNoOutliers)
 {
     double tolerance = 1e-8;
-    cvtest::TwoViewDataSet d;
+    TwoViewDataSet d;
     generateTwoViewRandomScene(d);
 
     Matx33d F_estimated;
@@ -140,7 +136,7 @@ TEST(Sfm_robust, fundamentalFromCorrespondences7PointRobust)
 TEST(Sfm_robust, fundamentalFromCorrespondences7PointRealisticNoOutliers)
 {
     double tolerance = 1e-8;
-    cvtest::TwoViewDataSet d;
+    TwoViewDataSet d;
     generateTwoViewRandomScene(d);
 
     Matx33d F_estimated;
@@ -157,4 +153,6 @@ TEST(Sfm_robust, fundamentalFromCorrespondences7PointRealisticNoOutliers)
 
     // Check fundamental properties.
     expectFundamentalProperties( F_estimated, d.x1, d.x2, tolerance);
-}
+}
+
+}} // namespace

modules/sfm/test/test_simple_pipeline.cpp

@@ -39,10 +39,7 @@
 
 #include <opencv2/sfm/simple_pipeline.hpp>
 
-using namespace cv;
-using namespace cv::sfm;
-using namespace cvtest;
-using namespace std;
+namespace opencv_test { namespace {
 
 const string SFM_DIR = "sfm";
 const string TRACK_FILENAME = "backyard_tracks.txt";
@@ -86,4 +83,5 @@ TEST(Sfm_simple_pipeline, backyard)
                               // UPDATE:  1.38894
 }
 
+}} // namespace
 #endif /* CERES_FOUND */

modules/sfm/test/test_triangulation.cpp

@@ -35,9 +35,7 @@
 
 #include "test_precomp.hpp"
 
-using namespace cv;
-using namespace cv::sfm;
-using namespace std;
+namespace opencv_test { namespace {
 
 static void
 checkTriangulation(int nviews, int npoints, bool is_projective, float err_max2d, float err_max3d)
@@ -66,12 +64,12 @@ checkTriangulation(int nviews, int npoints, bool is_projective, float err_max2d,
             homogeneousToEuclidean( cv::Mat(Ps[k])*X_homogeneous.col(i), x_reprojected );
 
             // Check reprojection error. Should be nearly zero.
-            double error = norm( x_reprojected - points2d[k].col(i) );
+            double error = cvtest::norm(x_reprojected, points2d[k].col(i), NORM_L2);
             EXPECT_LE(error*error, err_max2d);
         }
 
         // Check 3d error. Should be nearly zero.
-        double error = norm( X.col(i) - points3d.col(i) );
+        double error = cvtest::norm(X.col(i), points3d.col(i), NORM_L2);
         EXPECT_LE(error*error, err_max3d);
     }
 }
@@ -94,3 +92,6 @@ TEST(Sfm_triangulate, NViewTriangulate_FiveViews)
 
     checkTriangulation(nviews, npoints, is_projective, 1e-7, 1e-9);
 }
+
+
+}} // namespace

modules/stereo/perf/perf_bm.cpp

@@ -42,12 +42,9 @@
 
 #include "perf_precomp.hpp"
 
-using namespace std;
-using namespace cv;
-using namespace cv::stereo;
-using namespace perf;
+namespace opencv_test { namespace {
 
-typedef std::tr1::tuple<Size, MatType, MatDepth> s_bm_test_t;
+typedef tuple<Size, MatType, MatDepth> s_bm_test_t;
 typedef perf::TestBaseWithParam<s_bm_test_t> s_bm;
 
 PERF_TEST_P( s_bm, sgm_perf,
@@ -58,9 +55,9 @@ PERF_TEST_P( s_bm, sgm_perf,
             )
             )
 {
-    Size sz = std::tr1::get<0>(GetParam());
-    int matType = std::tr1::get<1>(GetParam());
-    int sdepth = std::tr1::get<2>(GetParam());
+    Size sz = get<0>(GetParam());
+    int matType = get<1>(GetParam());
+    int sdepth = get<2>(GetParam());
 
     Mat left(sz, matType);
     Mat right(sz, matType);
@@ -85,9 +82,9 @@ PERF_TEST_P( s_bm, bm_perf,
             )
             )
 {
-    Size sz = std::tr1::get<0>(GetParam());
-    int matType = std::tr1::get<1>(GetParam());
-    int sdepth = std::tr1::get<2>(GetParam());
+    Size sz = get<0>(GetParam());
+    int matType = get<1>(GetParam());
+    int sdepth = get<2>(GetParam());
 
     Mat left(sz, matType);
     Mat right(sz, matType);
@@ -116,3 +113,6 @@ PERF_TEST_P( s_bm, bm_perf,
     }
     SANITY_CHECK(out1);
 }
+
+
+}} // namespace

modules/stereo/perf/perf_descriptor.cpp

@@ -41,12 +41,9 @@
 //M*/
 #include "perf_precomp.hpp"
 
-using namespace std;
-using namespace cv;
-using namespace cv::stereo;
-using namespace perf;
+namespace opencv_test { namespace {
 
-typedef std::tr1::tuple<Size, MatType, MatDepth> descript_params_t;
+typedef tuple<Size, MatType, MatDepth> descript_params_t;
 typedef perf::TestBaseWithParam<descript_params_t> descript_params;
 
 PERF_TEST_P( descript_params, census_sparse_descriptor,
@@ -57,9 +54,9 @@ PERF_TEST_P( descript_params, census_sparse_descriptor,
             )
             )
 {
-    Size sz = std::tr1::get<0>(GetParam());
-    int matType = std::tr1::get<1>(GetParam());
-    int sdepth = std::tr1::get<2>(GetParam());
+    Size sz = get<0>(GetParam());
+    int matType = get<1>(GetParam());
+    int sdepth = get<2>(GetParam());
     Mat left(sz, matType);
     Mat out1(sz, sdepth);
     declare.in(left, WARMUP_RNG)
@@ -79,9 +76,9 @@ PERF_TEST_P( descript_params, star_census_transform,
             )
             )
 {
-    Size sz = std::tr1::get<0>(GetParam());
-    int matType = std::tr1::get<1>(GetParam());
-    int sdepth = std::tr1::get<2>(GetParam());
+    Size sz = get<0>(GetParam());
+    int matType = get<1>(GetParam());
+    int sdepth = get<2>(GetParam());
     Mat left(sz, matType);
     Mat out1(sz, sdepth);
     declare.in(left, WARMUP_RNG)
@@ -101,9 +98,9 @@ PERF_TEST_P( descript_params, modified_census_transform,
             )
             )
 {
-    Size sz = std::tr1::get<0>(GetParam());
-    int matType = std::tr1::get<1>(GetParam());
-    int sdepth = std::tr1::get<2>(GetParam());
+    Size sz = get<0>(GetParam());
+    int matType = get<1>(GetParam());
+    int sdepth = get<2>(GetParam());
 
     Mat left(sz, matType);
     Mat out1(sz, sdepth);
@@ -125,9 +122,9 @@ PERF_TEST_P( descript_params, center_symetric_census,
             )
             )
 {
-    Size sz = std::tr1::get<0>(GetParam());
-    int matType = std::tr1::get<1>(GetParam());
-    int sdepth = std::tr1::get<2>(GetParam());
+    Size sz = get<0>(GetParam());
+    int matType = get<1>(GetParam());
+    int sdepth = get<2>(GetParam());
 
     Mat left(sz, matType);
     Mat out1(sz, sdepth);
@@ -141,3 +138,6 @@ PERF_TEST_P( descript_params, center_symetric_census,
     }
     SANITY_CHECK(out1);
 }
+
+
+}} // namespace

modules/stereo/perf/perf_precomp.hpp

@@ -1,32 +1,18 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_PERF_PRECOMP_HPP__
 #define __OPENCV_PERF_PRECOMP_HPP__
 
-#include <iostream>
 #include "opencv2/ts.hpp"
-#include "opencv2/imgcodecs.hpp"
 #include "opencv2/stereo.hpp"
-#include "opencv2/imgproc.hpp"
 #include "opencv2/features2d.hpp"
 #include "opencv2/core/utility.hpp"
-#include "opencv2/core/private.hpp"
-#include "opencv2/core/cvdef.h"
-#include "opencv2/core.hpp"
-#include "opencv2/highgui.hpp"
 #include "opencv2/calib3d.hpp"
 
-#include <algorithm>
-#include <cmath>
-
-#ifdef GTEST_CREATE_SHARED_LIBRARY
-#error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined
-#endif
+namespace opencv_test {
+using namespace cv::stereo;
+using namespace perf;
+}
 
 #endif

modules/stereo/test/test_block_matching.cpp

@@ -40,11 +40,8 @@
 //M*/
 
 #include "test_precomp.hpp"
-#include <limits.h>
 
-using namespace cv;
-using namespace cv::stereo;
-using namespace std;
+namespace opencv_test { namespace {
 
 class CV_BlockMatchingTest : public cvtest::BaseTest
 {
@@ -234,3 +231,6 @@ void CV_SGBlockMatchingTest::run(int )
 }
 TEST(block_matching_simple_test, accuracy) { CV_BlockMatchingTest test; test.safe_run(); }
 TEST(SG_block_matching_simple_test, accuracy) { CV_SGBlockMatchingTest test; test.safe_run(); }
+
+
+}} // namespace

modules/stereo/test/test_descriptors.cpp

@@ -40,11 +40,8 @@
 //M*/
 
 #include "test_precomp.hpp"
-#include <limits.h>
 
-using namespace cv;
-using namespace cv::stereo;
-using namespace std;
+namespace opencv_test { namespace {
 
 class CV_DescriptorBaseTest : public cvtest::BaseTest
 {
@@ -443,8 +440,8 @@ void CV_DescriptorBaseTest::run(int )
             }
         }
     }
-    int min = numeric_limits<int>::min();
-    int max = numeric_limits<int>::max();
+    int min = std::numeric_limits<int>::min();
+    int max = std::numeric_limits<int>::max();
     //check if all values are between int min and int max and not NAN
     if (0 != cvtest::check(censusImage[0], min, max, 0))
     {
@@ -463,3 +460,6 @@ TEST(DISABLED_census_transform_testing, accuracy) { CV_CensusTransformTest test;
 TEST(DISABLED_symetric_census_testing, accuracy) { CV_SymetricCensusTest test; test.safe_run(); }
 TEST(DISABLED_Dmodified_census_testing, accuracy) { CV_ModifiedCensusTransformTest test; test.safe_run(); }
 TEST(DISABLED_Dstar_kernel_testing, accuracy) { CV_StarKernelCensusTest test; test.safe_run(); }
+
+
+}} // namespace

modules/stereo/test/test_precomp.hpp

@@ -1,28 +1,16 @@
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wmissing-declarations"
-#  if defined __clang__ || defined __APPLE__
-#    pragma GCC diagnostic ignored "-Wmissing-prototypes"
-#    pragma GCC diagnostic ignored "-Wextra"
-#  endif
-#endif
-
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
-#include <iostream>
 #include "opencv2/ts.hpp"
-#include "opencv2/imgcodecs.hpp"
 #include "opencv2/stereo.hpp"
-#include "opencv2/imgproc.hpp"
 #include "opencv2/features2d.hpp"
-#include "opencv2/core/utility.hpp"
-#include "opencv2/core/private.hpp"
-#include "opencv2/core/cvdef.h"
-#include "opencv2/core.hpp"
-#include "opencv2/highgui.hpp"
 #include "opencv2/calib3d.hpp"
 
-#include <algorithm>
-#include <cmath>
+namespace opencv_test {
+using namespace cv::stereo;
+}
 
 #endif

modules/structured_light/test/test_faps.cpp

@@ -38,14 +38,12 @@
  // the use of this software, even if advised of the possibility of such damage.
  //
  //M*/
+#include "test_precomp.hpp"
 
 #include <opencv2/structured_light/graycodepattern.hpp>
 #include <opencv2/structured_light/sinusoidalpattern.hpp>
-#include <opencv2/imgcodecs.hpp>
-#include "test_precomp.hpp"
 
-using namespace std;
-using namespace cv;
+namespace opencv_test { namespace {
 
 const string STRUCTURED_LIGHT_DIR = "structured_light";
 const string FOLDER_DATA = "data";
@@ -147,3 +145,5 @@ TEST( SinusoidalPattern, unwrapPhaseMap )
 
     EXPECT_LE( ratio, 0.003 );
 }
+
+}} // namespace

modules/structured_light/test/test_getProjPixel.cpp

@@ -41,8 +41,7 @@
 
 #include "test_precomp.hpp"
 
-using namespace std;
-using namespace cv;
+namespace opencv_test { namespace {
 
 /****************************************************************************************\
 *                              GetProjPixel test                                         *
@@ -98,3 +97,5 @@ TEST( GrayCodePattern, getProjPixel )
   CV_GetProjPixelTest test;
   test.safe_run();
 }
+
+}} // namespace

modules/structured_light/test/test_main.cpp

@@ -1,3 +1,6 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
 #include "test_precomp.hpp"
 
 CV_TEST_MAIN("cv")