diff options
author | Gennadiy Civil <misterg@google.com> | 2018-02-13 19:56:05 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-02-13 19:56:05 (GMT) |
commit | 09581b38523a0598d645fb801c31c9baead5d36f (patch) | |
tree | f3b34054e7c39b6796ba2c5ed1c1c560f8f0c336 /googletest/include/gtest | |
parent | 069724197c03e56c0197b80ace8b97187d27c45d (diff) | |
download | googletest-09581b38523a0598d645fb801c31c9baead5d36f.zip googletest-09581b38523a0598d645fb801c31c9baead5d36f.tar.gz googletest-09581b38523a0598d645fb801c31c9baead5d36f.tar.bz2 |
cleanup/merges
Diffstat (limited to 'googletest/include/gtest')
-rw-r--r-- | googletest/include/gtest/gtest-printers.h | 2 | ||||
-rw-r--r-- | googletest/include/gtest/gtest_prod.h | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h index 4deaad0..2c83c3f 100644 --- a/googletest/include/gtest/gtest-printers.h +++ b/googletest/include/gtest/gtest-printers.h @@ -112,8 +112,8 @@ #endif #if GTEST_HAS_ABSL -#include "absl/types/optional.h" #include "absl/strings/string_view.h" +#include "absl/types/optional.h" #endif // GTEST_HAS_ABSL namespace testing { diff --git a/googletest/include/gtest/gtest_prod.h b/googletest/include/gtest/gtest_prod.h index da80ddc..d9ea685 100644 --- a/googletest/include/gtest/gtest_prod.h +++ b/googletest/include/gtest/gtest_prod.h @@ -40,17 +40,20 @@ // // class MyClass { // private: -// void MyMethod(); -// FRIEND_TEST(MyClassTest, MyMethod); +// void PrivateMethod(); +// FRIEND_TEST(MyClassTest, PrivateMethodWorks); // }; // // class MyClassTest : public testing::Test { // // ... // }; // -// TEST_F(MyClassTest, MyMethod) { -// // Can call MyClass::MyMethod() here. +// TEST_F(MyClassTest, PrivateMethodWorks) { +// // Can call MyClass::PrivateMethod() here. // } +// +// Note: The test class must be in the same namespace as the class being tested. +// For example, putting MyClassTest in an anonymous namespace will not work. #define FRIEND_TEST(test_case_name, test_name)\ friend class test_case_name##_##test_name##_Test |