Merge pull request #3443 from hyukmyeong:typo
PiperOrigin-RevId: 380705469
This commit is contained in:
commit
355d57d90d
@ -14,9 +14,9 @@ Our documentation is now live on GitHub Pages at
|
|||||||
https://google.github.io/googletest/. We recommend browsing the documentation on
|
https://google.github.io/googletest/. We recommend browsing the documentation on
|
||||||
GitHub Pages rather than directly in the repository.
|
GitHub Pages rather than directly in the repository.
|
||||||
|
|
||||||
#### Release 1.10.x
|
#### Release 1.11.0
|
||||||
|
|
||||||
[Release 1.10.x](https://github.com/google/googletest/releases/tag/release-1.10.0)
|
[Release 1.11.0](https://github.com/google/googletest/releases/tag/release-1.11.0)
|
||||||
is now available.
|
is now available.
|
||||||
|
|
||||||
#### Coming Soon
|
#### Coming Soon
|
||||||
@ -109,8 +109,8 @@ Windows and Linux platforms.
|
|||||||
|
|
||||||
[GoogleTest UI](https://github.com/ospector/gtest-gbar) is a test runner that
|
[GoogleTest UI](https://github.com/ospector/gtest-gbar) is a test runner that
|
||||||
runs your test binary, allows you to track its progress via a progress bar, and
|
runs your test binary, allows you to track its progress via a progress bar, and
|
||||||
displays a list of test failures. Clicking on one shows failure text. Google
|
displays a list of test failures. Clicking on one shows failure text. GoogleTest
|
||||||
Test UI is written in C#.
|
UI is written in C#.
|
||||||
|
|
||||||
[GTest TAP Listener](https://github.com/kinow/gtest-tap-listener) is an event
|
[GTest TAP Listener](https://github.com/kinow/gtest-tap-listener) is an event
|
||||||
listener for GoogleTest that implements the
|
listener for GoogleTest that implements the
|
||||||
|
@ -230,7 +230,7 @@ class MockFunction<R(A1, ..., An)> {
|
|||||||
};
|
};
|
||||||
```
|
```
|
||||||
|
|
||||||
See this [recipe](gmock_cook_book.md#using-check-points) for one application of
|
See this [recipe](gmock_cook_book.md#UsingCheckPoints) for one application of
|
||||||
it.
|
it.
|
||||||
|
|
||||||
## Flags
|
## Flags
|
||||||
|
@ -480,8 +480,8 @@ the *default* action for the function every time (unless, of course, you have a
|
|||||||
`WillRepeatedly()`.).
|
`WillRepeatedly()`.).
|
||||||
|
|
||||||
What can we do inside `WillOnce()` besides `Return()`? You can return a
|
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,
|
||||||
[others](gmock_cook_book.md#using-actions).
|
among [others](gmock_cook_book.md#using-actions).
|
||||||
|
|
||||||
**Important note:** The `EXPECT_CALL()` statement evaluates the action clause
|
**Important note:** The `EXPECT_CALL()` statement evaluates the action clause
|
||||||
only once, even though the action may be performed many times. Therefore you
|
only once, even though the action may be performed many times. Therefore you
|
||||||
|
@ -105,7 +105,7 @@ includedir=/usr/include
|
|||||||
|
|
||||||
Name: gtest
|
Name: gtest
|
||||||
Description: GoogleTest (without main() function)
|
Description: GoogleTest (without main() function)
|
||||||
Version: 1.10.0
|
Version: 1.11.0
|
||||||
URL: https://github.com/google/googletest
|
URL: https://github.com/google/googletest
|
||||||
Libs: -L${libdir} -lgtest -lpthread
|
Libs: -L${libdir} -lgtest -lpthread
|
||||||
Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1 -lpthread
|
Cflags: -I${includedir} -DGTEST_HAS_PTHREAD=1 -lpthread
|
||||||
|
@ -6,7 +6,7 @@ provided by GoogleTest. All actions are defined in the `::testing` namespace.
|
|||||||
|
|
||||||
## Returning a Value
|
## Returning a Value
|
||||||
|
|
||||||
| | |
|
| Action | Description |
|
||||||
| :-------------------------------- | :-------------------------------------------- |
|
| :-------------------------------- | :-------------------------------------------- |
|
||||||
| `Return()` | Return from a `void` mock function. |
|
| `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. |
|
| `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
|
## Side Effects
|
||||||
|
|
||||||
| | |
|
| Action | Description |
|
||||||
| :--------------------------------- | :-------------------------------------- |
|
| :--------------------------------- | :-------------------------------------- |
|
||||||
| `Assign(&variable, value)` | Assign `value` to variable. |
|
| `Assign(&variable, value)` | Assign `value` to variable. |
|
||||||
| `DeleteArg<N>()` | Delete the `N`-th (0-based) argument, which must be a pointer. |
|
| `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`,
|
In the following, by "callable" we mean a free function, `std::function`,
|
||||||
functor, or lambda.
|
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(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. |
|
| `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. |
|
| `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
|
## Default Action
|
||||||
|
|
||||||
| Matcher | Description |
|
| Action | Description |
|
||||||
| :------------ | :----------------------------------------------------- |
|
| :------------ | :----------------------------------------------------- |
|
||||||
| `DoDefault()` | Do the default action (specified by `ON_CALL()` or the built-in one). |
|
| `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
|
## 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. |
|
| `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. |
|
| `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
|
## 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(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`. |
|
| `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`. |
|
||||||
|
@ -259,7 +259,7 @@ which must be a permanent callback.
|
|||||||
|
|
||||||
## Defining Matchers
|
## Defining Matchers
|
||||||
|
|
||||||
| Matcher | Description |
|
| Macro | Description |
|
||||||
| :----------------------------------- | :------------------------------------ |
|
| :----------------------------------- | :------------------------------------ |
|
||||||
| `MATCHER(IsEven, "") { return (arg % 2) == 0; }` | Defines a matcher `IsEven()` to match an even number. |
|
| `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`. |
|
| `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`. |
|
||||||
|
@ -25,7 +25,7 @@ When building GoogleTest as a standalone project, the typical workflow starts
|
|||||||
with
|
with
|
||||||
|
|
||||||
```
|
```
|
||||||
git clone https://github.com/google/googletest.git -b release-1.10.0
|
git clone https://github.com/google/googletest.git -b release-1.11.0
|
||||||
cd googletest # Main directory of the cloned repository.
|
cd googletest # Main directory of the cloned repository.
|
||||||
mkdir build # Create a directory to hold the build output.
|
mkdir build # Create a directory to hold the build output.
|
||||||
cd build
|
cd build
|
||||||
|
Loading…
Reference in New Issue
Block a user