update

srz-zumix · Aug 20, 2020 · 00ba0cd · 00ba0cd
1 parent d507c65
commit 00ba0cd
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/include/internal/iutest_internal.hpp b/include/internal/iutest_internal.hpp
@@ -139,6 +139,8 @@
  * @brief   Test class defined macro
 */
 #define IUTEST_TEST_(testsuite_, testname_, parent_class_, type_id_)                        \
+    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");     \
     class IUTEST_TEST_CLASS_NAME_(testsuite_, testname_) : public parent_class_ {           \
     IUTEST_PP_DISALLOW_COPY_AND_ASSIGN(IUTEST_TEST_CLASS_NAME_(testsuite_, testname_));     \
         public: IUTEST_TEST_CLASS_NAME_(testsuite_, testname_)() {}                         \

diff --git a/test/empty_testname_failure_tests.cpp b/test/empty_testname_failure_tests.cpp
@@ -19,12 +19,12 @@
 
 // ill-formed test definitions..
 
-IUTEST_TEST_STATICASSERT("static_assert: testsuite_ must not be empty")
+IUTEST_TEST_STATICASSERT("testsuite_ must not be empty")
 IUTEST(, Test)
 {
 }
 
-IUTEST_TEST_STATICASSERT("static_assert: testname_ must not be empty")
+IUTEST_TEST_STATICASSERT("testname_ must not be empty")
 IUTEST(Test, )
 {
 }
@@ -33,37 +33,30 @@ class BaseFixture : public ::iutest::Test
 {
 };
 
-IUTEST_TEST_STATICASSERT("static_assert: testname_ must not be empty")
+IUTEST_TEST_STATICASSERT("testname_ must not be empty")
 IUTEST_F(BaseFixture, )
 {
 }
 
-#if IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE
-namespace fixture_alias
-{
-
-IUTEST_TEST_STATICASSERT("static_assert: testsuite_ must not be empty")
-IUTEST_F((, BaseFixture), Test)
+IUTEST_TEST_STATICASSERT("testsuite_ must not be empty")
+IUTEST_F(, Test)
 {
 }
 
-}
-#endif
-
 #if IUTEST_HAS_TYPED_TEST_P
 
 template<typename T>
 class TypeParamTest : public ::iutest::Test {};
 
-IUTEST_TYPED_TEST_SUITE_P(TypeParamTest);
-IUTEST_TEST_STATICASSERT("static_assert: testname_ must not be empty")
+IUTEST_TEST_STATICASSERT("testname_ must not be empty")
 IUTEST_TYPED_TEST_P(TypeParamTest, )
 {
 }
-IUTEST_REGISTER_TYPED_TEST_SUITE_P(TypeParamTest, );
 
-typedef ::iutest::Types<int, float> TypeParamTestTypes;
-IUTEST_INSTANTIATE_TYPED_TEST_SUITE_P(My1, TypeParamTest, TypeParamTestTypes);
+IUTEST_TEST_STATICASSERT("testsuite_ must not be empty")
+IUTEST_TYPED_TEST_P(, Test)
+{
+}
 
 #endif
 

diff --git a/test/empty_testname_tests.cpp b/test/empty_testname_tests.cpp
@@ -19,6 +19,21 @@
 
 // well-formed test definitions..
 
+class BaseFixture : public ::iutest::Test
+{
+};
+
+#if IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE
+namespace fixture_alias
+{
+
+IUTEST_F((, BaseFixture), Test)
+{
+}
+
+}
+#endif
+
 #if IUTEST_HAS_PARAM_TEST
 
 class ParamTest : public ::iutest::TestWithParam<int> {};

diff --git a/test/static_assertion_failure_tests.cpp b/test/static_assertion_failure_tests.cpp
@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2015-2016, Takazumi Shirayanagi\n
+ * Copyright (C) 2015-2020, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */

diff --git a/tools/python/iutest_compile_error_test.py b/tools/python/iutest_compile_error_test.py
@@ -327,7 +327,6 @@ def message(self):
             if msg:
                 msg.message += '\n'
                 msg.message += line
-    print('%s - %d' % (msg.file, msg.line))
     msg_list.append(msg)
     return msg_list