aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Thielen <thielen@hs-worms.de>2017-08-30 21:46:30 +0200
committerGitHub <noreply@github.com>2017-08-30 21:46:30 +0200
commitcfcc89a84a6fbb76dae4e24522267a1d0a94d696 (patch)
tree48f1097fa7e06224508d63f0926c3ccff64b946d
parent9ba7946bde6349d9fd8621d527137c226f69bd83 (diff)
parent5d431c650f9c4d0aefdcca72d4b950ea8f0214ac (diff)
downloadgoogletest-cfcc89a84a6fbb76dae4e24522267a1d0a94d696.tar.gz
googletest-cfcc89a84a6fbb76dae4e24522267a1d0a94d696.tar.bz2
googletest-cfcc89a84a6fbb76dae4e24522267a1d0a94d696.zip
Merge branch 'master' into hethi/issue-1175-cmake-build-type
-rw-r--r--googletest/docs/AdvancedGuide.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/docs/AdvancedGuide.md b/googletest/docs/AdvancedGuide.md
index a454bf45..1076496d 100644
--- 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.