Merge branch 'master' into hethi/issue-1175-cmake-build-type

cfcc89a8 · Herbert Thielen · GitHub · 9ba7946b · 5d431c65 · cfcc89a8
Commit cfcc89a8 authored Aug 30, 2017 by Herbert Thielen Committed by GitHub Aug 30, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

googletest/docs/AdvancedGuide.md googletest/docs/AdvancedGuide.md +2 -2

No files found.
--- a/googletest/docs/AdvancedGuide.md
+++ b/googletest/docs/AdvancedGuide.md
@@ -1623,8 +1623,8 @@ printf("We are in test %s of test case %s.\n",
 ```

 `current_test_info()` returns a null pointer if no test is running. In
-particular, you cannot find the test case name in `TestCaseSetUp()`,
-`TestCaseTearDown()` (where you know the test case name implicitly), or
+particular, you cannot find the test case name in `SetUpTestCase()`,
+`TearDownTestCase()` (where you know the test case name implicitly), or
 functions called from them.

 _Availability:_ Linux, Windows, Mac.