diff options
-rw-r--r-- | docs/advanced.md | 2 | ||||
-rw-r--r-- | docs/community_created_documentation.md | 2 | ||||
-rw-r--r-- | docs/gmock_cheat_sheet.md | 8 | ||||
-rw-r--r-- | docs/gmock_cook_book.md | 2 | ||||
-rw-r--r-- | docs/gmock_for_dummies.md | 2 | ||||
-rw-r--r-- | googlemock/README.md | 8 |
6 files changed, 10 insertions, 14 deletions
diff --git a/docs/advanced.md b/docs/advanced.md index 9d8d943..4b6ba0e 100644 --- a/docs/advanced.md +++ b/docs/advanced.md @@ -371,7 +371,7 @@ Verifies that `val1` is less than, or almost equal to, `val2`. You can replace ### Asserting Using gMock Matchers -[gMock](gmock_index.md) comes with +[gMock](gmock_for_dummies.md) comes with [a library of matchers](gmock_cheat_sheet.md#MatcherList) for validating arguments passed to mock objects. A gMock *matcher* is basically a predicate that knows how to describe itself. It can be used in these assertion diff --git a/docs/community_created_documentation.md b/docs/community_created_documentation.md index dfd87f7..4569075 100644 --- a/docs/community_created_documentation.md +++ b/docs/community_created_documentation.md @@ -1,7 +1,5 @@ # Community-Created Documentation -go/gunit-community-created-docs - The following is a list, in no particular order, of links to documentation created by the Googletest community. diff --git a/docs/gmock_cheat_sheet.md b/docs/gmock_cheat_sheet.md index c13d85d..0251efc 100644 --- a/docs/gmock_cheat_sheet.md +++ b/docs/gmock_cheat_sheet.md @@ -289,8 +289,7 @@ will be changed. `IsTrue` and `IsFalse` are useful when you need to use a matcher, or for types that can be explicitly converted to Boolean, but are not implicitly converted to Boolean. In other cases, you can use the basic -[`EXPECT_TRUE` and `EXPECT_FALSE`](../../googletest/docs/primer#basic-assertions) -assertions. +[`EXPECT_TRUE` and `EXPECT_FALSE`](primer.md#basic-assertions) assertions. ### Floating-Point Matchers {#FpMatchers} @@ -340,9 +339,8 @@ The `argument` can be either a C string or a C++ string object: `ContainsRegex()` and `MatchesRegex()` take ownership of the `RE` object. They use the regular expression syntax defined -[here](../../googletest/docs/advanced.md#regular-expression-syntax). All of -these matchers, except `ContainsRegex()` and `MatchesRegex()` work for wide -strings as well. +[here](advanced.md#regular-expression-syntax). All of these matchers, except +`ContainsRegex()` and `MatchesRegex()` work for wide strings as well. ### Container Matchers diff --git a/docs/gmock_cook_book.md b/docs/gmock_cook_book.md index 3707d81..d9e825c 100644 --- a/docs/gmock_cook_book.md +++ b/docs/gmock_cook_book.md @@ -4253,7 +4253,7 @@ value printer. This printer knows how to print built-in C++ types, native arrays, STL containers, and any type that supports the `<<` operator. For other types, it prints the raw bytes in the value and hopes that you the user can figure it out. -[googletest's advanced guide](../../googletest/docs/advanced.md#teaching-googletest-how-to-print-your-values) +[The GoogleTest advanced guide](advanced.md#teaching-googletest-how-to-print-your-values) explains how to extend the printer to do a better job at printing your particular type than to dump the bytes. diff --git a/docs/gmock_for_dummies.md b/docs/gmock_for_dummies.md index 7bec29a..5676910 100644 --- a/docs/gmock_for_dummies.md +++ b/docs/gmock_for_dummies.md @@ -505,7 +505,7 @@ always return 100 as `n++` is only evaluated once. Similarly, `Return(new Foo)` will create a new `Foo` object when the `EXPECT_CALL()` is executed, and will return the same pointer every time. If you want the side effect to happen every time, you need to define a custom action, which we'll teach in the -[cook book](http://<!-- GOOGLETEST_CM0012 DO NOT DELETE -->). +[cook book](gmock_cook_book.md). Time for another quiz! What do you think the following means? diff --git a/googlemock/README.md b/googlemock/README.md index daafe28..beeb7ea 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -30,10 +30,10 @@ gMock: Details and examples can be found here: -* [gMock for Dummies](docs/for_dummies.md) -* [Legacy gMock FAQ](docs/gmock_faq.md) -* [gMock Cookbook](docs/cook_book.md) -* [gMock Cheat Sheet](docs/cheat_sheet.md) +* [gMock for Dummies](../docs/gmock_for_dummies.md) +* [Legacy gMock FAQ](../docs/gmock_faq.md) +* [gMock Cookbook](../docs/gmock_cook_book.md) +* [gMock Cheat Sheet](../docs/gmock_cheat_sheet.md) Please note that code under scripts/generator/ is from the [cppclean project](http://code.google.com/p/cppclean/) and under the Apache |