diff options
author | Abseil Team <absl-team@google.com> | 2019-01-16 20:23:44 (GMT) |
---|---|---|
committer | Alex Strelnikov <strel@google.com> | 2019-01-17 19:41:08 (GMT) |
commit | 0adeadd2830211f827fd2908e4621f6a4afa810c (patch) | |
tree | 1a620e576ad423e1931a00dfe1f9448932f62e41 /googlemock/test/gmock-actions_test.cc | |
parent | eb9225ce361affe561592e0912320b9db84985d0 (diff) | |
download | googletest-0adeadd2830211f827fd2908e4621f6a4afa810c.zip googletest-0adeadd2830211f827fd2908e4621f6a4afa810c.tar.gz googletest-0adeadd2830211f827fd2908e4621f6a4afa810c.tar.bz2 |
Googletest export
Refactor the `Invoke` and `InvokeWithoutArgs` actions:
- Replace pump'd classes and functions with templates.
- Make the polymorphic actions be polymorphic functors instead.
- Fix Invoke(Callback*) to work with subclasses of the callbacks, instead of trying to diagnose that in gmock_doctor.
PiperOrigin-RevId: 229604112
Diffstat (limited to 'googlemock/test/gmock-actions_test.cc')
-rw-r--r-- | googlemock/test/gmock-actions_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index 77280f4..b3fef67 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -54,12 +54,14 @@ namespace { // This list should be kept sorted. +using testing::_; using testing::Action; using testing::ActionInterface; using testing::Assign; using testing::ByMove; using testing::ByRef; using testing::DefaultValue; +using testing::DoAll; using testing::DoDefault; using testing::IgnoreResult; using testing::Invoke; @@ -75,7 +77,6 @@ using testing::SetArgPointee; using testing::SetArgumentPointee; using testing::Unused; using testing::WithArgs; -using testing::_; using testing::internal::BuiltInDefaultValue; using testing::internal::Int64; using testing::internal::UInt64; |