Update to current gtest/gmock.

testing/gmock/test/gmock-nice-strict_test.cc

 // Copyright 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 39 matching lines @@
 
 namespace testing {
 namespace gmock_nice_strict_test {
 
 using testing::internal::string;
 using testing::GMOCK_FLAG(verbose);
 using testing::HasSubstr;
 using testing::NiceMock;
 using testing::StrictMock;
 
+#if GTEST_HAS_STREAM_REDIRECTION_
+using testing::internal::CaptureStdout;
+using testing::internal::GetCapturedStdout;
+#endif  // GTEST_HAS_STREAM_REDIRECTION_
+
 // Defines some mock classes needed by the tests.
 
 class Foo {
  public:
   virtual ~Foo() {}
 
   virtual void DoThis() = 0;
   virtual int DoThat(bool flag) = 0;
 };
 
@@ skipping 25 matching lines @@
 
   MOCK_METHOD0(This, int());
   MOCK_METHOD2(That, string(int, bool));
 
  private:
   string str_;
 
   GTEST_DISALLOW_COPY_AND_ASSIGN_(MockBar);
 };
 
-// TODO(wan@google.com): find a way to re-enable these tests.
-#if 0
+#if GTEST_HAS_STREAM_REDIRECTION_
 
 // Tests that a nice mock generates no warning for uninteresting calls.
 TEST(NiceMockTest, NoWarningForUninterestingCall) {
   NiceMock<MockFoo> nice_foo;
 
-  CaptureTestStdout();
+  CaptureStdout();
   nice_foo.DoThis();
   nice_foo.DoThat(true);
-  EXPECT_EQ("", GetCapturedTestStdout());
+  EXPECT_STREQ("", GetCapturedStdout().c_str());
 }
 
 // Tests that a nice mock generates no warning for uninteresting calls
 // that delete the mock object.
 TEST(NiceMockTest, NoWarningForUninterestingCallAfterDeath) {
   NiceMock<MockFoo>* const nice_foo = new NiceMock<MockFoo>;
 
   ON_CALL(*nice_foo, DoThis())
       .WillByDefault(Invoke(nice_foo, &MockFoo::Delete));
 
-  CaptureTestStdout();
+  CaptureStdout();
   nice_foo->DoThis();
-  EXPECT_EQ("", GetCapturedTestStdout());
+  EXPECT_STREQ("", GetCapturedStdout().c_str());
 }
 
 // Tests that a nice mock generates informational logs for
 // uninteresting calls.
 TEST(NiceMockTest, InfoForUninterestingCall) {
   NiceMock<MockFoo> nice_foo;
 
   GMOCK_FLAG(verbose) = "info";
-  CaptureTestStdout();
+  CaptureStdout();
   nice_foo.DoThis();
-  EXPECT_THAT(GetCapturedTestStdout(),
+  EXPECT_THAT(GetCapturedStdout(),
               HasSubstr("Uninteresting mock function call"));
 
-  CaptureTestStdout();
+  CaptureStdout();
   nice_foo.DoThat(true);
-  EXPECT_THAT(GetCapturedTestStdout(),
+  EXPECT_THAT(GetCapturedStdout(),
               HasSubstr("Uninteresting mock function call"));
 }
 
-#endif  // 0
+#endif  // GTEST_HAS_STREAM_REDIRECTION_
 
 // Tests that a nice mock allows expected calls.
 TEST(NiceMockTest, AllowsExpectedCall) {
   NiceMock<MockFoo> nice_foo;
 
   EXPECT_CALL(nice_foo, DoThis());
   nice_foo.DoThis();
 }
 
 // Tests that an unexpected call on a nice mock fails.
@@ skipping 110 matching lines @@
 // causes the program to crash there, for reasons unclear to us yet.
 TEST(StrictMockTest, AcceptsClassNamedMock) {
   StrictMock< ::Mock> strict;
   EXPECT_CALL(strict, DoThis());
   strict.DoThis();
 }
 #endif  // !GTEST_OS_SYMBIAN && !GTEST_OS_WINDOWS_MOBILE
 
 }  // namespace gmock_nice_strict_test
 }  // namespace testing