update r999

srz-zumix · Dec 10, 2015 · 8508c7d · 8508c7d
1 parent 415ea24
commit 8508c7d
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 13 deletions.
diff --git a/doc/Doxyfile b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = iutest
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.14.99.13
+PROJECT_NUMBER         = 1.14.99.14
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/include/impl/iutest_case.ipp b/include/impl/iutest_case.ipp
@@ -46,7 +46,7 @@ IUTEST_IPP_INLINE bool TestCase::Run(void)
 		{
 			result = RunImpl();
 		}
-		catch( TestPartResult::Type& eType )
+		catch( const TestPartResult::Type& eType )
 		{
 			CheckSetUpSkipped();
 

diff --git a/include/impl/iutest_charcode.ipp b/include/impl/iutest_charcode.ipp
@@ -132,7 +132,7 @@ IUTEST_PRAGMA_CONSTEXPR_CALLED_AT_RUNTIME_WARN_DISABLE_BEGIN()
 	iu_stringstream ss;
 	for(int i=0; i < num; ++i )
 	{
-		UInt32 code_point;
+		UInt32 code_point = 0;
 		if( str[i] == L'\0' )
 		{
 			break;

diff --git a/include/impl/iutest_info.ipp b/include/impl/iutest_info.ipp
@@ -72,7 +72,7 @@ IUTEST_IPP_INLINE void TestInfo::RunImpl(void)
 				throw;
 			}
 		}
-		catch (TestPartResult::Type& eType)
+		catch (const TestPartResult::Type& eType)
 		{
 			elapsedmsec = sw.stop();
 			if( TestPartResult::type_is_failed(eType) && TestFlag::IsEnableFlag(TestFlag::THROW_ON_FAILURE) )

diff --git a/include/internal/iutest_internal.hpp b/include/internal/iutest_internal.hpp
@@ -96,7 +96,7 @@
 	macro(testfixture_, testname_, IIUT_TO_VARNAME_(testfixture_)				\
 		, ::iutest::internal::GetTypeId< IIUT_TO_VARNAME_(testfixture_) >())
 
-#if IUTEST_HAS_TESTNAME_ALIAS
+#if IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE
 
 #define IIUT_TEST_F_A_(macro, testfixture_, testname_)							\
 	IIUT_TEST_F_( macro, IUTEST_PP_IF( IUTEST_PP_IS_BEGIN_PARENS(testfixture_)	\

diff --git a/include/internal/iutest_option_message.hpp b/include/internal/iutest_option_message.hpp
@@ -140,6 +140,7 @@ inline void iuOptionMessage::ShowFeature(void)
 	IIUT_SHOW_MACRO(IUTEST_HAS_STATIC_ASSERT_TYPEEQ);
 	IIUT_SHOW_MACRO(IUTEST_HAS_STREAM_RESULT);
 	IIUT_SHOW_MACRO(IUTEST_HAS_STREAMCAPTURE);
+	IIUT_SHOW_MACRO(IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE);
 	IIUT_SHOW_MACRO(IUTEST_HAS_TESTNAME_ALIAS);
 	IIUT_SHOW_MACRO(IUTEST_HAS_TESTNAME_ALIAS_JP);
 	IIUT_SHOW_MACRO(IUTEST_HAS_TUPLE);

diff --git a/include/internal/iutest_string.hpp b/include/internal/iutest_string.hpp
@@ -212,7 +212,7 @@ inline ::std::string ToHexString(T value)
 {
 IUTEST_PRAGMA_CONSTEXPR_CALLED_AT_RUNTIME_WARN_DISABLE_BEGIN()
 	const size_t kN = sizeof(T)*2;
-	char buf[kN+1];
+	char buf[kN + 1] = {0};
 	for( size_t i=0; i < kN; ++i )
 	{
 		buf[i] = ToHex(static_cast<unsigned int>((value>>((kN-i-1)*4))));

diff --git a/include/iutest_config.hpp b/include/iutest_config.hpp
@@ -423,6 +423,11 @@
 #  endif
 #endif
 
+#if !defined(IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE)
+//! テスト名の別名指定の簡易記法が可能かどうか
+#  define IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE	IUTEST_HAS_TESTNAME_ALIAS
+#endif
+
 #if !defined(IUTEST_HAS_AUTOFIXTURE_PARAM_TEST)
 //! fixture の自動定義に対応したパラメータ化テストが使用可能かどうか
 #  if IUTEST_HAS_IF_EXISTS || !defined(IUTEST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)

diff --git a/include/iutest_param_tests.hpp b/include/iutest_param_tests.hpp
@@ -134,7 +134,7 @@
 	IIUT_INSTANTIATE_TEST_CASE_P_I(prefix_, testcase_, generator_, GetParamNameGen())
 #endif
 
-#if IUTEST_HAS_TESTNAME_ALIAS
+#if IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE
 
 #define IIUT_INSTANTIATE_TEST_CASE_P_I(prefix_, testcase_, generator_, paramname_generator_)		\
 	IIUT_INSTANTIATE_TEST_CASE_P_II(prefix_, IUTEST_PP_IF( IUTEST_PP_IS_BEGIN_PARENS(testcase_)		\
@@ -207,7 +207,7 @@
 		, IIUT_TEST_P_BASE_FIXTURE(testcase_)			\
 		, IIUT_TO_NAME_STR_(testcase_), IIUT_TO_NAME_STR_(testname_))
 
-#if IUTEST_HAS_TESTNAME_ALIAS
+#if IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE
 
 #define IIUT_TEST_P_A_(macro, testcase_, testname_)							\
 	IIUT_TEST_P_( macro, IUTEST_PP_IF( IUTEST_PP_IS_BEGIN_PARENS(testcase_)	\

diff --git a/include/iutest_typed_tests.hpp b/include/iutest_typed_tests.hpp
@@ -67,7 +67,7 @@
  * @private
  * @{
 */
-#if IUTEST_HAS_TESTNAME_ALIAS
+#if IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE
 #define IIUT_TYPED_TEST_PARAMS_(testcase_)											\
 	IIUT_TYPED_TEST_PARAMS_I_( IUTEST_PP_IF( IUTEST_PP_IS_BEGIN_PARENS(testcase_)	\
 		, IUTEST_ALIAS_TESTNAME_F_, IUTEST_PP_EMPTY() ) testcase_)
@@ -117,7 +117,7 @@
 		, IIUT_TO_VARNAME_(testcase_), IIUT_TO_NAME_(testcase_)			\
 		, testname_)
 
-#if IUTEST_HAS_TESTNAME_ALIAS
+#if IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE
 
 #define IIUT_TYPED_TEST_A_(macro, testcase_, testname_)							\
 	IIUT_TYPED_TEST_( macro, IUTEST_PP_IF( IUTEST_PP_IS_BEGIN_PARENS(testcase_)	\

diff --git a/include/iutest_ver.hpp b/include/iutest_ver.hpp
@@ -17,11 +17,11 @@
 
 //======================================================================
 // define
-#define IUTEST_VER			0x01149913u //!< iutest version 1.14.99.13
+#define IUTEST_VER			0x01149914u //!< iutest version 1.14.99.14
 #define IUTEST_MAJORVER		0x01u		//!< Major Version
 #define IUTEST_MINORVER		0x14u		//!< Minor Version
 #define IUTEST_BUILD		0x99u		//!< Build
-#define IUTEST_REVISION		0x13u		//!< Revision
+#define IUTEST_REVISION		0x14u		//!< Revision
 
 /**
  * @mainpage

diff --git a/test/fixture_alias_tests.cpp b/test/fixture_alias_tests.cpp
@@ -20,7 +20,7 @@
 namespace fixture_alias_tests
 {
 
-#if IUTEST_HAS_TESTNAME_ALIAS
+#if IUTEST_HAS_TESTFIXTURE_ALIAS_BY_TUPLE
 
 class FixtureTest : public ::iutest::Test
 {