aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-08-30 11:49:23 -0400
committerGitHub <noreply@github.com>2017-08-30 11:49:23 -0400
commitc4ec2ac04de2c5f656971749c27118376bcac715 (patch)
treed47f6883c999b8606c6ca8ea5aab1903c4cb9a3f
parentc780e0e2c4e6d04a47d80068528471a9405c1665 (diff)
parent5d431c650f9c4d0aefdcca72d4b950ea8f0214ac (diff)
downloadgoogletest-c4ec2ac04de2c5f656971749c27118376bcac715.tar.gz
googletest-c4ec2ac04de2c5f656971749c27118376bcac715.tar.bz2
googletest-c4ec2ac04de2c5f656971749c27118376bcac715.zip
Merge branch 'master' into hethi/travis-unused-cmake
-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.