From 5e228a441c94500243e725d363bdfd624ab4df7c Mon Sep 17 00:00:00 2001 From: srz-zumix Date: Wed, 22 Oct 2014 08:21:55 +0900 Subject: [PATCH] update r729 --- doc/Doxyfile | 2 +- include/gtest/iutest_switch.hpp | 13 +- include/gtest/switch/iutest_switch_gmock.hpp | 127 +++++++++++++++ include/iutest_ver.hpp | 4 +- projects/msvc10/iutest.vcxproj | 1 + projects/msvc10/iutest.vcxproj.filters | 3 + projects/msvc11/iutest.vcxproj | 1 + projects/msvc11/iutest.vcxproj.filters | 3 + projects/msvc12/gmock/gmock1/gmock1.vcxproj | 40 +++++ projects/msvc12/gtest/gtest1/gtest1.vcxproj | 38 +++++ projects/msvc12/gtest/gtest10/gtest10.vcxproj | 38 +++++ projects/msvc12/gtest/gtest2/gtest2.vcxproj | 38 +++++ projects/msvc12/gtest/gtest3/gtest3.vcxproj | 38 +++++ projects/msvc12/gtest/gtest4/gtest4.vcxproj | 38 +++++ projects/msvc12/gtest/gtest5/gtest5.vcxproj | 38 +++++ projects/msvc12/gtest/gtest6/gtest6.vcxproj | 38 +++++ projects/msvc12/gtest/gtest7/gtest7.vcxproj | 38 +++++ projects/msvc12/gtest/gtest8/gtest8.vcxproj | 38 +++++ projects/msvc12/gtest/gtest9/gtest9.vcxproj | 38 +++++ projects/msvc12/iutest.sln | 52 +++++- projects/msvc12/iutest.vcxproj | 1 + projects/msvc12/iutest.vcxproj.filters | 3 + projects/msvc12/iutest_sample.vcxproj | 43 +++++ projects/msvc12/tr1/tr1.vcxproj | 37 +++++ projects/msvc14/iutest.vcxproj | 1 + projects/msvc14/iutest.vcxproj.filters | 3 + projects/msvc8/iutest.vcproj | 4 + projects/msvc9/iutest.vcproj | 4 + samples/matcher.cpp | 16 +- test/GNUmakefile | 2 +- test/iutest_matcher_tests.cpp | 154 ++++++++++-------- 31 files changed, 817 insertions(+), 77 deletions(-) create mode 100644 include/gtest/switch/iutest_switch_gmock.hpp diff --git a/doc/Doxyfile b/doc/Doxyfile index 87c517fd30..e9c21f2ec6 100644 --- 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.10.99.26 +PROJECT_NUMBER = 1.10.99.28 # 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/gtest/iutest_switch.hpp b/include/gtest/iutest_switch.hpp index dd84187ae9..4ed68b2417 100644 --- a/include/gtest/iutest_switch.hpp +++ b/include/gtest/iutest_switch.hpp @@ -69,6 +69,8 @@ #include "switch/iutest_switch_port.hpp" #include "switch/iutest_switch_core.hpp" +#include "switch/iutest_switch_gmock.hpp" + #include "switch/iutest_switch_assert.hpp" #include "switch/iutest_switch_expect.hpp" #include "switch/iutest_switch_inform.hpp" @@ -167,6 +169,9 @@ namespace tr1 // include #include "../iutest_ver.hpp" #include +#if defined(IUTEST_USE_GMOCK) +#include +#endif #include "iutest_gtest_ver.hpp" #include "../internal/iutest_pragma.hpp" @@ -192,9 +197,6 @@ namespace tr1 #undef IUTEST_HAS_TYPED_TEST_P #undef IUTEST_TYPED_TEST_P_STRICT -#undef IUTEST_HAS_MATCHERS -#undef IUTEST_HAS_MATCHER_ALLOF_AND_ANYOF -#undef IUTEST_HAS_MATCHER_ELEMENTSARE #undef IUTEST_HAS_ARITHMETIC_EXPRESSION_DECOMPOSE #undef IUTEST_HAS_BITWISE_EXPRESSION_DECOMPOSE @@ -251,9 +253,6 @@ namespace tr1 #define IUTEST_HAS_TYPED_TEST_P GTEST_HAS_TYPED_TEST_P #define IUTEST_TYPED_TEST_P_STRICT 1 -#define IUTEST_HAS_MATCHERS 0 -#define IUTEST_HAS_MATCHER_ALLOF_AND_ANYOF 0 -#define IUTEST_HAS_MATCHER_ELEMENTSARE 0 #define IUTEST_HAS_ARITHMETIC_EXPRESSION_DECOMPOSE 0 #define IUTEST_HAS_BITWISE_EXPRESSION_DECOMPOSE 1 @@ -280,6 +279,8 @@ namespace tr1 #include "switch/iutest_switch_port.hpp" #include "switch/iutest_switch_core.hpp" +#include "switch/iutest_switch_gmock.hpp" + #include "switch/iutest_switch_assert.hpp" #include "switch/iutest_switch_expect.hpp" #include "switch/iutest_switch_inform.hpp" diff --git a/include/gtest/switch/iutest_switch_gmock.hpp b/include/gtest/switch/iutest_switch_gmock.hpp new file mode 100644 index 0000000000..dfbe30d135 --- /dev/null +++ b/include/gtest/switch/iutest_switch_gmock.hpp @@ -0,0 +1,127 @@ +//====================================================================== +//----------------------------------------------------------------------- +/** + * @file iutest_switch_skip.hpp + * @brief IUTEST_SKIP 切り替え定義 ファイル + * + * @author t.shirayanagi + * @par copyright + * Copyright (C) 2012-2014, Takazumi Shirayanagi\n + * This software is released under the new BSD License, + * see LICENSE +*/ +//----------------------------------------------------------------------- +//====================================================================== +#ifndef INCG_IRIS_IUTEST_SWITCH_GMOCK_HPP_4212321D_F709_4904_AAF7_5E1BE18C0947_ +#define INCG_IRIS_IUTEST_SWITCH_GMOCK_HPP_4212321D_F709_4904_AAF7_5E1BE18C0947_ + +#if !defined(IUTEST_USE_GTEST) + +//====================================================================== +// define + +#else // !defined(IUTEST_USE_GTEST) + +//====================================================================== +// undef +#if defined(INCG_IRIS_IUTEST_HPP_) + +#undef IUTEST_ASSERT_THAT +#undef IUTEST_EXPECT_THAT +#undef IUTEST_INFORM_THAT +#undef IUTEST_ASSUME_THAT + +#undef IUTEST_HAS_MATCHERS +#undef IUTEST_HAS_MATCHER_ALLOF_AND_ANYOF +#undef IUTEST_HAS_MATCHER_ELEMENTSARE + +#endif + +//====================================================================== +// define + +#if defined(IUTEST_USE_GMOCK) + +#define IUTEST_HAS_MATCHERS 1 +#define IUTEST_HAS_MATCHER_ALLOF_AND_ANYOF 1 +#define IUTEST_HAS_MATCHER_ELEMENTSARE 1 + +#define IUTEST_ASSERT_THAT ASSERT_THAT +#define IUTEST_EXPECT_THAT EXPECT_THAT +#define IUTEST_INFORM_THAT INFORM_THAT +#define IUTEST_ASSUME_THAT ASSUME_THAT + +#define INFORM_THAT(value, matcher) \ + INFORM_PRED_FORMAT1(::testing::internal::MakePredicateFormatterFromMatcher(matcher), value) +#define ASSUME_THAT(value, matcher) \ + ASSUME_PRED_FORMAT1(::testing::internal::MakePredicateFormatterFromMatcher(matcher), value) + +#else + +#define IUTEST_HAS_MATCHERS 0 +#define IUTEST_HAS_MATCHER_ALLOF_AND_ANYOF 0 +#define IUTEST_HAS_MATCHER_ELEMENTSARE 0 + +#endif + +//====================================================================== +// using +#if defined(IUTEST_USE_GMOCK) + +namespace testing { +namespace matchers +{ + + using ::testing::Not; + using ::testing::Eq; + using ::testing::Ne; + using ::testing::Lt; + using ::testing::Le; + using ::testing::Gt; + using ::testing::Ge; + using ::testing::IsNull; + using ::testing::NotNull; + using ::testing::DoubleEq; + using ::testing::FloatEq; + + using ::testing::NanSensitiveDoubleEq; + using ::testing::NanSensitiveFloatEq; + + using ::testing::StrEq; + using ::testing::StrNe; + using ::testing::StrCaseEq; + using ::testing::StrCaseNe; + using ::testing::HasSubstr; + using ::testing::StartsWith; + using ::testing::EndsWith; + + using ::testing::Contains; + using ::testing::Each; + using ::testing::Key; + using ::testing::Pair; + using ::testing::Field; + using ::testing::Property; + + using ::testing::ResultOf; + using ::testing::Pointee; + + using ::testing::ElementsAre; + using ::testing::ElementsAreArray; + + using ::testing::AllOf; + using ::testing::AnyOf; + + using ::testing::A; + using ::testing::_; + + template + inline internal::EqMatcher Equals(T x) { return Eq(x); } + +} // end of namespace matcher +} // end of namespace testing + +#endif + +#endif // !defined(IUTEST_USE_GTEST) + +#endif // INCG_IRIS_IUTEST_SWITCH_SKIP_HPP_3CFB2B8D_9C8D_4B4F_9843_2FE38126BB31_ diff --git a/include/iutest_ver.hpp b/include/iutest_ver.hpp index 6bd84887bb..e07a2d987a 100644 --- a/include/iutest_ver.hpp +++ b/include/iutest_ver.hpp @@ -17,11 +17,11 @@ //====================================================================== // define -#define IUTEST_VER 0x01109927u //!< iutest version 1.10.99.27 +#define IUTEST_VER 0x01109928u //!< iutest version 1.10.99.28 #define IUTEST_MAJORVER 0x01u //!< Major Version #define IUTEST_MINORVER 0x10u //!< Minor Version #define IUTEST_BUILD 0x99u //!< Build -#define IUTEST_REVISION 0x27u //!< Revision +#define IUTEST_REVISION 0x28u //!< Revision /** * @mainpage diff --git a/projects/msvc10/iutest.vcxproj b/projects/msvc10/iutest.vcxproj index f6c53a7643..2d0d452219 100644 --- a/projects/msvc10/iutest.vcxproj +++ b/projects/msvc10/iutest.vcxproj @@ -144,6 +144,7 @@ + diff --git a/projects/msvc10/iutest.vcxproj.filters b/projects/msvc10/iutest.vcxproj.filters index 94179d2c31..456a5aea65 100644 --- a/projects/msvc10/iutest.vcxproj.filters +++ b/projects/msvc10/iutest.vcxproj.filters @@ -315,6 +315,9 @@ iutest\listener + + iutest\gtest\switch + diff --git a/projects/msvc11/iutest.vcxproj b/projects/msvc11/iutest.vcxproj index 83aa0bb00a..61a915ba7c 100644 --- a/projects/msvc11/iutest.vcxproj +++ b/projects/msvc11/iutest.vcxproj @@ -152,6 +152,7 @@ + diff --git a/projects/msvc11/iutest.vcxproj.filters b/projects/msvc11/iutest.vcxproj.filters index 94179d2c31..456a5aea65 100644 --- a/projects/msvc11/iutest.vcxproj.filters +++ b/projects/msvc11/iutest.vcxproj.filters @@ -315,6 +315,9 @@ iutest\listener + + iutest\gtest\switch + diff --git a/projects/msvc12/gmock/gmock1/gmock1.vcxproj b/projects/msvc12/gmock/gmock1/gmock1.vcxproj index 3367a8ac98..60ea9dc930 100644 --- a/projects/msvc12/gmock/gmock1/gmock1.vcxproj +++ b/projects/msvc12/gmock/gmock1/gmock1.vcxproj @@ -1,6 +1,10 @@  + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -25,6 +29,11 @@ Unicode v120 + + Application + Unicode + v120 + Application Unicode @@ -42,6 +51,9 @@ + + + @@ -58,13 +70,20 @@ $(Configuration)\ false $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(LibraryWPath) $(GMOCK_ROOT)\msvc\2013\Debug;$(LibraryPath) + + $(LibraryWPath) + $(GMOCK_ROOT)\msvc\2013\Debug;$(LibraryPath) + $(LibraryWPath) $(GMOCK_ROOT)\msvc\2013\Debug;$(LibraryPath) @@ -138,6 +157,27 @@ MachineX86 + + + Disabled + $(IUTEST_ROOT)\include;$(GMOCK_ROOT)\include;$(GMOCK_ROOT)\gtest\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;IUTEST_USE_GMOCK;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + gmock.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Console + MachineX86 + + diff --git a/projects/msvc12/gtest/gtest1/gtest1.vcxproj b/projects/msvc12/gtest/gtest1/gtest1.vcxproj index 02a6ba8702..322993940d 100644 --- a/projects/msvc12/gtest/gtest1/gtest1.vcxproj +++ b/projects/msvc12/gtest/gtest1/gtest1.vcxproj @@ -5,6 +5,10 @@ Debug_CTP Win32 + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -46,6 +50,11 @@ MultiByte v120 + + Application + MultiByte + v120 + Application MultiByte @@ -78,6 +87,9 @@ + + + @@ -112,10 +124,15 @@ $(Configuration)\ false $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(GTEST_ROOT)\include;$(IncludePath) + $(GTEST_ROOT)\include;$(IncludePath) $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) + $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) @@ -242,6 +259,27 @@ false + + + Disabled + $(ProjectDir)\..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + gtestd.lib;%(AdditionalDependencies) + true + Console + MachineX86 + false + + diff --git a/projects/msvc12/gtest/gtest10/gtest10.vcxproj b/projects/msvc12/gtest/gtest10/gtest10.vcxproj index bb4af9eaa8..47f9f56e7f 100644 --- a/projects/msvc12/gtest/gtest10/gtest10.vcxproj +++ b/projects/msvc12/gtest/gtest10/gtest10.vcxproj @@ -5,6 +5,10 @@ Debug_CTP Win32 + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -41,6 +45,11 @@ Unicode v120 + + Application + Unicode + v120 + Application Unicode @@ -73,6 +82,9 @@ + + + @@ -107,10 +119,15 @@ $(Configuration)\ false $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(GTEST_ROOT)\include;$(IncludePath) + $(GTEST_ROOT)\include;$(IncludePath) $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) + $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) @@ -237,6 +254,27 @@ false + + + Disabled + $(ProjectDir)\..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + gtestd.lib;%(AdditionalDependencies) + true + Console + MachineX86 + false + + diff --git a/projects/msvc12/gtest/gtest2/gtest2.vcxproj b/projects/msvc12/gtest/gtest2/gtest2.vcxproj index 7144b823e4..f5630a8ec0 100644 --- a/projects/msvc12/gtest/gtest2/gtest2.vcxproj +++ b/projects/msvc12/gtest/gtest2/gtest2.vcxproj @@ -5,6 +5,10 @@ Debug_CTP Win32 + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -46,6 +50,11 @@ Unicode v120 + + Application + Unicode + v120 + Application Unicode @@ -78,6 +87,9 @@ + + + @@ -112,10 +124,15 @@ $(Configuration)\ false $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(GTEST_ROOT)\include;$(IncludePath) + $(GTEST_ROOT)\include;$(IncludePath) $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) + $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) @@ -242,6 +259,27 @@ false + + + Disabled + $(ProjectDir)\..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + gtestd.lib;%(AdditionalDependencies) + true + Console + MachineX86 + false + + diff --git a/projects/msvc12/gtest/gtest3/gtest3.vcxproj b/projects/msvc12/gtest/gtest3/gtest3.vcxproj index fc40dcf7de..5a454326ac 100644 --- a/projects/msvc12/gtest/gtest3/gtest3.vcxproj +++ b/projects/msvc12/gtest/gtest3/gtest3.vcxproj @@ -5,6 +5,10 @@ Debug_CTP Win32 + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -45,6 +49,11 @@ Unicode v120 + + Application + Unicode + v120 + Application Unicode @@ -77,6 +86,9 @@ + + + @@ -111,10 +123,15 @@ $(Configuration)\ false $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(GTEST_ROOT)\include;$(IncludePath) + $(GTEST_ROOT)\include;$(IncludePath) $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) + $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) @@ -241,6 +258,27 @@ false + + + Disabled + $(ProjectDir)\..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + gtestd.lib;%(AdditionalDependencies) + true + Console + MachineX86 + false + + diff --git a/projects/msvc12/gtest/gtest4/gtest4.vcxproj b/projects/msvc12/gtest/gtest4/gtest4.vcxproj index 685286a5fb..d054c4edb3 100644 --- a/projects/msvc12/gtest/gtest4/gtest4.vcxproj +++ b/projects/msvc12/gtest/gtest4/gtest4.vcxproj @@ -5,6 +5,10 @@ Debug_CTP Win32 + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -46,6 +50,11 @@ Unicode v120 + + Application + Unicode + v120 + Application Unicode @@ -78,6 +87,9 @@ + + + @@ -112,10 +124,15 @@ $(Configuration)\ false $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(GTEST_ROOT)\include;$(IncludePath) + $(GTEST_ROOT)\include;$(IncludePath) $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) + $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) @@ -242,6 +259,27 @@ false + + + Disabled + $(ProjectDir)\..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + gtestd.lib;%(AdditionalDependencies) + true + Console + MachineX86 + false + + diff --git a/projects/msvc12/gtest/gtest5/gtest5.vcxproj b/projects/msvc12/gtest/gtest5/gtest5.vcxproj index ecb2f290de..233f122195 100644 --- a/projects/msvc12/gtest/gtest5/gtest5.vcxproj +++ b/projects/msvc12/gtest/gtest5/gtest5.vcxproj @@ -5,6 +5,10 @@ Debug_CTP Win32 + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -46,6 +50,11 @@ Unicode v120 + + Application + Unicode + v120 + Application Unicode @@ -78,6 +87,9 @@ + + + @@ -112,10 +124,15 @@ $(Configuration)\ false $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(GTEST_ROOT)\include;$(IncludePath) + $(GTEST_ROOT)\include;$(IncludePath) $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) + $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) @@ -242,6 +259,27 @@ false + + + Disabled + $(ProjectDir)\..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + gtestd.lib;%(AdditionalDependencies) + true + Console + MachineX86 + false + + diff --git a/projects/msvc12/gtest/gtest6/gtest6.vcxproj b/projects/msvc12/gtest/gtest6/gtest6.vcxproj index b9ebab2e7a..42f1f6924f 100644 --- a/projects/msvc12/gtest/gtest6/gtest6.vcxproj +++ b/projects/msvc12/gtest/gtest6/gtest6.vcxproj @@ -5,6 +5,10 @@ Debug_CTP Win32 + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -42,6 +46,11 @@ Unicode v120 + + Application + Unicode + v120 + Application Unicode @@ -74,6 +83,9 @@ + + + @@ -108,10 +120,15 @@ $(Configuration)\ false $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(GTEST_ROOT)\include;$(IncludePath) + $(GTEST_ROOT)\include;$(IncludePath) $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) + $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) @@ -238,6 +255,27 @@ false + + + Disabled + $(ProjectDir)\..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;_VARIADIC_MAX=10;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + gtestd.lib;%(AdditionalDependencies) + true + Console + MachineX86 + false + + diff --git a/projects/msvc12/gtest/gtest7/gtest7.vcxproj b/projects/msvc12/gtest/gtest7/gtest7.vcxproj index ebbe386587..8bed657c2f 100644 --- a/projects/msvc12/gtest/gtest7/gtest7.vcxproj +++ b/projects/msvc12/gtest/gtest7/gtest7.vcxproj @@ -5,6 +5,10 @@ Debug_CTP Win32 + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -42,6 +46,11 @@ Unicode v120 + + Application + Unicode + v120 + Application Unicode @@ -74,6 +83,9 @@ + + + @@ -108,10 +120,15 @@ $(Configuration)\ false $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(GTEST_ROOT)\include;$(IncludePath) + $(GTEST_ROOT)\include;$(IncludePath) $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) + $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) @@ -238,6 +255,27 @@ false + + + Disabled + $(ProjectDir)\..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;_VARIADIC_MAX=10;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + gtestd.lib;%(AdditionalDependencies) + true + Console + MachineX86 + false + + diff --git a/projects/msvc12/gtest/gtest8/gtest8.vcxproj b/projects/msvc12/gtest/gtest8/gtest8.vcxproj index 81eb895a8b..254da092e5 100644 --- a/projects/msvc12/gtest/gtest8/gtest8.vcxproj +++ b/projects/msvc12/gtest/gtest8/gtest8.vcxproj @@ -5,6 +5,10 @@ Debug_CTP Win32 + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -42,6 +46,11 @@ Unicode v120 + + Application + Unicode + v120 + Application Unicode @@ -74,6 +83,9 @@ + + + @@ -108,10 +120,15 @@ $(Configuration)\ false $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(GTEST_ROOT)\include;$(IncludePath) + $(GTEST_ROOT)\include;$(IncludePath) $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) + $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) @@ -238,6 +255,27 @@ false + + + Disabled + $(ProjectDir)\..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;_VARIADIC_MAX=10;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + gtestd.lib;%(AdditionalDependencies) + true + Console + MachineX86 + false + + diff --git a/projects/msvc12/gtest/gtest9/gtest9.vcxproj b/projects/msvc12/gtest/gtest9/gtest9.vcxproj index f417066585..0fdae26024 100644 --- a/projects/msvc12/gtest/gtest9/gtest9.vcxproj +++ b/projects/msvc12/gtest/gtest9/gtest9.vcxproj @@ -5,6 +5,10 @@ Debug_CTP Win32 + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -41,6 +45,11 @@ Unicode v120 + + Application + Unicode + v120 + Application Unicode @@ -73,6 +82,9 @@ + + + @@ -107,10 +119,15 @@ $(Configuration)\ false $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ true + true $(GTEST_ROOT)\include;$(IncludePath) + $(GTEST_ROOT)\include;$(IncludePath) $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) + $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) $(GTEST_ROOT)\include;$(IncludePath) @@ -252,6 +269,27 @@ false + + + Disabled + $(ProjectDir)\..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + gtestd.lib;%(AdditionalDependencies) + true + Console + MachineX86 + false + + diff --git a/projects/msvc12/iutest.sln b/projects/msvc12/iutest.sln index 440cdf8bca..ccefcb5df9 100644 --- a/projects/msvc12/iutest.sln +++ b/projects/msvc12/iutest.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.30626.0 +VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iutest_sample", "iutest_sample.vcxproj", "{13851977-F039-448D-A853-A98325BDA088}" ProjectSection(ProjectDependencies) = postProject @@ -79,9 +79,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iutest", "iutest.vcxproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iutest_main", "iutest_main.vcxproj", "{264A677C-4EA1-4898-94F2-D6352788FB36}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock1", "D:\usr\local\shirayanagi\iutest\projects\msvc12\gmock\gmock1\gmock1.vcxproj", "{652027C2-BCD8-44E5-A987-201992407DCD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_CTP|Win32 = Debug_CTP|Win32 + Debug_gmock|Win32 = Debug_gmock|Win32 Debug_gtest|Win32 = Debug_gtest|Win32 Debug_Lib|Win32 = Debug_Lib|Win32 Debug_LLVM|Win32 = Debug_LLVM|Win32 @@ -94,6 +97,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {13851977-F039-448D-A853-A98325BDA088}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {13851977-F039-448D-A853-A98325BDA088}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {13851977-F039-448D-A853-A98325BDA088}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {13851977-F039-448D-A853-A98325BDA088}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 {13851977-F039-448D-A853-A98325BDA088}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 {13851977-F039-448D-A853-A98325BDA088}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 {13851977-F039-448D-A853-A98325BDA088}.Debug_Lib|Win32.ActiveCfg = Debug_Lib|Win32 @@ -112,6 +117,8 @@ Global {13851977-F039-448D-A853-A98325BDA088}.Release|Win32.Build.0 = Release|Win32 {AC9366E1-054F-4CB1-AE5A-555D6011526A}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {AC9366E1-054F-4CB1-AE5A-555D6011526A}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {AC9366E1-054F-4CB1-AE5A-555D6011526A}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {AC9366E1-054F-4CB1-AE5A-555D6011526A}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 {AC9366E1-054F-4CB1-AE5A-555D6011526A}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 {AC9366E1-054F-4CB1-AE5A-555D6011526A}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 {AC9366E1-054F-4CB1-AE5A-555D6011526A}.Debug_Lib|Win32.ActiveCfg = Debug_Lib|Win32 @@ -129,6 +136,8 @@ Global {AC9366E1-054F-4CB1-AE5A-555D6011526A}.Release|Win32.Build.0 = Release|Win32 {24A48412-EBF3-4C58-9BF9-71A5F6E3BD3E}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {24A48412-EBF3-4C58-9BF9-71A5F6E3BD3E}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {24A48412-EBF3-4C58-9BF9-71A5F6E3BD3E}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {24A48412-EBF3-4C58-9BF9-71A5F6E3BD3E}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 {24A48412-EBF3-4C58-9BF9-71A5F6E3BD3E}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 {24A48412-EBF3-4C58-9BF9-71A5F6E3BD3E}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 {24A48412-EBF3-4C58-9BF9-71A5F6E3BD3E}.Debug_Lib|Win32.ActiveCfg = Debug_Lib|Win32 @@ -146,6 +155,8 @@ Global {24A48412-EBF3-4C58-9BF9-71A5F6E3BD3E}.Release|Win32.Build.0 = Release|Win32 {D75E9937-515B-4AA1-A737-E46A470EDA46}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {D75E9937-515B-4AA1-A737-E46A470EDA46}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {D75E9937-515B-4AA1-A737-E46A470EDA46}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {D75E9937-515B-4AA1-A737-E46A470EDA46}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 {D75E9937-515B-4AA1-A737-E46A470EDA46}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 {D75E9937-515B-4AA1-A737-E46A470EDA46}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 {D75E9937-515B-4AA1-A737-E46A470EDA46}.Debug_Lib|Win32.ActiveCfg = Debug_Lib|Win32 @@ -163,6 +174,8 @@ Global {D75E9937-515B-4AA1-A737-E46A470EDA46}.Release|Win32.Build.0 = Release|Win32 {323B6D46-73DD-406D-AE4A-B97DB7EB0B7F}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {323B6D46-73DD-406D-AE4A-B97DB7EB0B7F}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {323B6D46-73DD-406D-AE4A-B97DB7EB0B7F}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {323B6D46-73DD-406D-AE4A-B97DB7EB0B7F}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 {323B6D46-73DD-406D-AE4A-B97DB7EB0B7F}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 {323B6D46-73DD-406D-AE4A-B97DB7EB0B7F}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 {323B6D46-73DD-406D-AE4A-B97DB7EB0B7F}.Debug_Lib|Win32.ActiveCfg = Debug_Lib|Win32 @@ -180,6 +193,8 @@ Global {323B6D46-73DD-406D-AE4A-B97DB7EB0B7F}.Release|Win32.Build.0 = Release|Win32 {D608CFE8-69D1-4300-9ED3-96CE24A010DC}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {D608CFE8-69D1-4300-9ED3-96CE24A010DC}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {D608CFE8-69D1-4300-9ED3-96CE24A010DC}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {D608CFE8-69D1-4300-9ED3-96CE24A010DC}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 {D608CFE8-69D1-4300-9ED3-96CE24A010DC}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 {D608CFE8-69D1-4300-9ED3-96CE24A010DC}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 {D608CFE8-69D1-4300-9ED3-96CE24A010DC}.Debug_Lib|Win32.ActiveCfg = Debug_Lib|Win32 @@ -197,6 +212,8 @@ Global {D608CFE8-69D1-4300-9ED3-96CE24A010DC}.Release|Win32.Build.0 = Release|Win32 {DD940A43-1C57-458D-BBF6-56D8A9B143B2}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {DD940A43-1C57-458D-BBF6-56D8A9B143B2}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {DD940A43-1C57-458D-BBF6-56D8A9B143B2}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {DD940A43-1C57-458D-BBF6-56D8A9B143B2}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 {DD940A43-1C57-458D-BBF6-56D8A9B143B2}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 {DD940A43-1C57-458D-BBF6-56D8A9B143B2}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 {DD940A43-1C57-458D-BBF6-56D8A9B143B2}.Debug_Lib|Win32.ActiveCfg = Debug_Lib|Win32 @@ -214,6 +231,8 @@ Global {DD940A43-1C57-458D-BBF6-56D8A9B143B2}.Release|Win32.Build.0 = Release|Win32 {DF3D61A3-C8E8-4D1E-8417-FB4A91946FAC}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {DF3D61A3-C8E8-4D1E-8417-FB4A91946FAC}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {DF3D61A3-C8E8-4D1E-8417-FB4A91946FAC}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {DF3D61A3-C8E8-4D1E-8417-FB4A91946FAC}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 {DF3D61A3-C8E8-4D1E-8417-FB4A91946FAC}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 {DF3D61A3-C8E8-4D1E-8417-FB4A91946FAC}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 {DF3D61A3-C8E8-4D1E-8417-FB4A91946FAC}.Debug_Lib|Win32.ActiveCfg = Debug_Lib|Win32 @@ -231,6 +250,8 @@ Global {DF3D61A3-C8E8-4D1E-8417-FB4A91946FAC}.Release|Win32.Build.0 = Release|Win32 {F70B9DD1-B2F1-4A9B-BA9D-99220DCBB184}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {F70B9DD1-B2F1-4A9B-BA9D-99220DCBB184}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {F70B9DD1-B2F1-4A9B-BA9D-99220DCBB184}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {F70B9DD1-B2F1-4A9B-BA9D-99220DCBB184}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 {F70B9DD1-B2F1-4A9B-BA9D-99220DCBB184}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 {F70B9DD1-B2F1-4A9B-BA9D-99220DCBB184}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 {F70B9DD1-B2F1-4A9B-BA9D-99220DCBB184}.Debug_Lib|Win32.ActiveCfg = Debug_Lib|Win32 @@ -248,6 +269,8 @@ Global {F70B9DD1-B2F1-4A9B-BA9D-99220DCBB184}.Release|Win32.Build.0 = Release|Win32 {A6AB264E-E4D3-4019-858E-04522E82FEB1}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {A6AB264E-E4D3-4019-858E-04522E82FEB1}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {A6AB264E-E4D3-4019-858E-04522E82FEB1}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {A6AB264E-E4D3-4019-858E-04522E82FEB1}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 {A6AB264E-E4D3-4019-858E-04522E82FEB1}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 {A6AB264E-E4D3-4019-858E-04522E82FEB1}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 {A6AB264E-E4D3-4019-858E-04522E82FEB1}.Debug_Lib|Win32.ActiveCfg = Debug_Lib|Win32 @@ -265,6 +288,8 @@ Global {A6AB264E-E4D3-4019-858E-04522E82FEB1}.Release|Win32.Build.0 = Release|Win32 {5BCC8C50-3FD2-42FE-96EE-6CC1BC33C7A4}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {5BCC8C50-3FD2-42FE-96EE-6CC1BC33C7A4}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {5BCC8C50-3FD2-42FE-96EE-6CC1BC33C7A4}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {5BCC8C50-3FD2-42FE-96EE-6CC1BC33C7A4}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 {5BCC8C50-3FD2-42FE-96EE-6CC1BC33C7A4}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 {5BCC8C50-3FD2-42FE-96EE-6CC1BC33C7A4}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 {5BCC8C50-3FD2-42FE-96EE-6CC1BC33C7A4}.Debug_Lib|Win32.ActiveCfg = Debug_Lib|Win32 @@ -282,6 +307,8 @@ Global {5BCC8C50-3FD2-42FE-96EE-6CC1BC33C7A4}.Release|Win32.Build.0 = Release|Win32 {80D795EE-6B3D-4DEF-9084-F3DA618FC294}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {80D795EE-6B3D-4DEF-9084-F3DA618FC294}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {80D795EE-6B3D-4DEF-9084-F3DA618FC294}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {80D795EE-6B3D-4DEF-9084-F3DA618FC294}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 {80D795EE-6B3D-4DEF-9084-F3DA618FC294}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 {80D795EE-6B3D-4DEF-9084-F3DA618FC294}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 {80D795EE-6B3D-4DEF-9084-F3DA618FC294}.Debug_Lib|Win32.ActiveCfg = Debug_Lib|Win32 @@ -299,6 +326,7 @@ Global {80D795EE-6B3D-4DEF-9084-F3DA618FC294}.Release|Win32.Build.0 = Release|Win32 {C46DA5A4-27B5-4A0C-97D0-F5D0B9881087}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {C46DA5A4-27B5-4A0C-97D0-F5D0B9881087}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {C46DA5A4-27B5-4A0C-97D0-F5D0B9881087}.Debug_gmock|Win32.ActiveCfg = Debug_MD|Win32 {C46DA5A4-27B5-4A0C-97D0-F5D0B9881087}.Debug_gtest|Win32.ActiveCfg = Debug_MD|Win32 {C46DA5A4-27B5-4A0C-97D0-F5D0B9881087}.Debug_Lib|Win32.ActiveCfg = Debug_MD|Win32 {C46DA5A4-27B5-4A0C-97D0-F5D0B9881087}.Debug_Lib|Win32.Build.0 = Debug_MD|Win32 @@ -316,6 +344,8 @@ Global {C46DA5A4-27B5-4A0C-97D0-F5D0B9881087}.Release|Win32.Build.0 = Release|Win32 {264A677C-4EA1-4898-94F2-D6352788FB36}.Debug_CTP|Win32.ActiveCfg = Debug_CTP|Win32 {264A677C-4EA1-4898-94F2-D6352788FB36}.Debug_CTP|Win32.Build.0 = Debug_CTP|Win32 + {264A677C-4EA1-4898-94F2-D6352788FB36}.Debug_gmock|Win32.ActiveCfg = Debug_MD|Win32 + {264A677C-4EA1-4898-94F2-D6352788FB36}.Debug_gmock|Win32.Build.0 = Debug_MD|Win32 {264A677C-4EA1-4898-94F2-D6352788FB36}.Debug_gtest|Win32.ActiveCfg = Debug_MD|Win32 {264A677C-4EA1-4898-94F2-D6352788FB36}.Debug_gtest|Win32.Build.0 = Debug_MD|Win32 {264A677C-4EA1-4898-94F2-D6352788FB36}.Debug_Lib|Win32.ActiveCfg = Debug_MD|Win32 @@ -332,6 +362,26 @@ Global {264A677C-4EA1-4898-94F2-D6352788FB36}.Release_MD|Win32.Build.0 = Release_MD|Win32 {264A677C-4EA1-4898-94F2-D6352788FB36}.Release|Win32.ActiveCfg = Release|Win32 {264A677C-4EA1-4898-94F2-D6352788FB36}.Release|Win32.Build.0 = Release|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_CTP|Win32.ActiveCfg = Debug_gtest|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_CTP|Win32.Build.0 = Debug_gtest|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_gmock|Win32.ActiveCfg = Debug_gmock|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_gmock|Win32.Build.0 = Debug_gmock|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_gtest|Win32.ActiveCfg = Debug_gtest|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_gtest|Win32.Build.0 = Debug_gtest|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_Lib|Win32.ActiveCfg = Debug_gtest|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_Lib|Win32.Build.0 = Debug_gtest|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_LLVM|Win32.ActiveCfg = Debug_gtest|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_LLVM|Win32.Build.0 = Debug_gtest|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_MD|Win32.ActiveCfg = Debug_gtest|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_MD|Win32.Build.0 = Debug_gtest|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_UNICODE|Win32.ActiveCfg = Debug_gtest|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug_UNICODE|Win32.Build.0 = Debug_gtest|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug|Win32.ActiveCfg = Debug|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Debug|Win32.Build.0 = Debug|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Release_MD|Win32.ActiveCfg = Release|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Release_MD|Win32.Build.0 = Release|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Release|Win32.ActiveCfg = Release|Win32 + {652027C2-BCD8-44E5-A987-201992407DCD}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/projects/msvc12/iutest.vcxproj b/projects/msvc12/iutest.vcxproj index ce9146ba87..a1cd583d65 100644 --- a/projects/msvc12/iutest.vcxproj +++ b/projects/msvc12/iutest.vcxproj @@ -224,6 +224,7 @@ + diff --git a/projects/msvc12/iutest.vcxproj.filters b/projects/msvc12/iutest.vcxproj.filters index 267c8a3d32..120b76b2bb 100644 --- a/projects/msvc12/iutest.vcxproj.filters +++ b/projects/msvc12/iutest.vcxproj.filters @@ -315,6 +315,9 @@ iutest\listener + + iutest\gtest\switch + diff --git a/projects/msvc12/iutest_sample.vcxproj b/projects/msvc12/iutest_sample.vcxproj index 89e74887ff..6c9dd6fd97 100644 --- a/projects/msvc12/iutest_sample.vcxproj +++ b/projects/msvc12/iutest_sample.vcxproj @@ -5,6 +5,10 @@ Debug_CTP Win32 + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -81,6 +85,11 @@ MultiByte v120 + + Application + MultiByte + v120 + Application Unicode @@ -107,6 +116,9 @@ + + + @@ -118,24 +130,29 @@ $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ $(Configuration)\$(ProjectName)\ $(Configuration)\$(ProjectName)\ $(Configuration)\$(ProjectName)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(Configuration)\$(ProjectName)\ true true true true true + true true $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ false $(GTEST_ROOT)\include;$(IncludePath) + $(GMOCK_ROOT)\include;$(GMOCK_ROOT)\gtest\include;$(IncludePath) $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) + $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) false @@ -262,6 +279,32 @@ + + + Disabled + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;IUTEST_USE_GMOCK;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + EditAndContinue + 4505 + + + true + Console + MachineX86 + gtestd.lib;%(AdditionalDependencies) + false + + + + + + Disabled diff --git a/projects/msvc12/tr1/tr1.vcxproj b/projects/msvc12/tr1/tr1.vcxproj index 31aaa83a4d..4295585ba4 100644 --- a/projects/msvc12/tr1/tr1.vcxproj +++ b/projects/msvc12/tr1/tr1.vcxproj @@ -5,6 +5,10 @@ Debug_CTP Win32 + + Debug_gmock + Win32 + Debug_gtest Win32 @@ -63,6 +67,12 @@ Unicode v120 + + Application + true + Unicode + v120 + Application false @@ -88,6 +98,9 @@ + + + @@ -109,6 +122,11 @@ $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) $(GTEST_ROOT)\include;$(IncludePath) + + true + $(GTEST_VC12_LIB)\gtest\Debug;$(GTEST_ROOT)\msvc\gtest\Debug;$(LibraryPath) + $(GTEST_ROOT)\include;$(IncludePath) + false @@ -189,6 +207,24 @@ gtestd.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;IUTEST_USE_GTEST;%(PreprocessorDefinitions) + $(ProjectDir)\..\..\..\include + MultiThreadedDebug + + + Console + true + + + gtestd.lib;%(AdditionalDependencies) + + Level3 @@ -212,6 +248,7 @@ false + false diff --git a/projects/msvc14/iutest.vcxproj b/projects/msvc14/iutest.vcxproj index b4db97f0c5..aa53185cfe 100644 --- a/projects/msvc14/iutest.vcxproj +++ b/projects/msvc14/iutest.vcxproj @@ -223,6 +223,7 @@ + diff --git a/projects/msvc14/iutest.vcxproj.filters b/projects/msvc14/iutest.vcxproj.filters index 267c8a3d32..120b76b2bb 100644 --- a/projects/msvc14/iutest.vcxproj.filters +++ b/projects/msvc14/iutest.vcxproj.filters @@ -315,6 +315,9 @@ iutest\listener + + iutest\gtest\switch + diff --git a/projects/msvc8/iutest.vcproj b/projects/msvc8/iutest.vcproj index 45cc0b6cbf..d2ad714ea7 100644 --- a/projects/msvc8/iutest.vcproj +++ b/projects/msvc8/iutest.vcproj @@ -612,6 +612,10 @@ RelativePath="..\..\include\gtest\switch\iutest_switch_filepath.hpp" > + + diff --git a/projects/msvc9/iutest.vcproj b/projects/msvc9/iutest.vcproj index bf03fac4cc..e7ae4e2849 100644 --- a/projects/msvc9/iutest.vcproj +++ b/projects/msvc9/iutest.vcproj @@ -613,6 +613,10 @@ RelativePath="..\..\include\gtest\switch\iutest_switch_filepath.hpp" > + + diff --git a/samples/matcher.cpp b/samples/matcher.cpp index 122df25122..59207e1c7c 100644 --- a/samples/matcher.cpp +++ b/samples/matcher.cpp @@ -21,6 +21,7 @@ using namespace ::iutest::matchers; namespace { struct X { int a, b; X(int _a, int _b) : a(_a), b(_b) {} int GetA() const { return a; } }; + int X2(int v) { return v * 2; } } IUTEST(Matcher, Gernal) @@ -36,10 +37,11 @@ IUTEST(Matcher, Gernal) IUTEST(Matcher, Null) { - void* p1 = NULL; - void* p2 = &p1; + int* p1 = NULL; + int** p2 = &p1; IUTEST_EXPECT_THAT(p1, IsNull()); IUTEST_EXPECT_THAT(p2, NotNull()); + IUTEST_EXPECT_THAT(p2, Pointee(IsNull())); } IUTEST(Matcher, FloatingPoint) @@ -90,6 +92,16 @@ IUTEST(Matcher, Member) IUTEST_EXPECT_THAT(&x, Property(&X::GetA, 0)); } +IUTEST(Matcher, Function) +{ + IUTEST_EXPECT_THAT(1, ResultOf(X2, 2)); +} + +IUTEST(Matcher, Not) +{ + IUTEST_EXPECT_THAT(1, Not(2)); +} + IUTEST(Matcher, Wildcard) { IUTEST_EXPECT_THAT(42, _); diff --git a/test/GNUmakefile b/test/GNUmakefile index 5e9cee0aaf..ef56301ba1 100644 --- a/test/GNUmakefile +++ b/test/GNUmakefile @@ -254,7 +254,7 @@ ifdef USE_GMOCK GMOCK_ROOT_=$(subst \,/,$(GMOCK_ROOT)) GMOCK_INC_=-I$(GMOCK_ROOT_)/include -I$(GMOCK_ROOT_)/gtest/include GMOCK_LIB_=$(GMOCK_ROOT_)/make/gmock-all.o $(GMOCK_ROOT_)/make/gtest-all.o -CXXFLAGS += -DIUTEST_USE_GTEST -DIUTEST_HAS_SOCKET=0 +CXXFLAGS += -DIUTEST_USE_GTEST -DIUTEST_USE_GMOCK -DIUTEST_HAS_SOCKET=0 $(BUILD_ONLY) : $(SRCS) $(IUTEST_HEADERS) $(MAKEFILE) $(CXX) $(IUTEST_INCLUDE) $(CXXFLAGS) -o $@ $@.cpp $(GMOCK_INC_) $(GMOCK_LIB_) diff --git a/test/iutest_matcher_tests.cpp b/test/iutest_matcher_tests.cpp index e40a3d03d4..ac8592357b 100644 --- a/test/iutest_matcher_tests.cpp +++ b/test/iutest_matcher_tests.cpp @@ -35,8 +35,8 @@ int b[3] = { 1, 2, 3 }; int c[3] = { 1, 1, 1 }; int n[2][2] = { {0,1}, {2,3} }; ::std::map m; -void* p1 = NULL; -void* p2 = &p1; +int* p1 = NULL; +int** p2 = &p1; float f0 = 0.0f; double d0 = 0.0; struct X { int a, b; X(int _a, int _b) : a(_a), b(_b) {} int GetA() const { return a; } }; @@ -190,11 +190,13 @@ IUTEST(Matcher, Each) IUTEST_EXPECT_THAT(vv, Each(Each(Le(10)))); } +#if !defined(IUTEST_USE_GMOCK) IUTEST(Matcher, At) { IUTEST_EXPECT_THAT( b, At(1, 2)); IUTEST_EXPECT_THAT(va, At(1, Gt(0))); } +#endif IUTEST(Matcher, Key) { @@ -228,8 +230,11 @@ IUTEST(Matcher, ResultOf) IUTEST(Matcher, Pointee) { +#if !defined(IUTEST_USE_GMOCK) IUTEST_EXPECT_THAT(a, Pointee(0)); IUTEST_EXPECT_THAT(a, Pointee(Ge(0))); +#endif + IUTEST_EXPECT_THAT(p2, Pointee(IsNull())); } IUTEST(Matcher, _) @@ -258,189 +263,208 @@ IUTEST(Matcher, ElementsAreArray) IUTEST_EXPECT_THAT(va, ElementsAreArray(a)); IUTEST_EXPECT_THAT(va, ElementsAreArray(va)); IUTEST_EXPECT_THAT( c, ElementsAreArray(c)); +#if !defined(IUTEST_USE_GMOCK) IUTEST_EXPECT_THAT( c, ElementsAreArray(b, 1)); +#endif +#if IUTEST_HAS_INITIALIZER_LIST + //IUTEST_EXPECT_THAT( c, ElementsAreArray({1, 1, 1})); +#endif } +#if !defined(IUTEST_USE_GMOCK) +# define CHECK_FAILURE(x, str) IUTEST_EXPECT_FATAL_FAILURE( x, str ) +#else +# define CHECK_FAILURE(x, str) IUTEST_EXPECT_FATAL_FAILURE( x, "" ) +#endif + IUTEST(MatcherFailure, Eq) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(1, Eq(0)), "Eq: 0" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(1, Eq(0)), "Eq: 0" ); } IUTEST(MatcherFailure, Ne) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(0, Ne(0)), "Ne: 0" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(0, Ne(0)), "Ne: 0" ); } IUTEST(MatcherFailure, Le) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(1, Le(0)), "Le: 0" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(1, Le(0)), "Le: 0" ); } IUTEST(MatcherFailure, Lt) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(0, Lt(0)), "Lt: 0" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(1, Lt(0)), "Lt: 0" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(0, Lt(0)), "Lt: 0" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(1, Lt(0)), "Lt: 0" ); } IUTEST(MatcherFailure, Ge) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(0, Ge(1)), "Ge: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(0, Ge(1)), "Ge: 1" ); } IUTEST(MatcherFailure, Gt) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(0, Gt(1)), "Gt: 1" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(1, Gt(1)), "Gt: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(0, Gt(1)), "Gt: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(1, Gt(1)), "Gt: 1" ); } IUTEST(MatcherFailure, IsNull) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(p2, IsNull()), "Is Null"); + CHECK_FAILURE( IUTEST_ASSERT_THAT(p2, IsNull()), "Is Null"); } IUTEST(MatcherFailure, NotNull) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(p1, NotNull()), "Not Null"); + CHECK_FAILURE( IUTEST_ASSERT_THAT(p1, NotNull()), "Not Null"); } IUTEST(MatcherFailure, FloatEq) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(f0, FloatEq(1.0f)), "Eq: 1" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(0/f0, FloatEq(0/f0)), "Eq: " ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(f0, FloatEq(1.0f)), "Eq: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(0/f0, FloatEq(0/f0)), "Eq: " ); } IUTEST(MatcherFailure, DoubleEq) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(d0, DoubleEq(1.0)), "Eq: 1" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(0/d0, DoubleEq(0/d0)), "Eq: " ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(d0, DoubleEq(1.0)), "Eq: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(0/d0, DoubleEq(0/d0)), "Eq: " ); } IUTEST(MatcherFailure, NanSensitiveFloatEq) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(f0, NanSensitiveFloatEq(1.0f)), "Eq: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(f0, NanSensitiveFloatEq(1.0f)), "Eq: 1" ); } IUTEST(MatcherFailure, NanSensitiveDoubleEq) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(d0, NanSensitiveDoubleEq(1.0)), "Eq: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(d0, NanSensitiveDoubleEq(1.0)), "Eq: 1" ); } IUTEST(MatcherFailure, StrEq) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", StrEq("Hoge")), "StrEq: Hoge"); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", StrEq("Hoge")), "StrEq: Hoge"); } IUTEST(MatcherFailure, StrNe) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", StrNe("hoge")), "StrNe: hoge"); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", StrNe("hoge")), "StrNe: hoge"); } IUTEST(MatcherFailure, StrCaseEq) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", StrCaseEq("hoga")), "StrCaseEq: hoga"); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", StrCaseEq("hoga")), "StrCaseEq: hoga"); } IUTEST(MatcherFailure, StrCaseNe) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", StrCaseNe("hoge")), "StrCaseNe: hoge"); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", StrCaseNe("hoGe")), "StrCaseNe: hoGe"); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", StrCaseNe("hoge")), "StrCaseNe: hoge"); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", StrCaseNe("hoGe")), "StrCaseNe: hoGe"); } IUTEST(MatcherFailure, StartsWith) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", StartsWith("Ho")) , "StartsWith: Ho" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", StartsWith("oge")), "StartsWith: oge" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", StartsWith("Ho")) , "StartsWith: Ho" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", StartsWith("oge")), "StartsWith: oge" ); } IUTEST(MatcherFailure, HasSubstr) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", HasSubstr("Ho")), "HasSubstr: Ho" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", HasSubstr("oe")), "HasSubstr: oe" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", HasSubstr("Ho")), "HasSubstr: Ho" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", HasSubstr("oe")), "HasSubstr: oe" ); } IUTEST(MatcherFailure, EndsWith) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", EndsWith("Ge")) , "EndsWith: Ge" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", EndsWith("gee")), "EndsWith: gee" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", EndsWith("Ge")) , "EndsWith: Ge" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", EndsWith("gee")), "EndsWith: gee" ); } IUTEST(MatcherFailure, Equals) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", Equals("Hoge")) , "Eq: Hoge" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(0, Equals(1)), "Eq: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", Equals("Hoge")) , "Eq: Hoge" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(0, Equals(1)), "Eq: 1" ); } IUTEST(MatcherFailure, Contains) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(va, Contains(42)), "Contains: 42" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT( b, Contains(42)), "Contains: 42" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(va, Contains(Lt(0))), "Contains: Lt: 0" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(vv, Contains(Contains(Lt(0)))), "Contains: Contains: Lt: 0" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(va, Contains(42)), "Contains: 42" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT( b, Contains(42)), "Contains: 42" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(va, Contains(Lt(0))), "Contains: Lt: 0" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(vv, Contains(Contains(Lt(0)))), "Contains: Contains: Lt: 0" ); } IUTEST(MatcherFailure, Each) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(va, Each(42)), "Each: 42" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT( b, Each(42)), "Each: 42" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(va, Each(Ne(9))), "Each: Ne: 9" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(vv, Each(Each(Gt(5)))), "Each: Each: Gt: 5" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(va, Each(42)), "Each: 42" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT( b, Each(42)), "Each: 42" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(va, Each(Ne(9))), "Each: Ne: 9" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(vv, Each(Each(Gt(5)))), "Each: Each: Gt: 5" ); } +#if !defined(IUTEST_USE_GMOCK) IUTEST(MatcherFailure, At) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT( b, At(2, 2)), "At 2: 2" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(va, At(1, Gt(1))), "At 1: Gt: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT( b, At(2, 2)), "At 2: 2" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(va, At(1, Gt(1))), "At 1: Gt: 1" ); } +#endif IUTEST(MatcherFailure, Key) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT( m, Each(Key(0))), "Each: Key: 0" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT( m, Each(Key(0))), "Each: Key: 0" ); } IUTEST(MatcherFailure, Pair) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT( m, Each(Pair(Gt(5), 100))), "Each: Pair: (Gt: 5, 100)" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT( m, Each(Pair(_, Ne(100)))), "Each: Pair: (_, Ne: 100)" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT( m, Each(Pair(Gt(5), 100))), "Each: Pair: (Gt: 5, 100)" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT( m, Each(Pair(_, Ne(100)))), "Each: Pair: (_, Ne: 100)" ); } IUTEST(MatcherFailure, Field) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT( x, Field(&X::a, 100)), "Field: 100" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT( x, Field(&X::a, Ne(1))), "Field: Ne: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT( x, Field(&X::a, 100)), "Field: 100" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT( x, Field(&X::a, Ne(1))), "Field: Ne: 1" ); } IUTEST(MatcherFailure, Property) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT( x, Property(&X::GetA, 100)), "Property: 100" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT( x, Property(&X::GetA, Ne(1))), "Property: Ne: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT( x, Property(&X::GetA, 100)), "Property: 100" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT( x, Property(&X::GetA, Ne(1))), "Property: Ne: 1" ); } IUTEST(MatcherFailure, ResultOf) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT( 1, ResultOf(X2, 1)), "Result of: 1" ); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT( 1, ResultOf(X2, Le(1))), "Result of: Le: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT( 1, ResultOf(X2, 1)), "Result of: 1" ); + CHECK_FAILURE( IUTEST_ASSERT_THAT( 1, ResultOf(X2, Le(1))), "Result of: Le: 1" ); } IUTEST(MatcherFailure, Pointee) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(a, Pointee(1)), "Points To: 1"); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(a, Pointee(Gt(0))), "Points To: Gt: 0"); +#if !defined(IUTEST_USE_GMOCK) + CHECK_FAILURE( IUTEST_ASSERT_THAT(a, Pointee(1)), "Points To: 1"); + CHECK_FAILURE( IUTEST_ASSERT_THAT(a, Pointee(Gt(0))), "Points To: Gt: 0"); +#endif + CHECK_FAILURE( IUTEST_ASSERT_THAT(p2, Pointee(NotNull())), "Points To: Not Null"); } IUTEST(MatcherFailure, Not) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(1, Not(1)), "Not: (1)"); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(1, Not(Eq(1))), "Not: (Eq: 1)"); + CHECK_FAILURE( IUTEST_ASSERT_THAT(1, Not(1)), "Not: (1)"); + CHECK_FAILURE( IUTEST_ASSERT_THAT(1, Not(Eq(1))), "Not: (Eq: 1)"); } +#if !defined(IUTEST_USE_GMOCK) IUTEST(MatcherFailure, A) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge", A()), "A: "); + CHECK_FAILURE( IUTEST_ASSERT_THAT(0.1, A()), "A: "); + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", A()), "A: "); } +#endif IUTEST(MatcherFailure, ElementsAreArray) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(b, ElementsAreArray(c)), "ElementsAreArray: " ); + CHECK_FAILURE( IUTEST_ASSERT_THAT(b, ElementsAreArray(c)), "ElementsAreArray: " ); } #if IUTEST_HAS_MATCHER_ELEMENTSARE @@ -448,16 +472,18 @@ IUTEST(MatcherFailure, ElementsAreArray) IUTEST(Matcher, ElementsAre) { IUTEST_EXPECT_THAT("hoge", ElementsAre('h', 'o', 'g', 'e', '\0')); +#if !defined(IUTEST_USE_GMOCK) IUTEST_EXPECT_THAT(va, ElementsAre(Ge(0), Gt(0))); +#endif } IUTEST(MatcherFailure, ElementsAre) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge" + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge" , ElementsAre( 'h', 'o', 'G', 'e', '\0')), "ElementsAre(2): G"); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(va + CHECK_FAILURE( IUTEST_ASSERT_THAT(va , ElementsAre(Ge(0), Gt(0), Lt(1))), "ElementsAre(2): Lt: 1"); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(n, Each( + CHECK_FAILURE( IUTEST_ASSERT_THAT(n, Each( ElementsAre(Lt(3), Lt(3)))), "Each: ElementsAre: {Lt: 3, Lt: 3}"); } @@ -504,19 +530,19 @@ IUTEST(Matcher, AnyOf) IUTEST(MatcherFailure, AllOf) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge" + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge" , AllOf( StartsWith("ho"), EndsWith("gE"))), "StartsWith: ho and EndsWith: gE"); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge" + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge" , AllOf( StartsWith("Ho"), EndsWith("ge"))), "StartsWith: Ho"); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(va + CHECK_FAILURE( IUTEST_ASSERT_THAT(va , Each(AllOf( Ge(0), Le(5) ))), "Each: Ge: 0 and Le: 5"); } IUTEST(MatcherFailure, AnyOf) { - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT("hoge" + CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge" , AnyOf( StartsWith("Ho"), EndsWith("gE"))), "StartsWith: Ho or EndsWith: gE"); - IUTEST_EXPECT_FATAL_FAILURE( IUTEST_ASSERT_THAT(va + CHECK_FAILURE( IUTEST_ASSERT_THAT(va , Each(AnyOf( Gt(5), Lt(5) ))), "Each: Gt: 5 or Lt: 5"); }