[unittest] Change the way boost test framework is included to avoid c…

…orruption in tests
alicevision · Apr 26, 2020 · fc1b0ab · fc1b0ab
1 parent ce27c4a
commit fc1b0ab
Show file tree

Hide file tree

Showing 72 changed files with 144 additions and 72 deletions.
diff --git a/src/aliceVision/camera/pinholeBrown_test.cpp b/src/aliceVision/camera/pinholeBrown_test.cpp
@@ -8,7 +8,8 @@
 #include <aliceVision/camera/camera.hpp>
 
 #define BOOST_TEST_MODULE pinholeBrown
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/src/aliceVision/camera/pinholeFisheye1_test.cpp b/src/aliceVision/camera/pinholeFisheye1_test.cpp
@@ -7,7 +7,8 @@
 #include <aliceVision/camera/camera.hpp>
 
 #define BOOST_TEST_MODULE pinholeFisheye1
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/src/aliceVision/camera/pinholeFisheye_test.cpp b/src/aliceVision/camera/pinholeFisheye_test.cpp
@@ -8,7 +8,8 @@
 #include <aliceVision/camera/camera.hpp>
 
 #define BOOST_TEST_MODULE pinholeFisheye
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/src/aliceVision/camera/pinholeRadial_test.cpp b/src/aliceVision/camera/pinholeRadial_test.cpp
@@ -8,7 +8,8 @@
 #include <aliceVision/camera/camera.hpp>
 
 #define BOOST_TEST_MODULE pinholeRadial
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/src/aliceVision/colorHarmonization/gainOffsetConstraintBuilder_test.cpp b/src/aliceVision/colorHarmonization/gainOffsetConstraintBuilder_test.cpp
@@ -20,7 +20,8 @@
 #include "dependencies/htmlDoc/htmlDoc.hpp"
 
 #define BOOST_TEST_MODULE GainOffsetConstraintBuilder
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/feature/features_test.cpp b/src/aliceVision/feature/features_test.cpp
@@ -13,7 +13,8 @@
 #include <vector>
 
 #define BOOST_TEST_MODULE Feature
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace std;

diff --git a/src/aliceVision/geometry/frustumIntersection_test.cpp b/src/aliceVision/geometry/frustumIntersection_test.cpp
@@ -14,7 +14,8 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE frustumIntersection
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/geometry/halfSpaceIntersection_test.cpp b/src/aliceVision/geometry/halfSpaceIntersection_test.cpp
@@ -11,7 +11,8 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE halfSpaceIntersection
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/geometry/rigidTransformation3D_test.cpp b/src/aliceVision/geometry/rigidTransformation3D_test.cpp
@@ -11,7 +11,8 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE rigidTransformation3D
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/graph/connectedComponent_test.cpp b/src/aliceVision/graph/connectedComponent_test.cpp
@@ -11,7 +11,8 @@
 #include <vector>
 
 #define BOOST_TEST_MODULE connectedComponent
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace lemon;

diff --git a/src/aliceVision/graph/triplet_test.cpp b/src/aliceVision/graph/triplet_test.cpp
@@ -11,7 +11,8 @@
 #include <vector>
 
 #define BOOST_TEST_MODULE tripletFinder
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision::graph;

diff --git a/src/aliceVision/image/drawing_test.cpp b/src/aliceVision/image/drawing_test.cpp
@@ -8,7 +8,8 @@
 #include "aliceVision/image/all.hpp"
 
 #define BOOST_TEST_MODULE ImageDrawing
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/image/filtering_test.cpp b/src/aliceVision/image/filtering_test.cpp
@@ -10,7 +10,8 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE ImageFiltering
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/image/image_test.cpp b/src/aliceVision/image/image_test.cpp
@@ -10,7 +10,8 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE Image
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace std;

diff --git a/src/aliceVision/image/io_test.cpp b/src/aliceVision/image/io_test.cpp
@@ -9,7 +9,8 @@
 #include "aliceVision/image/all.hpp"
 
 #define BOOST_TEST_MODULE imageIO
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <cstdio>

diff --git a/src/aliceVision/image/resampling_test.cpp b/src/aliceVision/image/resampling_test.cpp
@@ -12,7 +12,8 @@
 #include <sstream>
 
 #define BOOST_TEST_MODULE ImageRessampling
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/lightingEstimation/lightingEstimation_test.cpp b/src/aliceVision/lightingEstimation/lightingEstimation_test.cpp
@@ -11,7 +11,8 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE LIGHTING_ESTIMATION
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <aliceVision/unitTest.hpp>

diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_global_translations_fromTij_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_global_translations_fromTij_test.cpp
@@ -12,7 +12,8 @@
 #include "aliceVision/multiview/translationAveraging/translationAveragingTest.hpp"
 
 #define BOOST_TEST_MODULE translation_averaging_globalTi_from_tijs
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/...ceVision/linearProgramming/lInfinityCV/lInftyCV_global_translations_fromTriplets_test.cpp b/...ceVision/linearProgramming/lInfinityCV/lInftyCV_global_translations_fromTriplets_test.cpp
@@ -12,7 +12,8 @@
 #include "aliceVision/multiview/translationAveraging/translationAveragingTest.hpp"
 
 #define BOOST_TEST_MODULE globalTi_from_tijs_Triplets
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_resection_robust_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_resection_robust_test.cpp
@@ -16,7 +16,8 @@
 #include <vector>
 
 #define BOOST_TEST_MODULE ResectionLInfinityRobust
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_resection_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_resection_test.cpp
@@ -22,7 +22,8 @@
 
 
 #define BOOST_TEST_MODULE ResectionLInfinity
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_outlier_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_outlier_test.cpp
@@ -25,7 +25,8 @@
 #include <vector>
 
 #define BOOST_TEST_MODULE TranslationStructureLInfinityNoisy
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_tijsAndXis_test.cpp
@@ -22,7 +22,8 @@
 #include <vector>
 
 #define BOOST_TEST_MODULE TranslationStructureLInfinity
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_triangulation_test.cpp b/src/aliceVision/linearProgramming/lInfinityCV/lInftyCV_triangulation_test.cpp
@@ -24,7 +24,8 @@
 #include "aliceVision/linearProgramming/lInfinityCV/triangulation.hpp"
 
 #define BOOST_TEST_MODULE lInfinityCVTriangulation
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/linearProgramming/linearProgramming_test.cpp b/src/aliceVision/linearProgramming/linearProgramming_test.cpp
@@ -16,7 +16,8 @@
 #include "aliceVision/linearProgramming/OSIXSolver.hpp"
 
 #define BOOST_TEST_MODULE linearProgramming
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/localization/LocalizationResult_test.cpp b/src/aliceVision/localization/LocalizationResult_test.cpp
@@ -16,7 +16,8 @@
 #include <random>
 
 #define BOOST_TEST_MODULE LocalizationResult
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/src/aliceVision/localization/rigResection_test.cpp b/src/aliceVision/localization/rigResection_test.cpp
@@ -17,7 +17,8 @@
 #include <random>
 
 #define BOOST_TEST_MODULE rigResection
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/matching/filters_test.cpp b/src/aliceVision/matching/filters_test.cpp
@@ -8,7 +8,8 @@
 #include "aliceVision/matching/filters.hpp"
 
 #define BOOST_TEST_MODULE matchingFilters
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 
 using namespace aliceVision;
 using namespace aliceVision::matching;

diff --git a/src/aliceVision/matching/indMatch_test.cpp b/src/aliceVision/matching/indMatch_test.cpp
@@ -11,7 +11,8 @@
 #include <boost/filesystem/operations.hpp>
 
 #define BOOST_TEST_MODULE IndMatch
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/filesystem.hpp>
 

diff --git a/src/aliceVision/matching/matching_test.cpp b/src/aliceVision/matching/matching_test.cpp
@@ -12,7 +12,8 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE matching
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace std;

diff --git a/src/aliceVision/matching/metric_test.cpp b/src/aliceVision/matching/metric_test.cpp
@@ -10,7 +10,8 @@
 #include <string>
 
 #define BOOST_TEST_MODULE matchingMetric
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace std;

diff --git a/src/aliceVision/matchingImageCollection/geometricFilterUtils_test.cpp b/src/aliceVision/matchingImageCollection/geometricFilterUtils_test.cpp
@@ -7,7 +7,8 @@
 #include <aliceVision/matchingImageCollection/geometricFilterUtils.hpp>
 
 #define BOOST_TEST_MODULE matchingImageCollectionPairBuilder
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace std;

diff --git a/src/aliceVision/matchingImageCollection/pairBuilder_test.cpp b/src/aliceVision/matchingImageCollection/pairBuilder_test.cpp
@@ -14,7 +14,8 @@
 #include <memory>
 
 #define BOOST_TEST_MODULE matchingImageCollectionPairBuilder
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace std;

diff --git a/src/aliceVision/multiview/affineSolver_test.cpp b/src/aliceVision/multiview/affineSolver_test.cpp
@@ -10,7 +10,8 @@
 #include <aliceVision/multiview/affineSolver.hpp>
 
 #define BOOST_TEST_MODULE multiviewAffineSolver
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/src/aliceVision/multiview/essentialFivePointSolver_test.cpp b/src/aliceVision/multiview/essentialFivePointSolver_test.cpp
@@ -15,7 +15,8 @@
 #include "aliceVision/multiview/NViewDataSet.hpp"
 
 #define BOOST_TEST_MODULE essentialFivePointSolver
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/src/aliceVision/multiview/essentialKernelSolver_test.cpp b/src/aliceVision/multiview/essentialKernelSolver_test.cpp
@@ -12,7 +12,8 @@
 #include "aliceVision/multiview/NViewDataSet.hpp"
 
 #define BOOST_TEST_MODULE essentialKernelSolver
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/src/aliceVision/multiview/fundamentalKernelSolver_test.cpp b/src/aliceVision/multiview/fundamentalKernelSolver_test.cpp
@@ -10,7 +10,8 @@
 #include "aliceVision/multiview/projection.hpp"
 
 #define BOOST_TEST_MODULE fundamentalKernelSolver
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 using namespace aliceVision;

diff --git a/src/aliceVision/multiview/homographyKernelSolver_test.cpp b/src/aliceVision/multiview/homographyKernelSolver_test.cpp
@@ -10,7 +10,8 @@
 #include "aliceVision/multiview/homographyKernelSolver.hpp"
 
 #define BOOST_TEST_MODULE homographyKernelSolver
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/src/aliceVision/multiview/knownRotationTranslationKernel_test.cpp b/src/aliceVision/multiview/knownRotationTranslationKernel_test.cpp
@@ -12,7 +12,8 @@
 #include <vector>
 
 #define BOOST_TEST_MODULE knownRotationTranslationKernel
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include <aliceVision/unitTest.hpp>
 

diff --git a/src/aliceVision/multiview/resection/p4pfSolver_test.cpp b/src/aliceVision/multiview/resection/p4pfSolver_test.cpp
@@ -10,7 +10,8 @@
 #include <aliceVision/multiview/resection/P4PfSolver.hpp>
 #include <aliceVision/multiview/NViewDataSet.hpp>
 
-#include <boost/test/included/unit_test.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 
 #include <vector>