diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-17 15:48:56 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-17 15:48:56 (GMT) |
commit | a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d (patch) | |
tree | 32d0dac55ff598f9732ff57581044eabd24fa807 /googlemock/docs | |
parent | 421e7b4f29fc761c66d2773a1fc318a738a6d3da (diff) | |
parent | 02a8ca87735601466d8c564344f9be493da84708 (diff) | |
download | googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.zip googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.tar.gz googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.tar.bz2 |
Merge branch 'master' into fix-msvc-d9025-warningrefs/pull/1612/head
Diffstat (limited to 'googlemock/docs')
-rw-r--r-- | googlemock/docs/CookBook.md | 4 | ||||
-rw-r--r-- | googlemock/docs/ForDummies.md | 2 | ||||
-rw-r--r-- | googlemock/docs/FrequentlyAskedQuestions.md | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/docs/CookBook.md b/googlemock/docs/CookBook.md index bd9f026..8809b0e 100644 --- a/googlemock/docs/CookBook.md +++ b/googlemock/docs/CookBook.md @@ -2247,7 +2247,7 @@ enum class AccessLevel { kInternal, kPublic }; class Buzz { public: - explicit Buzz(AccessLevel access) { … } + explicit Buzz(AccessLevel access) { ... } ... }; @@ -2320,7 +2320,7 @@ Note that `ByMove()` is essential here - if you drop it, the code won’t compil Quiz time! What do you think will happen if a `Return(ByMove(...))` action is performed more than once (e.g. you write -`….WillRepeatedly(Return(ByMove(...)));`)? Come think of it, after the first +`.WillRepeatedly(Return(ByMove(...)));`)? Come think of it, after the first time the action runs, the source value will be consumed (since it’s a move-only value), so the next time around, there’s no value to move from -- you’ll get a run-time error that `Return(ByMove(...))` can only be run once. diff --git a/googlemock/docs/ForDummies.md b/googlemock/docs/ForDummies.md index 1e0fd41..566a34e 100644 --- a/googlemock/docs/ForDummies.md +++ b/googlemock/docs/ForDummies.md @@ -170,7 +170,7 @@ Admittedly, this test is contrived and doesn't do much. You can easily achieve t ## Using Google Mock with Any Testing Framework ## If you want to use something other than Google Test (e.g. [CppUnit](http://sourceforge.net/projects/cppunit/) or -[CxxTest](http://cxxtest.tigris.org/)) as your testing framework, just change the `main()` function in the previous section to: +[CxxTest](https://cxxtest.com/)) as your testing framework, just change the `main()` function in the previous section to: ``` int main(int argc, char** argv) { // The following line causes Google Mock to throw an exception on failure, diff --git a/googlemock/docs/FrequentlyAskedQuestions.md b/googlemock/docs/FrequentlyAskedQuestions.md index 23f7da0..9008c63 100644 --- a/googlemock/docs/FrequentlyAskedQuestions.md +++ b/googlemock/docs/FrequentlyAskedQuestions.md @@ -528,7 +528,7 @@ interface, which then can be easily mocked. It's a bit of work initially, but usually pays for itself quickly. This Google Testing Blog -[post](http://googletesting.blogspot.com/2008/06/defeat-static-cling.html) +[post](https://testing.googleblog.com/2008/06/defeat-static-cling.html) says it excellently. Check it out. ## My mock object needs to do complex stuff. It's a lot of pain to specify the actions. Google Mock sucks! ## |