aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Thielen <thielen@hs-worms.de>2017-08-31 20:51:49 +0200
committerGitHub <noreply@github.com>2017-08-31 20:51:49 +0200
commit2a720ac1bbd6dd0d14022bedf7a0c3629863b916 (patch)
tree0fa2468770b32cd48625457e7ff0bfbd991bf406
parent7f27d8bdd1f44c1dfc758ccfdd82e97af5af36b6 (diff)
parent92e920730daecd3fd4e19d1ce9fa52a3558c2d57 (diff)
downloadgoogletest-2a720ac1bbd6dd0d14022bedf7a0c3629863b916.tar.gz
googletest-2a720ac1bbd6dd0d14022bedf7a0c3629863b916.tar.bz2
googletest-2a720ac1bbd6dd0d14022bedf7a0c3629863b916.zip
Merge branch 'master' into hethi/issue-1175-cmake-build-type
-rw-r--r--googletest/docs/FAQ.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/docs/FAQ.md b/googletest/docs/FAQ.md
index 36f5f7fb..76c23727 100644
--- a/googletest/docs/FAQ.md
+++ b/googletest/docs/FAQ.md
@@ -1034,7 +1034,7 @@ namespace bar {
TEST(CoolTest, DoSomething) {
SUCCEED();
}
-} // namespace foo
+} // namespace bar
```
However, the following code is **not allowed** and will produce a runtime error from Google Test because the test methods are using different test fixture classes with the same test case name.
@@ -1052,7 +1052,7 @@ class CoolTest : public ::testing::Test {}; // Fixture: bar::CoolTest
TEST_F(CoolTest, DoSomething) {
SUCCEED();
}
-} // namespace foo
+} // namespace bar
```
## How do I build Google Testing Framework with Xcode 4? ##