diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-08-31 18:28:02 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-08-31 18:28:02 +0000 |
| commit | 2516f60da9073f3b04c0bbfc37d3aefffe11767e (patch) | |
| tree | b7ce61b652acc1b0401fed3804605f5b56543ff7 /test/gmock-internal-utils_test.cc | |
| parent | ccedc1c93371e3b3826bc2d83b77ab1a26d07dc6 (diff) | |
| download | googletest-2516f60da9073f3b04c0bbfc37d3aefffe11767e.tar.gz googletest-2516f60da9073f3b04c0bbfc37d3aefffe11767e.tar.bz2 googletest-2516f60da9073f3b04c0bbfc37d3aefffe11767e.zip | |
Publishes GTEST_HAS_STREAM_REDIRECTION (by Vlad Losev); casts char to unsigned char before calling isspace() etc to avoid undefined behavior (by Zhanyong Wan); fixes the VC projects (by Fredrik Roubert).
Diffstat (limited to 'test/gmock-internal-utils_test.cc')
| -rw-r--r-- | test/gmock-internal-utils_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/gmock-internal-utils_test.cc b/test/gmock-internal-utils_test.cc index 4309f7c8..720d6c72 100644 --- a/test/gmock-internal-utils_test.cc +++ b/test/gmock-internal-utils_test.cc @@ -375,7 +375,7 @@ TEST_F(LogIsVisibleTest, WorksWhenVerbosityIsWarning) { EXPECT_TRUE(LogIsVisible(WARNING)); } -#if GTEST_HAS_STREAM_REDIRECTION_ +#if GTEST_HAS_STREAM_REDIRECTION // Tests the Log() function. @@ -458,7 +458,7 @@ TEST(LogTest, OnlyWarningsArePrintedWhenVerbosityIsInvalid) { TestLogWithSeverity("invalid", WARNING, true); } -#endif // GTEST_HAS_STREAM_REDIRECTION_ +#endif // GTEST_HAS_STREAM_REDIRECTION TEST(TypeTraitsTest, true_type) { EXPECT_TRUE(true_type::value); @@ -495,7 +495,7 @@ TEST(TypeTraitsTest, remove_reference) { EXPECT_TRUE((type_equals<double*, remove_reference<double*>::type>::value)); } -#if GTEST_HAS_STREAM_REDIRECTION_ +#if GTEST_HAS_STREAM_REDIRECTION // Verifies that Log() behaves correctly for the given verbosity level // and log severity. @@ -572,7 +572,7 @@ TEST(OnCallTest, LogsAnythingArgument) { HasSubstr("ON_CALL(mock, TestMethodArg(_)")); } -#endif // GTEST_HAS_STREAM_REDIRECTION_ +#endif // GTEST_HAS_STREAM_REDIRECTION // Tests StlContainerView. |