diff options
author | Baruch <bmburstein@gmail.com> | 2022-08-25 07:55:49 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-25 07:55:49 (GMT) |
commit | dd969ed5fed68a518027ea1655579fa8768f3aae (patch) | |
tree | 57545d600884b7ca7c7e3edebfc07cfea175ccd6 /docs | |
parent | 3280a930bf3f2fdb77da9a6cdf5866ef22708ff1 (diff) | |
parent | 25cc5777a17820a6339204a3552aa1dd5e428669 (diff) | |
download | googletest-dd969ed5fed68a518027ea1655579fa8768f3aae.zip googletest-dd969ed5fed68a518027ea1655579fa8768f3aae.tar.gz googletest-dd969ed5fed68a518027ea1655579fa8768f3aae.tar.bz2 |
Merge branch 'google:main' into custom_type_combine
Diffstat (limited to 'docs')
-rw-r--r-- | docs/_layouts/default.html | 2 | ||||
-rw-r--r-- | docs/advanced.md | 10 | ||||
-rw-r--r-- | docs/faq.md | 2 | ||||
-rw-r--r-- | docs/samples.md | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index dcb42d9..c7f331b 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -48,7 +48,7 @@ <div class="footer"> GoogleTest · <a href="https://github.com/google/googletest">GitHub Repository</a> · - <a href="https://github.com/google/googletest/blob/master/LICENSE">License</a> · + <a href="https://github.com/google/googletest/blob/main/LICENSE">License</a> · <a href="https://policies.google.com/privacy">Privacy Policy</a> </div> </div> diff --git a/docs/advanced.md b/docs/advanced.md index 9a752b9..bce983c 100644 --- a/docs/advanced.md +++ b/docs/advanced.md @@ -1142,8 +1142,8 @@ GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FooTest); You can see [sample7_unittest.cc] and [sample8_unittest.cc] for more examples. -[sample7_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample7_unittest.cc "Parameterized Test example" -[sample8_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample8_unittest.cc "Parameterized Test example with multiple parameters" +[sample7_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample7_unittest.cc "Parameterized Test example" +[sample8_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample8_unittest.cc "Parameterized Test example with multiple parameters" ### Creating Value-Parameterized Abstract Tests @@ -1294,7 +1294,7 @@ TYPED_TEST(FooTest, HasPropertyA) { ... } You can see [sample6_unittest.cc] for a complete example. -[sample6_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample6_unittest.cc "Typed Test example" +[sample6_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample6_unittest.cc "Typed Test example" ## Type-Parameterized Tests @@ -1733,7 +1733,7 @@ You can do so by adding one line: Now, sit back and enjoy a completely different output from your tests. For more details, see [sample9_unittest.cc]. -[sample9_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample9_unittest.cc "Event listener example" +[sample9_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample9_unittest.cc "Event listener example" You may append more than one listener to the list. When an `On*Start()` or `OnTestPartResult()` event is fired, the listeners will receive it in the order @@ -1760,7 +1760,7 @@ by the former. See [sample10_unittest.cc] for an example of a failure-raising listener. -[sample10_unittest.cc]: https://github.com/google/googletest/blob/master/googletest/samples/sample10_unittest.cc "Failure-raising listener example" +[sample10_unittest.cc]: https://github.com/google/googletest/blob/main/googletest/samples/sample10_unittest.cc "Failure-raising listener example" ## Running Test Programs: Advanced Options diff --git a/docs/faq.md b/docs/faq.md index c849aff..1928097 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -267,7 +267,7 @@ If necessary, you can continue to derive test fixtures from a derived fixture. GoogleTest has no limit on how deep the hierarchy can be. For a complete example using derived test fixtures, see -[sample5_unittest.cc](https://github.com/google/googletest/blob/master/googletest/samples/sample5_unittest.cc). +[sample5_unittest.cc](https://github.com/google/googletest/blob/main/googletest/samples/sample5_unittest.cc). ## My compiler complains "void value not ignored as it ought to be." What does this mean? diff --git a/docs/samples.md b/docs/samples.md index 2d97ca5..dedc590 100644 --- a/docs/samples.md +++ b/docs/samples.md @@ -1,7 +1,7 @@ # Googletest Samples If you're like us, you'd like to look at -[googletest samples.](https://github.com/google/googletest/tree/master/googletest/samples) +[googletest samples.](https://github.com/google/googletest/blob/main/googletest/samples) The sample directory has a number of well-commented samples showing how to use a variety of googletest features. |