Impliziter Namensraum für Dimensionen in Testhilfsmakros

martinfehrs · Aug 8, 2024 · f351dc8 · f351dc8
1 parent e3b3507
commit f351dc8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/tests/include/zollstock/tests/constant_test_helpers.hpp b/tests/include/zollstock/tests/constant_test_helpers.hpp
@@ -7,15 +7,15 @@
 #include <catch2/catch_test_macros.hpp>
 
 
-#define TEST_BASE_UNIT_CONSTANT(symbol_, dimension_, factor_)    \
-{                                                                \
-    using namespace zollstock;                                   \
-                                                                 \
-    static constexpr auto factor = std::get<0>(symbol_.factors); \
-                                                                 \
-    STATIC_REQUIRE(factor.dimension      == dimension_);         \
-    STATIC_REQUIRE(factor.symbol         == #symbol_ );          \
-    STATIC_REQUIRE(factor.scaling_factor == factor_ );           \
+#define TEST_BASE_UNIT_CONSTANT(symbol_, dimension_, factor_)        \
+{                                                                    \
+    using namespace zollstock;                                       \
+                                                                     \
+    static constexpr auto factor = std::get<0>(symbol_.factors);     \
+                                                                     \
+    STATIC_REQUIRE(factor.dimension      == dimensions::dimension_); \
+    STATIC_REQUIRE(factor.symbol         == #symbol_ );              \
+    STATIC_REQUIRE(factor.scaling_factor == factor_ );               \
 }
 
 #define TEST_PREFIXED_BASE_SI_UNIT_CONSTANT(symbol_, dimension_, prefix)            \
@@ -24,7 +24,7 @@
                                                                                     \
     static constexpr auto factor = std::get<0>(prefix##symbol_.factors);            \
                                                                                     \
-    STATIC_REQUIRE(factor.dimension      == dimension_);                            \
+    STATIC_REQUIRE(factor.dimension      == dimensions::dimension_);                \
     STATIC_REQUIRE(factor.symbol         == si_prefixes::prefix.symbol + #symbol_); \
     STATIC_REQUIRE(factor.scaling_factor == si_prefixes::prefix.factor);            \
 }

diff --git a/tests/sources/angle_unit_constant_tests.cpp b/tests/sources/angle_unit_constant_tests.cpp
@@ -4,16 +4,15 @@
 #include <catch2/catch_all.hpp>
 
 
-namespace dim = zollstock::dimensions;
 using namespace zollstock::units;
 
 
 TEST_CASE("angle-unit-constants", "[angle][unit][constants]")
 {
-    TEST_BASE_UNIT_CONSTANTS(ALL, rad , dim::_1)
-    TEST_BASE_UNIT_CONSTANTS(ALL, gon , dim::_1)
-    TEST_BASE_UNIT_CONSTANTS(ALL, asec, dim::_1)
+    TEST_BASE_UNIT_CONSTANTS(ALL, rad , _1)
+    TEST_BASE_UNIT_CONSTANTS(ALL, gon , _1)
+    TEST_BASE_UNIT_CONSTANTS(ALL, asec, _1)
 
-    TEST_BASE_UNIT_CONSTANT(deg  , dim::_1, pi/180.0L )
-    TEST_BASE_UNIT_CONSTANT(amin , dim::_1, pi/10.8e3L)
+    TEST_BASE_UNIT_CONSTANT(deg  , _1, pi/180.0L )
+    TEST_BASE_UNIT_CONSTANT(amin , _1, pi/10.8e3L)
 }
diff --git a/tests/sources/length_unit_constant_tests.cpp b/tests/sources/length_unit_constant_tests.cpp
@@ -5,7 +5,7 @@
 
 
 using namespace zollstock::units;
-using namespace zollstock::dimensions;
+
 
 TEST_CASE("length-unit-constants", "[length][unit][constants]")
 {

diff --git a/tests/sources/mass_unit_constant_tests.cpp b/tests/sources/mass_unit_constant_tests.cpp
@@ -5,7 +5,6 @@
 
 
 using namespace zollstock::units;
-using namespace zollstock::dimensions;
 
 
 TEST_CASE("mass-unit-constants", "[mass][unit][constants]")

diff --git a/tests/sources/time_unit_constant_tests.cpp b/tests/sources/time_unit_constant_tests.cpp
@@ -5,7 +5,6 @@
 
 
 using namespace zollstock::units;
-using namespace zollstock::dimensions;
 
 
 TEST_CASE("time-unit-constants", "[time][unit][constants]")