diff options
author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-05-10 17:14:29 +0000 |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-05-10 17:14:29 +0000 |
commit | 02f7106557fde1f1075dc53d65ef1f7a11851f93 (patch) | |
tree | 6218ed0ee19038e58ffe1f5c6571ed17e195df1c /test/gmock-actions_test.cc | |
parent | 76c1c612e23d87874669faf0b1c8f74caa4a7eb4 (diff) | |
download | googletest-02f7106557fde1f1075dc53d65ef1f7a11851f93.tar.gz googletest-02f7106557fde1f1075dc53d65ef1f7a11851f93.tar.bz2 googletest-02f7106557fde1f1075dc53d65ef1f7a11851f93.zip |
Moves the universal printer from gmock to gtest (by Vlad Losev).
Diffstat (limited to 'test/gmock-actions_test.cc')
-rw-r--r-- | test/gmock-actions_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/gmock-actions_test.cc b/test/gmock-actions_test.cc index a2c6fe11..8391e5fe 100644 --- a/test/gmock-actions_test.cc +++ b/test/gmock-actions_test.cc @@ -74,9 +74,9 @@ using testing::SetArgumentPointee; using testing::SetErrnoAndReturn; #endif -#if GMOCK_HAS_PROTOBUF_ +#if GTEST_HAS_PROTOBUF_ using testing::internal::TestMessage; -#endif // GMOCK_HAS_PROTOBUF_ +#endif // GTEST_HAS_PROTOBUF_ // Tests that BuiltInDefaultValue<T*>::Get() returns NULL. TEST(BuiltInDefaultValueTest, IsNullForPointerTypes) { @@ -689,7 +689,7 @@ TEST(SetArgumentPointeeTest, SetsTheNthPointee) { EXPECT_EQ('a', ch); } -#if GMOCK_HAS_PROTOBUF_ +#if GTEST_HAS_PROTOBUF_ // Tests that SetArgumentPointee<N>(proto_buffer) sets the v1 protobuf // variable pointed to by the N-th (0-based) argument to proto_buffer. @@ -786,7 +786,7 @@ TEST(SetArgumentPointeeTest, SetsTheNthPointeeOfProto2BufferBaseType) { EXPECT_EQ("hi", dest.string_field()); } -#endif // GMOCK_HAS_PROTOBUF_ +#endif // GTEST_HAS_PROTOBUF_ // Sample functions and functors for testing Invoke() and etc. int Nullary() { return 1; } |