diff options
| author | tisi1988 <tisi1988@gmail.com> | 2018-07-23 10:10:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 10:10:26 +0200 |
| commit | 1ae4fdb79009322d90c304fd49d4fb625b408823 (patch) | |
| tree | 6c343daa47b77dffb5b08cf64fe11f4b9fe1b63a /googlemock/test/gmock_ex_test.cc | |
| parent | de6e079f15b0d1988033fc8203d172f493d08506 (diff) | |
| parent | 2a151c93c180ac765c27c5f2e37af9366abd4d55 (diff) | |
| download | googletest-1ae4fdb79009322d90c304fd49d4fb625b408823.tar.gz googletest-1ae4fdb79009322d90c304fd49d4fb625b408823.tar.bz2 googletest-1ae4fdb79009322d90c304fd49d4fb625b408823.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/test/gmock_ex_test.cc')
| -rw-r--r-- | googlemock/test/gmock_ex_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/test/gmock_ex_test.cc b/googlemock/test/gmock_ex_test.cc index 3afed86a..b03de82e 100644 --- a/googlemock/test/gmock_ex_test.cc +++ b/googlemock/test/gmock_ex_test.cc @@ -34,9 +34,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +#if GTEST_HAS_EXCEPTIONS namespace { using testing::HasSubstr; + using testing::internal::GoogleTestFailureException; // A type that cannot be default constructed. @@ -52,8 +54,6 @@ class MockFoo { MOCK_METHOD0(GetNonDefaultConstructible, NonDefaultConstructible()); }; -#if GTEST_HAS_EXCEPTIONS - TEST(DefaultValueTest, ThrowsRuntimeErrorWhenNoDefaultValue) { MockFoo mock; try { @@ -76,6 +76,6 @@ TEST(DefaultValueTest, ThrowsRuntimeErrorWhenNoDefaultValue) { } } -#endif } // unnamed namespace +#endif |