aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-06-11 11:49:02 -0400
committerGennadiy Civil <misterg@google.com>2018-06-11 11:49:02 -0400
commit4490be87897d598a403bb4a115a3a0fd79a37ca3 (patch)
tree774ccad45392b02bde1ed26b5e148bc14b9abb15
parentf213b6399e03a2d07da6a6984fa157e17cafd474 (diff)
downloadgoogletest-4490be87897d598a403bb4a115a3a0fd79a37ca3.tar.gz
googletest-4490be87897d598a403bb4a115a3a0fd79a37ca3.tar.bz2
googletest-4490be87897d598a403bb4a115a3a0fd79a37ca3.zip
Rename FAQ.md to faq.md and adjust the links.
Part of documentation rationalization
-rw-r--r--googletest/docs/Documentation.md2
-rw-r--r--googletest/docs/advanced.md4
-rw-r--r--googletest/docs/faq.md (renamed from googletest/docs/FAQ.md)0
-rw-r--r--googletest/docs/primer.md2
4 files changed, 4 insertions, 4 deletions
diff --git a/googletest/docs/Documentation.md b/googletest/docs/Documentation.md
index 1b6aa4fa..b6c77af1 100644
--- a/googletest/docs/Documentation.md
+++ b/googletest/docs/Documentation.md
@@ -8,7 +8,7 @@ the respective git branch/tag).**
* [Samples](Samples.md) -- learn from examples.
* [AdvancedGuide](advanced.md) -- learn more about Google Test.
* [XcodeGuide](XcodeGuide.md) -- how to use Google Test in Xcode on Mac.
- * [Frequently-Asked Questions](FAQ.md) -- check here before asking a question on the mailing list.
+ * [Frequently-Asked Questions](faq.md) -- check here before asking a question on the mailing list.
To contribute code to Google Test, read:
diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md
index 857967ac..73b79540 100644
--- a/googletest/docs/advanced.md
+++ b/googletest/docs/advanced.md
@@ -125,7 +125,7 @@ c is 10<br>
**Notes:**
- 1. If you see a compiler error "no matching function to call" when using `ASSERT_PRED*` or `EXPECT_PRED*`, please see [this FAQ](FAQ.md#the-compiler-complains-no-matching-function-to-call-when-i-use-assert_predn-how-do-i-fix-it) for how to resolve it.
+ 1. If you see a compiler error "no matching function to call" when using `ASSERT_PRED*` or `EXPECT_PRED*`, please see [this FAQ](faq.md#the-compiler-complains-no-matching-function-to-call-when-i-use-assert_predn-how-do-i-fix-it) for how to resolve it.
1. Currently we only provide predicate assertions of arity <= 5. If you need a higher-arity assertion, let us know.
_Availability_: Linux, Windows, Mac.
@@ -2413,4 +2413,4 @@ file as an example on how to compile your tests against them.
Congratulations! You've now learned more advanced Google Test tools and are
ready to tackle more complex testing tasks. If you want to dive even deeper, you
-can read the [Frequently-Asked Questions](FAQ.md).
+can read the [Frequently-Asked Questions](faq.md).
diff --git a/googletest/docs/FAQ.md b/googletest/docs/faq.md
index a886bdcc..a886bdcc 100644
--- a/googletest/docs/FAQ.md
+++ b/googletest/docs/faq.md
diff --git a/googletest/docs/primer.md b/googletest/docs/primer.md
index 561ad028..48ce894e 100644
--- a/googletest/docs/primer.md
+++ b/googletest/docs/primer.md
@@ -290,7 +290,7 @@ To create a fixture, just:
1. Derive a class from `::testing::Test` . Start its body with `protected:` or `public:` as we'll want to access fixture members from sub-classes.
1. Inside the class, declare any objects you plan to use.
1. If necessary, write a default constructor or `SetUp()` function to prepare the objects for each test. A common mistake is to spell `SetUp()` as `Setup()` with a small `u` - don't let that happen to you.
- 1. If necessary, write a destructor or `TearDown()` function to release any resources you allocated in `SetUp()` . To learn when you should use the constructor/destructor and when you should use `SetUp()/TearDown()`, read this [FAQ entry](FAQ.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function).
+ 1. If necessary, write a destructor or `TearDown()` function to release any resources you allocated in `SetUp()` . To learn when you should use the constructor/destructor and when you should use `SetUp()/TearDown()`, read this [FAQ entry](faq.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function).
1. If needed, define subroutines for your tests to share.
When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to