fix

srz-zumix · Aug 28, 2020 · 6263608 · 6263608
1 parent 97fc6b4
commit 6263608
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/include/iutest_typed_tests.hpp b/include/iutest_typed_tests.hpp
@@ -88,6 +88,8 @@
 #endif
 
 #define IIUT_TYPED_TEST_I(classname_, testsuite_, testsuitename_, testname_)        \
+    IUTEST_STATIC_ASSERT_MSG(sizeof(IUTEST_PP_TOSTRING(testsuite_)) > 1, "testsuite_ must not be empty");   \
+    IUTEST_STATIC_ASSERT_MSG(sizeof(IUTEST_PP_TOSTRING(testname_)) > 1, "testname_ must not be empty");     \
     template<typename iutest_TypeParam> class classname_ : public testsuite_<iutest_TypeParam> {    \
         typedef testsuite_<iutest_TypeParam> TestFixture;                           \
         typedef iutest_TypeParam TypeParam;                                         \

diff --git a/test/empty_testname_failure_tests.cpp b/test/empty_testname_failure_tests.cpp
@@ -63,6 +63,29 @@ IUTEST_F(, Test)
 
 }
 
+#if IUTEST_HAS_TYPED_TEST
+
+namespace emptyname
+{
+
+IUTEST_TEST_STATICASSERT("testname_ must not be empty")
+IUTEST_TYPED_TEST(TypedTest, )
+{
+}
+
+}
+
+namespace emptysuite
+{
+
+IUTEST_TEST_STATICASSERT("testsuite_ must not be empty")
+IUTEST_TYPED_TEST(, Test)
+{
+}
+
+}
+#endif
+
 #if IUTEST_HAS_TYPED_TEST_P
 
 template<typename T>

diff --git a/test/empty_testname_tests.cpp b/test/empty_testname_tests.cpp
@@ -55,30 +55,6 @@ IUTEST_INSTANTIATE_TEST_SUITE_P(A, ParamTestAlias, ::iutest::Values(0, 1));
 
 #endif
 
-#if IUTEST_HAS_TYPED_TEST
-
-template<typename T>
-class TypedTest : public ::iutest::Test {};
-
-typedef ::iutest::Types<int, float> TypedTestTypes;
-IUTEST_TYPED_TEST_SUITE(TypedTest, TypedTestTypes);
-
-IUTEST_TYPED_TEST(TypedTest, )
-{
-}
-
-#if IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE
-template<typename T>
-class TypedTest2 : public ::iutest::Test {};
-#define TypedTestAlias  (, TypedTest2)
-IUTEST_TYPED_TEST_SUITE(TypedTestAlias, TypedTestTypes);
-IUTEST_TYPED_TEST(TypedTestAlias, )
-{
-}
-#endif
-
-#endif
-
 #if IUTEST_HAS_ANY_PARAM_TEST
 
 IUTEST_AP(AnyParamTest, )