diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-03-05 09:02:59 +0000 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-03-05 09:02:59 +0000 |
| commit | 6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0 (patch) | |
| tree | c6f8f6067f957eb6d49656278f79c93353bb039c /googlemock/test/gmock-actions_test.cc | |
| parent | 555e6e79485151cf8c8ada55d57d9ed872591dc5 (diff) | |
| parent | a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8 (diff) | |
| download | googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.tar.gz googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.tar.bz2 googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.zip | |
Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116
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; |