diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-02-09 11:42:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 11:42:05 -0500 |
| commit | b324a36c35c1f3397e0a6d664114980f3f7ddff8 (patch) | |
| tree | 6ff499e0888f6cc6b0bc89aea9f512123780706f /googlemock/test/gmock-actions_test.cc | |
| parent | 092d0885332316ca679ac77e0f8fe1f5c368fb4f (diff) | |
| parent | 22a115055a34443a01a3006bc2e0c1697c29abe1 (diff) | |
| download | googletest-b324a36c35c1f3397e0a6d664114980f3f7ddff8.tar.gz googletest-b324a36c35c1f3397e0a6d664114980f3f7ddff8.tar.bz2 googletest-b324a36c35c1f3397e0a6d664114980f3f7ddff8.zip | |
Merge branch 'master' into assert
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; |