fix

srz-zumix · Aug 30, 2020 · 252afe7 · 252afe7
1 parent 8e2940e
commit 252afe7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/include/internal/iutest_internal.hpp b/include/internal/iutest_internal.hpp
@@ -30,20 +30,14 @@
  * @private
  * @{
 */
-#define IUTEST_TEST_CLASS_NAME_(testsuite_, testname_)  IIUT_TEST_CLASS_NAME_I(IIUT_TO_VARNAME(testsuite_), IIUT_TO_VARNAME(testname_))
+#define IUTEST_TEST_CLASS_NAME_(testsuite_, testname_)  IIUT_TEST_CLASS_NAME_I(IIUT_TO_VARNAME_(testsuite_), IIUT_TO_VARNAME_(testname_))
 #define IIUT_TEST_CLASS_NAME_I(testsuite_, testname_)   IIUT_TEST_CLASS_NAME_I_(testsuite_, testname_)
 #define IIUT_TEST_CLASS_NAME_I_(testsuite_, testname_)  iu_##testsuite_##_x_iutest_x_##testname_##_Test
 
-#define IUTEST_TEST_INSTANCE_NAME_(testsuite_, testname_)   IIUT_TEST_INSTANCE_NAME_I(IIUT_TO_VARNAME(testsuite_), IIUT_TO_VARNAME(testname_))
+#define IUTEST_TEST_INSTANCE_NAME_(testsuite_, testname_)   IIUT_TEST_INSTANCE_NAME_I(IIUT_TO_VARNAME_(testsuite_), IIUT_TO_VARNAME_(testname_))
 #define IIUT_TEST_INSTANCE_NAME_I(testsuite_, testname_)    IIUT_TEST_INSTANCE_NAME_I_(testsuite_, testname_)
 #define IIUT_TEST_INSTANCE_NAME_I_(testsuite_, testname_)   s_##testsuite_##_x_iutest_x_##testname_##_Instance
 
-#ifndef IUTEST_NO_VARIADIC_MACROS
-#  define IIUT_TO_VARNAME(...)      IIUT_TO_VARNAME_("" __VA_ARGS__)
-#else
-#  define IIUT_TO_VARNAME(name_)    IIUT_TO_VARNAME_(name_)
-#endif
-
 #if IUTEST_HAS_TESTNAME_ALIAS
 
 #define IIUT_TO_VARNAME_(name_)                 IIUT_TO_VARNAME_I( (IIUT_ALIAS_TESTNAME_PP_##name_, name_, dummy_) )
@@ -90,7 +84,7 @@
 #  define IIUT_CHECK_TESTFIXTURE_I(testfixture_)
 #endif
 #define IIUT_CHECK_TESTFIXTURE_(testfixture_)   IIUT_CHECK_TESTFIXTURE_I(testfixture_)
-#define IIUT_CHECK_TESTFIXTURE(testfixture_)    IIUT_CHECK_TESTFIXTURE_(IIUT_TO_VARNAME(testfixture_))
+#define IIUT_CHECK_TESTFIXTURE(testfixture_)    IIUT_CHECK_TESTFIXTURE_(IIUT_TO_VARNAME_(testfixture_))
 
 #if !defined(IUTEST_TEST_STRICT_)
 #if IUTEST_CHECK_STRICT
@@ -103,8 +97,8 @@
 #endif
 
 #define IIUT_TEST_F_(macro, testfixture_, testname_)                            \
-    macro(testfixture_, testname_, IIUT_TO_VARNAME(testfixture_)                \
-        , ::iutest::internal::GetTypeId< IIUT_TO_VARNAME(testfixture_) >())
+    macro(testfixture_, testname_, IIUT_TO_VARNAME_(testfixture_)               \
+        , ::iutest::internal::GetTypeId< IIUT_TO_VARNAME_(testfixture_) >())
 
 #if IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE
 
@@ -189,7 +183,7 @@
  * @private
  * @{
 */
-#define IUTEST_PMZ_TEST_CLASS_NAME_(testsuite_, testname_)  IIUT_PMZ_TEST_CLASS_NAME_I(IIUT_TO_VARNAME(testsuite_), IIUT_TO_VARNAME(testname_))
+#define IUTEST_PMZ_TEST_CLASS_NAME_(testsuite_, testname_)  IIUT_PMZ_TEST_CLASS_NAME_I(IIUT_TO_VARNAME_(testsuite_), IIUT_TO_VARNAME_(testname_))
 #define IIUT_PMZ_TEST_CLASS_NAME_I(testsuite_, testname_)   IIUT_PMZ_TEST_CLASS_NAME_I_(testsuite_, testname_)
 #define IIUT_PMZ_TEST_CLASS_NAME_I_(testsuite_, testname_)  IUTEST_PP_CAT( IUTEST_PP_CAT(iu_##testsuite_##_x_Test_, testname_), __LINE__)
 /**

diff --git a/include/internal/iutest_pp.hpp b/include/internal/iutest_pp.hpp
@@ -714,6 +714,9 @@
 #define IIUT_PP_EMPTY_TAG() , 0
 #define IIUT_PP_EMPTY_TAG_IIUT_PP_EMPTY_TAG     1, 1 IUTEST_PP_EMPTY
 
+// IF EMPTY
+#define IUTEST_PP_IF_EMPTY(x, t, f) IUTEST_PP_IF(IUTEST_PP_IS_EMPTY(x), t, f)
+
 // IDENTITY
 #define IUTEST_PP_IDENTITY(x)       x IUTEST_PP_EMPTY