summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorHyuk Myeong <hyuk.myeong@lge.com>2021-06-13 10:50:40 (GMT)
committerHyuk Myeong <hyuk.myeong@lge.com>2021-06-13 10:53:04 (GMT)
commit1745a405eb7c70e0e4488023a4f2c69fd6faed4f (patch)
tree929ae0feb2906134de5606bedf8f8b0de3547c06 /docs
parente2239ee6043f73722e7aa812a459f54a28552929 (diff)
downloadgoogletest-1745a405eb7c70e0e4488023a4f2c69fd6faed4f.zip
googletest-1745a405eb7c70e0e4488023a4f2c69fd6faed4f.tar.gz
googletest-1745a405eb7c70e0e4488023a4f2c69fd6faed4f.tar.bz2
Diffstat (limited to 'docs')
-rw-r--r--docs/gmock_cheat_sheet.md4
-rw-r--r--docs/gmock_for_dummies.md2
-rw-r--r--docs/pkgconfig.md2
-rw-r--r--docs/reference/actions.md14
-rw-r--r--docs/reference/matchers.md2
5 files changed, 12 insertions, 12 deletions
diff --git a/docs/gmock_cheat_sheet.md b/docs/gmock_cheat_sheet.md
index 17ed7a5..09aeef0 100644
--- a/docs/gmock_cheat_sheet.md
+++ b/docs/gmock_cheat_sheet.md
@@ -230,8 +230,8 @@ class MockFunction<R(A1, ..., An)> {
};
```
-See this [recipe](gmock_cook_book.md#using-check-points) for one application of
-it.
+See this [recipe](gmock_cook_book.md#useful-mocks-created-using-gmock) for one
+application of it.
## Flags
diff --git a/docs/gmock_for_dummies.md b/docs/gmock_for_dummies.md
index 1f4cc24..459bb7f 100644
--- a/docs/gmock_for_dummies.md
+++ b/docs/gmock_for_dummies.md
@@ -480,7 +480,7 @@ the *default* action for the function every time (unless, of course, you have a
`WillRepeatedly()`.).
What can we do inside `WillOnce()` besides `Return()`? You can return a
-reference using `ReturnRef(*variable*)`, or invoke a pre-defined function, among
+reference using `ReturnRef(`*`variable`*`)`, or invoke a pre-defined function, among
[others](gmock_cook_book.md#using-actions).
**Important note:** The `EXPECT_CALL()` statement evaluates the action clause
diff --git a/docs/pkgconfig.md b/docs/pkgconfig.md
index 768e9b4..18a2546 100644
--- a/docs/pkgconfig.md
+++ b/docs/pkgconfig.md
@@ -105,7 +105,7 @@ includedir=/usr/include
Name: gtest
Description: GoogleTest (without main() function)
-Version: 1.10.0
+Version: 1.11.0
URL: https://github.com/google/googletest
Libs: -L${libdir} -lgtest -lpthread
Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1 -lpthread
diff --git a/docs/reference/actions.md b/docs/reference/actions.md
index 166d2a8..ab81a12 100644
--- a/docs/reference/actions.md
+++ b/docs/reference/actions.md
@@ -6,7 +6,7 @@ provided by GoogleTest. All actions are defined in the `::testing` namespace.
## Returning a Value
-| | |
+| Action | Description |
| :-------------------------------- | :-------------------------------------------- |
| `Return()` | Return from a `void` mock function. |
| `Return(value)` | Return `value`. If the type of `value` is different to the mock function's return type, `value` is converted to the latter type <i>at the time the expectation is set</i>, not when the action is executed. |
@@ -20,7 +20,7 @@ provided by GoogleTest. All actions are defined in the `::testing` namespace.
## Side Effects
-| | |
+| Action | Description |
| :--------------------------------- | :-------------------------------------- |
| `Assign(&variable, value)` | Assign `value` to variable. |
| `DeleteArg<N>()` | Delete the `N`-th (0-based) argument, which must be a pointer. |
@@ -38,9 +38,9 @@ provided by GoogleTest. All actions are defined in the `::testing` namespace.
In the following, by "callable" we mean a free function, `std::function`,
functor, or lambda.
-| | |
+| Action | Description |
| :---------------------------------- | :------------------------------------- |
-| `f` | Invoke f with the arguments passed to the mock function, where f is a callable. |
+| `f` | Invoke `f` with the arguments passed to the mock function, where `f` is a callable. |
| `Invoke(f)` | Invoke `f` with the arguments passed to the mock function, where `f` can be a global/static function or a functor. |
| `Invoke(object_pointer, &class::method)` | Invoke the method on the object with the arguments passed to the mock function. |
| `InvokeWithoutArgs(f)` | Invoke `f`, which can be a global/static function or a functor. `f` must take no arguments. |
@@ -86,7 +86,7 @@ value, and `foo` by reference.
## Default Action
-| Matcher | Description |
+| Action | Description |
| :------------ | :----------------------------------------------------- |
| `DoDefault()` | Do the default action (specified by `ON_CALL()` or the built-in one). |
@@ -96,7 +96,7 @@ composite action - trying to do so will result in a run-time error.
## Composite Actions
-| | |
+| Action | Description |
| :----------------------------- | :------------------------------------------ |
| `DoAll(a1, a2, ..., an)` | Do all actions `a1` to `an` and return the result of `an` in each invocation. The first `n - 1` sub-actions must return void and will receive a readonly view of the arguments. |
| `IgnoreResult(a)` | Perform action `a` and ignore its result. `a` must not return void. |
@@ -106,7 +106,7 @@ composite action - trying to do so will result in a run-time error.
## Defining Actions
-| | |
+| Macro | Description |
| :--------------------------------- | :-------------------------------------- |
| `ACTION(Sum) { return arg0 + arg1; }` | Defines an action `Sum()` to return the sum of the mock function's argument #0 and #1. |
| `ACTION_P(Plus, n) { return arg0 + n; }` | Defines an action `Plus(n)` to return the sum of the mock function's argument #0 and `n`. |
diff --git a/docs/reference/matchers.md b/docs/reference/matchers.md
index 9e40cab..8697060 100644
--- a/docs/reference/matchers.md
+++ b/docs/reference/matchers.md
@@ -259,7 +259,7 @@ which must be a permanent callback.
## Defining Matchers
-| Matcher | Description |
+| Macro | Description |
| :----------------------------------- | :------------------------------------ |
| `MATCHER(IsEven, "") { return (arg % 2) == 0; }` | Defines a matcher `IsEven()` to match an even number. |
| `MATCHER_P(IsDivisibleBy, n, "") { *result_listener << "where the remainder is " << (arg % n); return (arg % n) == 0; }` | Defines a matcher `IsDivisibleBy(n)` to match a number divisible by `n`. |