diff options
| author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-02-12 17:35:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 17:35:07 +0000 |
| commit | f11a8f9131584cf4009eca8af8a66e920c1b7391 (patch) | |
| tree | 06cf7b6488c5980a90bcc355f186047f8b5a16c0 /googlemock/test/gmock-actions_test.cc | |
| parent | 27bb844e5c31a0a67b7b4864ffb2b80ae2803882 (diff) | |
| parent | 15392f1a38fa0b8c3f13a9732e94b209069efa1c (diff) | |
| download | googletest-f11a8f9131584cf4009eca8af8a66e920c1b7391.tar.gz googletest-f11a8f9131584cf4009eca8af8a66e920c1b7391.tar.bz2 googletest-f11a8f9131584cf4009eca8af8a66e920c1b7391.zip | |
Merge branch 'master' into fix-argc
Diffstat (limited to 'googlemock/test/gmock-actions_test.cc')
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index f470de4c..f7218391 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -751,7 +751,7 @@ TEST(DoDefaultDeathTest, DiesIfUsedInCompositeAction) { } // Tests that DoDefault() returns the default value set by -// DefaultValue<T>::Set() when it's not overriden by an ON_CALL(). +// DefaultValue<T>::Set() when it's not overridden by an ON_CALL(). TEST(DoDefaultTest, ReturnsUserSpecifiedPerTypeDefaultValueWhenThereIsOne) { DefaultValue<int>::Set(1); MockClass mock; |