diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-18 11:54:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 11:54:56 -0400 |
| commit | 4235fff7f4c3d96319e18bbcc5cc2eacee12b6da (patch) | |
| tree | 8a1159944a965dd829a9f97b31acee44ed0a6cd1 /googlemock/test/gmock_ex_test.cc | |
| parent | 20ef7944a410c5e01a35156b784266615d5ad38c (diff) | |
| parent | d41bfd732f3980c573f8fa27faf4d38d7fb16a45 (diff) | |
| download | googletest-4235fff7f4c3d96319e18bbcc5cc2eacee12b6da.tar.gz googletest-4235fff7f4c3d96319e18bbcc5cc2eacee12b6da.tar.bz2 googletest-4235fff7f4c3d96319e18bbcc5cc2eacee12b6da.zip | |
Merge pull request #1671 from gennadiycivil/master
Code merge
Diffstat (limited to 'googlemock/test/gmock_ex_test.cc')
| -rw-r--r-- | googlemock/test/gmock_ex_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/test/gmock_ex_test.cc b/googlemock/test/gmock_ex_test.cc index 99268b31..b03de82e 100644 --- a/googlemock/test/gmock_ex_test.cc +++ b/googlemock/test/gmock_ex_test.cc @@ -38,6 +38,7 @@ namespace { using testing::HasSubstr; + using testing::internal::GoogleTestFailureException; // A type that cannot be default constructed. @@ -53,7 +54,6 @@ class MockFoo { MOCK_METHOD0(GetNonDefaultConstructible, NonDefaultConstructible()); }; - TEST(DefaultValueTest, ThrowsRuntimeErrorWhenNoDefaultValue) { MockFoo mock; try { @@ -76,5 +76,6 @@ TEST(DefaultValueTest, ThrowsRuntimeErrorWhenNoDefaultValue) { } } + } // unnamed namespace #endif |