diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-19 11:07:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 11:07:10 -0400 |
| commit | 1f9c668a0452148f725b242079f70d65d3e93153 (patch) | |
| tree | c7943a50a25fa435e9f823329f67e40c34a73147 /googlemock/test/gmock_ex_test.cc | |
| parent | 378de8f72a43d1916774370aafea30e424e6d148 (diff) | |
| parent | 1370e7658b659247f3c37cd1f07d917d0bd546a0 (diff) | |
| download | googletest-1f9c668a0452148f725b242079f70d65d3e93153.tar.gz googletest-1f9c668a0452148f725b242079f70d65d3e93153.tar.bz2 googletest-1f9c668a0452148f725b242079f70d65d3e93153.zip | |
Merge branch 'master' into deprecate
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 |