diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-02-23 23:21:55 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-02-23 23:21:55 +0000 |
| commit | 0af0709b02899f9177db55eba7929e65e5834b29 (patch) | |
| tree | 96dd43de8d817d4cea7090c7daf548ebc9869237 /test/gtest_repeat_test.cc | |
| parent | 3c7868a9a8fab4fd9209bbd2d2f1ae269d063680 (diff) | |
| download | googletest-0af0709b02899f9177db55eba7929e65e5834b29.tar.gz googletest-0af0709b02899f9177db55eba7929e65e5834b29.tar.bz2 googletest-0af0709b02899f9177db55eba7929e65e5834b29.zip | |
Cleans up macro definitions.
Diffstat (limited to 'test/gtest_repeat_test.cc')
| -rw-r--r-- | test/gtest_repeat_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/gtest_repeat_test.cc b/test/gtest_repeat_test.cc index 65298bfa..39a0601d 100644 --- a/test/gtest_repeat_test.cc +++ b/test/gtest_repeat_test.cc @@ -40,9 +40,9 @@ // included, or there will be a compiler error. This trick is to // prevent a user from accidentally including gtest-internal-inl.h in // his code. -#define GTEST_IMPLEMENTATION +#define GTEST_IMPLEMENTATION_ 1 #include "src/gtest-internal-inl.h" -#undef GTEST_IMPLEMENTATION +#undef GTEST_IMPLEMENTATION_ namespace testing { @@ -112,7 +112,7 @@ int g_death_test_count = 0; TEST(BarDeathTest, ThreadSafeAndFast) { g_death_test_count++; -#ifdef GTEST_HAS_DEATH_TEST +#if GTEST_HAS_DEATH_TEST GTEST_FLAG(death_test_style) = "threadsafe"; EXPECT_DEATH(abort(), ""); @@ -121,7 +121,7 @@ TEST(BarDeathTest, ThreadSafeAndFast) { #endif // GTEST_HAS_DEATH_TEST } -#ifdef GTEST_HAS_PARAM_TEST +#if GTEST_HAS_PARAM_TEST int g_param_test_count = 0; const int kNumberOfParamTests = 10; @@ -146,7 +146,7 @@ void ResetCounts() { g_should_fail_count = 0; g_should_pass_count = 0; g_death_test_count = 0; -#ifdef GTEST_HAS_PARAM_TEST +#if GTEST_HAS_PARAM_TEST g_param_test_count = 0; #endif // GTEST_HAS_PARAM_TEST } @@ -158,7 +158,7 @@ void CheckCounts(int expected) { GTEST_CHECK_INT_EQ_(expected, g_should_fail_count); GTEST_CHECK_INT_EQ_(expected, g_should_pass_count); GTEST_CHECK_INT_EQ_(expected, g_death_test_count); -#ifdef GTEST_HAS_PARAM_TEST +#if GTEST_HAS_PARAM_TEST GTEST_CHECK_INT_EQ_(expected * kNumberOfParamTests, g_param_test_count); #endif // GTEST_HAS_PARAM_TEST } @@ -203,7 +203,7 @@ void TestRepeatWithFilterForSuccessfulTests(int repeat) { GTEST_CHECK_INT_EQ_(0, g_should_fail_count); GTEST_CHECK_INT_EQ_(repeat, g_should_pass_count); GTEST_CHECK_INT_EQ_(repeat, g_death_test_count); -#ifdef GTEST_HAS_PARAM_TEST +#if GTEST_HAS_PARAM_TEST GTEST_CHECK_INT_EQ_(repeat * kNumberOfParamTests, g_param_test_count); #endif // GTEST_HAS_PARAM_TEST } @@ -221,7 +221,7 @@ void TestRepeatWithFilterForFailedTests(int repeat) { GTEST_CHECK_INT_EQ_(repeat, g_should_fail_count); GTEST_CHECK_INT_EQ_(0, g_should_pass_count); GTEST_CHECK_INT_EQ_(0, g_death_test_count); -#ifdef GTEST_HAS_PARAM_TEST +#if GTEST_HAS_PARAM_TEST GTEST_CHECK_INT_EQ_(0, g_param_test_count); #endif // GTEST_HAS_PARAM_TEST } |