diff options
| author | Masaru Tsuchiyama <m.tmatma@gmail.com> | 2018-07-19 06:51:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 06:51:13 +0900 |
| commit | 40cd5d117035c0e280cbeceac42176ffa75a39a3 (patch) | |
| tree | 01a986456692187392b4349d9009238735d3abb4 /googlemock/test/gmock_ex_test.cc | |
| parent | 234958def514c33d5598d1ba7d81ce6228fa21d2 (diff) | |
| parent | 1370e7658b659247f3c37cd1f07d917d0bd546a0 (diff) | |
| download | googletest-40cd5d117035c0e280cbeceac42176ffa75a39a3.tar.gz googletest-40cd5d117035c0e280cbeceac42176ffa75a39a3.tar.bz2 googletest-40cd5d117035c0e280cbeceac42176ffa75a39a3.zip | |
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
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 |