test: refactor nested namespaces (acts-project#3230)

blocked by: - acts-project#3229
pbutti · May 30, 2024 · d8f615f · d8f615f
1 parent a48fa8a
commit d8f615f
Show file tree

Hide file tree

Showing 76 changed files with 216 additions and 341 deletions.
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DetectorElementStub.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DetectorElementStub.hpp
@@ -17,13 +17,13 @@
 #include "Acts/Tests/CommonHelpers/LineSurfaceStub.hpp"
 
 namespace Acts {
-
 class PlanarBounds;
 class DiscBounds;
 class ISurfaceMaterial;
 class LineBounds;
+}  // namespace Acts
 
-namespace Test {
+namespace Acts::Test {
 
 /// @class DetectorElementStub
 ///
@@ -137,5 +137,5 @@ inline Surface& DetectorElementStub::surface() {
 inline double DetectorElementStub::thickness() const {
   return m_elementThickness;
 }
-}  // namespace Test
-}  // namespace Acts
+
+}  // namespace Acts::Test
diff --git a/Tests/IntegrationTests/Fatras/FatrasSimulationTests.cpp b/Tests/IntegrationTests/Fatras/FatrasSimulationTests.cpp
@@ -152,8 +152,6 @@ bool containsParticleId(const Container& sortedByParticleId,
 
 BOOST_DATA_TEST_CASE(FatrasSimulation, dataset, pdg, phi, eta, p,
                      numParticles) {
-  using namespace Acts::UnitLiterals;
-
   Acts::GeometryContext geoCtx;
   Acts::MagneticFieldContext magCtx;
   Acts::Logging::Level logLevel = Acts::Logging::Level::DEBUG;

diff --git a/Tests/UnitTests/Core/Detector/ProtoDetectorTests.cpp b/Tests/UnitTests/Core/Detector/ProtoDetectorTests.cpp
@@ -95,9 +95,7 @@ Acts::ProtoDetector createProtoDetector() {
 
 }  // namespace
 
-namespace Acts {
-
-namespace Test {
+namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(Detector)
 
@@ -217,6 +215,4 @@ BOOST_AUTO_TEST_CASE(ProtoDetectorTests) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-}  // namespace Test
-
-}  // namespace Acts
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/ConeLayerTests.cpp b/Tests/UnitTests/Core/Geometry/ConeLayerTests.cpp
@@ -24,9 +24,8 @@
 #include <utility>
 #include <vector>
 
-namespace Acts {
-namespace Test {
-namespace Layers {
+namespace Acts::Test::Layers {
+
 BOOST_AUTO_TEST_SUITE(Layers)
 
 /// Unit test for creating compliant/non-compliant ConeLayer object
@@ -71,6 +70,5 @@ BOOST_AUTO_TEST_CASE(ConeLayerConstruction) {
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-}  // namespace Layers
-}  // namespace Test
-}  // namespace Acts
+
+}  // namespace Acts::Test::Layers
diff --git a/Tests/UnitTests/Core/Geometry/ConeVolumeBoundsTests.cpp b/Tests/UnitTests/Core/Geometry/ConeVolumeBoundsTests.cpp
@@ -19,11 +19,9 @@
 #include <utility>
 #include <vector>
 
-namespace Acts {
+using namespace Acts::UnitLiterals;
 
-using namespace UnitLiterals;
-
-namespace Test {
+namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(VolumeBounds)
 
@@ -102,6 +100,4 @@ BOOST_AUTO_TEST_CASE(ConeVolumeBoundsSurfaceOrientation) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-}  // namespace Test
-
-}  // namespace Acts
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/CutoutCylinderVolumeBoundsTests.cpp b/Tests/UnitTests/Core/Geometry/CutoutCylinderVolumeBoundsTests.cpp
@@ -25,8 +25,7 @@
 #include <utility>
 #include <vector>
 
-namespace Acts {
-namespace Test {
+namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(Geometry)
 
@@ -215,5 +214,5 @@ BOOST_AUTO_TEST_CASE(CutoutCylinderVolumeOrientedBoundaries) {
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-}  // namespace Test
-}  // namespace Acts
+
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/CylinderLayerTests.cpp b/Tests/UnitTests/Core/Geometry/CylinderLayerTests.cpp
@@ -26,9 +26,8 @@
 #include <utility>
 #include <vector>
 
-namespace Acts {
-namespace Test {
-namespace Layers {
+namespace Acts::Test::Layers {
+
 BOOST_AUTO_TEST_SUITE(Layers)
 
 /// Unit test for creating compliant/non-compliant CylinderLayer object
@@ -89,6 +88,5 @@ BOOST_AUTO_TEST_CASE(CylinderLayerProperties) {
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-}  // namespace Layers
-}  // namespace Test
-}  // namespace Acts
+
+}  // namespace Acts::Test::Layers
diff --git a/Tests/UnitTests/Core/Geometry/CylinderVolumeBoundsTests.cpp b/Tests/UnitTests/Core/Geometry/CylinderVolumeBoundsTests.cpp
@@ -29,8 +29,8 @@
 
 namespace bdata = boost::unit_test::data;
 
-namespace Acts {
-namespace Test {
+namespace Acts::Test {
+
 BOOST_AUTO_TEST_SUITE(Geometry)
 
 BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsConstruction) {
@@ -407,5 +407,5 @@ BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsSetValues) {
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-}  // namespace Test
-}  // namespace Acts
+
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp b/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp
@@ -25,9 +25,8 @@
 #include <utility>
 #include <vector>
 
-namespace Acts {
-namespace Test {
-namespace Layers {
+namespace Acts::Test::Layers {
+
 BOOST_AUTO_TEST_SUITE(Layers)
 
 /// Unit test for creating compliant/non-compliant DiscLayer object
@@ -83,6 +82,5 @@ BOOST_AUTO_TEST_CASE(DiscLayerProperties) {
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-}  // namespace Layers
-}  // namespace Test
-}  // namespace Acts
+
+}  // namespace Acts::Test::Layers
diff --git a/Tests/UnitTests/Core/Geometry/ExtentTests.cpp b/Tests/UnitTests/Core/Geometry/ExtentTests.cpp
@@ -19,11 +19,9 @@
 #include <string>
 #include <vector>
 
-namespace Acts {
+using namespace Acts::UnitLiterals;
 
-using namespace UnitLiterals;
-
-namespace Test {
+namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(Geometry)
 
@@ -180,5 +178,4 @@ BOOST_AUTO_TEST_CASE(ProtoSupportCaseTests) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-}  // namespace Test
-}  // namespace Acts
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/KDTreeTrackingGeometryBuilderTests.cpp b/Tests/UnitTests/Core/Geometry/KDTreeTrackingGeometryBuilderTests.cpp
@@ -33,11 +33,9 @@
 #include <utility>
 #include <vector>
 
-namespace Acts {
+using namespace Acts::UnitLiterals;
 
-using namespace UnitLiterals;
-
-namespace Test {
+namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(Geometry)
 
@@ -255,5 +253,4 @@ BOOST_AUTO_TEST_CASE(KDTreeTrackingGeometryBuilder_simple) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-}  // namespace Test
-}  // namespace Acts
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/LayerTests.cpp b/Tests/UnitTests/Core/Geometry/LayerTests.cpp
@@ -27,11 +27,11 @@
 #include "LayerStub.hpp"
 
 namespace Acts::Test {
-
 // Create a test context
 GeometryContext tgContext = GeometryContext();
+}  // namespace Acts::Test
 
-namespace Layers {
+namespace Acts::Test::Layers {
 
 BOOST_AUTO_TEST_SUITE(Layers)
 
@@ -99,5 +99,5 @@ BOOST_AUTO_TEST_CASE(LayerProperties) {
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-}  // namespace Layers
-}  // namespace Acts::Test
+
+}  // namespace Acts::Test::Layers
diff --git a/Tests/UnitTests/Core/Geometry/NavigationLayerTests.cpp b/Tests/UnitTests/Core/Geometry/NavigationLayerTests.cpp
@@ -22,11 +22,12 @@
 #include "../Surfaces/SurfaceStub.hpp"
 
 namespace Acts::Test {
-
 // Create a test context
 GeometryContext tgContext = GeometryContext();
+}  // namespace Acts::Test
+
+namespace Acts::Test::Layers {
 
-namespace Layers {
 BOOST_AUTO_TEST_SUITE(Layers)
 
 /// Unit test for creating compliant/non-compliant NavigationLayer object
@@ -70,5 +71,5 @@ BOOST_AUTO_TEST_CASE(NavigationLayerProperties) {
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-}  // namespace Layers
-}  // namespace Acts::Test
+
+}  // namespace Acts::Test::Layers
diff --git a/Tests/UnitTests/Core/Geometry/PlaneLayerTests.cpp b/Tests/UnitTests/Core/Geometry/PlaneLayerTests.cpp
@@ -28,11 +28,12 @@
 #include <vector>
 
 namespace Acts::Test {
-
 // Create a test context
 GeometryContext tgContext = GeometryContext();
+}  // namespace Acts::Test
+
+namespace Acts::Test::Layers {
 
-namespace Layers {
 BOOST_AUTO_TEST_SUITE(Layers)
 
 /// Unit test for creating compliant/non-compliant PlaneLayer object
@@ -94,5 +95,5 @@ BOOST_AUTO_TEST_CASE(PlaneLayerProperties) {
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-}  // namespace Layers
-}  // namespace Acts::Test
+
+}  // namespace Acts::Test::Layers
diff --git a/Tests/UnitTests/Core/Geometry/PolyhedronTests.cpp b/Tests/UnitTests/Core/Geometry/PolyhedronTests.cpp
@@ -22,11 +22,9 @@
 #include "Acts/Visualization/GeometryView3D.hpp"
 #include "Acts/Visualization/ObjVisualization3D.hpp"
 
-namespace Acts {
+using namespace Acts::UnitLiterals;
 
-using namespace UnitLiterals;
-
-namespace Test {
+namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(Geometry)
 
@@ -126,6 +124,4 @@ BOOST_AUTO_TEST_CASE(PolyhedronExtent) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-}  // namespace Test
-
-}  // namespace Acts
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/ProtoLayerHelperTests.cpp b/Tests/UnitTests/Core/Geometry/ProtoLayerHelperTests.cpp
@@ -26,9 +26,10 @@
 
 namespace Acts {
 class Surface;
+}  // namespace Acts
+
+namespace Acts::Test::Layers {
 
-namespace Test {
-namespace Layers {
 BOOST_AUTO_TEST_SUITE(Geometry)
 
 BOOST_AUTO_TEST_CASE(ProtoLayerHelperTests) {
@@ -217,7 +218,5 @@ BOOST_AUTO_TEST_CASE(ProtoLayerHelperTests) {
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-}  // namespace Layers
-}  // namespace Test
 
-}  // namespace Acts
+}  // namespace Acts::Test::Layers
diff --git a/Tests/UnitTests/Core/Geometry/ProtoLayerTests.cpp b/Tests/UnitTests/Core/Geometry/ProtoLayerTests.cpp
@@ -27,10 +27,7 @@
 #include <utility>
 #include <vector>
 
-namespace Acts {
-
-namespace Test {
-namespace Layers {
+namespace Acts::Test::Layers {
 
 BOOST_AUTO_TEST_SUITE(Geometry)
 
@@ -158,7 +155,5 @@ Extent in space :
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-}  // namespace Layers
-}  // namespace Test
 
-}  // namespace Acts
+}  // namespace Acts::Test::Layers
diff --git a/Tests/UnitTests/Core/Geometry/TrackingGeometryClosureTests.cpp b/Tests/UnitTests/Core/Geometry/TrackingGeometryClosureTests.cpp
@@ -320,4 +320,4 @@ BOOST_AUTO_TEST_CASE(TrackingGeometry_testVisitSurfaces) {
   BOOST_CHECK_EQUAL(nVolumes, 5u);
 }
 
-}  //  namespace Acts::Test
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/TrackingGeometryGeometryIdTests.cpp b/Tests/UnitTests/Core/Geometry/TrackingGeometryGeometryIdTests.cpp
@@ -137,4 +137,4 @@ BOOST_AUTO_TEST_CASE(GeometryIdentifier_containervolume_test) {
   }
 }
 
-}  //  namespace Acts::Test
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/TrackingVolumeTests.cpp b/Tests/UnitTests/Core/Geometry/TrackingVolumeTests.cpp
@@ -12,10 +12,10 @@
 #include "Acts/Geometry/CylinderVolumeBounds.hpp"
 #include "Acts/Geometry/TrackingVolume.hpp"
 
-namespace Acts::Test {
-
 using namespace Acts::UnitLiterals;
 
+namespace Acts::Test {
+
 BOOST_AUTO_TEST_SUITE(Geometry)
 BOOST_AUTO_TEST_SUITE(TrackingVolumeTests)
 

diff --git a/Tests/UnitTests/Core/Geometry/TrapezoidVolumeBoundsTests.cpp b/Tests/UnitTests/Core/Geometry/TrapezoidVolumeBoundsTests.cpp
@@ -23,8 +23,8 @@
 #include <utility>
 #include <vector>
 
-namespace Acts {
-namespace Test {
+namespace Acts::Test {
+
 BOOST_AUTO_TEST_SUITE(Volumes)
 
 BOOST_AUTO_TEST_CASE(bounding_box_creation) {
@@ -104,5 +104,5 @@ BOOST_AUTO_TEST_CASE(TrapezoidVolumeBoundarySurfaces) {
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-}  // namespace Test
-}  // namespace Acts
+
+}  // namespace Acts::Test