Skip to content

Commit 997c36c

Browse files
Abseil TeamCJ-Johnson
Abseil Team
authored and
CJ-Johnson
committed
Googletest export
Stop using pump for generating internal/custom/gmock-generated-actions.h PiperOrigin-RevId: 352660735
1 parent 4898cda commit 997c36c

File tree

7 files changed

+1
-560
lines changed

7 files changed

+1
-560
lines changed

‎googlemock/include/gmock/internal/custom/gmock-generated-actions.h

+1-144
Original file line numberDiff line numberDiff line change
@@ -1,149 +1,6 @@
11
// GOOGLETEST_CM0002 DO NOT DELETE
2+
23
#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
34
#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_
45

5-
#include "gmock/internal/gmock-port.h"
6-
#if GTEST_GOOGLE3_MODE_
7-
8-
#include <memory>
9-
#include <type_traits>
10-
11-
#include "base/callback.h"
12-
#include "gmock/gmock-actions.h"
13-
14-
namespace testing {
15-
namespace internal {
16-
17-
// Implements the Invoke(callback) action.
18-
template <typename CallbackType, typename Signature>
19-
class InvokeCallbackAction;
20-
21-
template <typename CallbackType, typename R, typename... Args>
22-
class InvokeCallbackAction<CallbackType, R(Args...)> {
23-
public:
24-
// The c'tor takes ownership of the callback.
25-
explicit InvokeCallbackAction(CallbackType* callback) : callback_(callback) {
26-
callback->CheckIsRepeatable(); // Makes sure the callback is permanent.
27-
}
28-
29-
R operator()(Args... args) const {
30-
return callback_->Run(std::forward<Args>(args)...);
31-
}
32-
33-
private:
34-
const std::shared_ptr<CallbackType> callback_;
35-
};
36-
37-
// Implements the InvokeWithoutArgs(callback) action.
38-
template <typename CallbackType>
39-
class InvokeCallbackWithoutArgsAction {
40-
const std::shared_ptr<CallbackType> callback_;
41-
42-
public:
43-
// The c'tor takes ownership of the callback.
44-
explicit InvokeCallbackWithoutArgsAction(CallbackType* callback)
45-
: callback_(callback) {
46-
callback->CheckIsRepeatable(); // Makes sure the callback is permanent.
47-
}
48-
49-
template <typename... Args>
50-
auto operator()(const Args&...) -> decltype(this->callback_->Run()) {
51-
return callback_->Run();
52-
}
53-
};
54-
55-
template <typename T>
56-
struct TypeIdentity {
57-
using type = T;
58-
};
59-
60-
inline TypeIdentity<void()> CallbackSignatureImpl(Closure*);
61-
template <typename R>
62-
TypeIdentity<R()> CallbackSignatureImpl(ResultCallback<R>*);
63-
64-
template <typename... Args>
65-
TypeIdentity<void(Args...)> CallbackSignatureImpl(Callback1<Args...>*);
66-
template <typename R, typename... Args>
67-
TypeIdentity<R(Args...)> CallbackSignatureImpl(ResultCallback1<R, Args...>*);
68-
69-
template <typename... Args>
70-
TypeIdentity<void(Args...)> CallbackSignatureImpl(Callback2<Args...>*);
71-
template <typename R, typename... Args>
72-
TypeIdentity<R(Args...)> CallbackSignatureImpl(ResultCallback2<R, Args...>*);
73-
74-
template <typename... Args>
75-
TypeIdentity<void(Args...)> CallbackSignatureImpl(Callback3<Args...>*);
76-
template <typename R, typename... Args>
77-
TypeIdentity<R(Args...)> CallbackSignatureImpl(ResultCallback3<R, Args...>*);
78-
79-
template <typename... Args>
80-
TypeIdentity<void(Args...)> CallbackSignatureImpl(Callback4<Args...>*);
81-
template <typename R, typename... Args>
82-
TypeIdentity<R(Args...)> CallbackSignatureImpl(ResultCallback4<R, Args...>*);
83-
84-
template <typename... Args>
85-
TypeIdentity<void(Args...)> CallbackSignatureImpl(Callback5<Args...>*);
86-
template <typename R, typename... Args>
87-
TypeIdentity<R(Args...)> CallbackSignatureImpl(ResultCallback5<R, Args...>*);
88-
89-
template <typename T>
90-
using CallbackSignature = typename decltype(
91-
internal::CallbackSignatureImpl(std::declval<T*>()))::type;
92-
93-
// Specialization for protocol buffers.
94-
// We support setting a proto2::Message, which doesn't have an assignment
95-
// operator.
96-
template <size_t N, typename A>
97-
struct SetArgumentPointeeAction<
98-
N, A,
99-
typename std::enable_if<std::is_base_of<proto2::Message, A>::value>::type> {
100-
A value;
101-
102-
template <typename... Args>
103-
void operator()(const Args&... args) const {
104-
::std::get<N>(std::tie(args...))->CopyFrom(value);
105-
}
106-
};
107-
108-
// Add Invoke overloads for google3 Callback types.
109-
110-
template <typename C, typename... Args,
111-
typename = internal::CallbackSignature<C>>
112-
auto InvokeArgument(C* cb, Args... args) -> decltype(cb->Run(args...)) {
113-
return cb->Run(args...);
114-
}
115-
116-
} // namespace internal
117-
118-
// Add Invoke overloads for google3 Callback types.
119-
120-
// Creates an action that invokes the given callback with the mock
121-
// function's arguments. The action takes ownership of the callback
122-
// and verifies that it's permanent.
123-
//
124-
// google3 doesn't support callbacks with more than 5
125-
// arguments yet, so we only support invoking callbacks with up to
126-
// 5 arguments.
127-
128-
template <typename Callback>
129-
internal::InvokeCallbackAction<Callback, internal::CallbackSignature<Callback>>
130-
Invoke(Callback* callback) {
131-
return internal::InvokeCallbackAction<Callback,
132-
internal::CallbackSignature<Callback>>(
133-
callback);
134-
}
135-
136-
// Creates an action that invokes the given callback with no argument.
137-
// The action takes ownership of the callback and verifies that it's
138-
// permanent.
139-
template <typename Callback, typename = internal::CallbackSignature<Callback>>
140-
internal::InvokeCallbackWithoutArgsAction<Callback> InvokeWithoutArgs(
141-
Callback* callback) {
142-
return internal::InvokeCallbackWithoutArgsAction<Callback>(callback);
143-
}
144-
145-
} // namespace testing
146-
147-
#endif // GTEST_GOOGLE3_MODE_
148-
1496
#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_

‎googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump

-12
This file was deleted.

‎googlemock/include/gmock/internal/custom/gmock-matchers.h

-35
Original file line numberDiff line numberDiff line change
@@ -33,39 +33,4 @@
3333

3434
#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
3535
#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_
36-
37-
#include <memory>
38-
39-
#include "gmock/internal/gmock-port.h"
40-
#if GTEST_GOOGLE3_MODE_
41-
#include "base/callback.h"
42-
43-
// Realistically this file should be included from gmock-matchers.h
44-
#include "gmock/gmock-matchers.h"
45-
46-
namespace testing {
47-
namespace internal {
48-
49-
// Specialization for permanent callbacks.
50-
template <typename ArgType, typename ResType>
51-
struct CallableTraits<ResultCallback1<ResType, ArgType>*> {
52-
typedef ResType ResultType;
53-
using StorageType = std::shared_ptr<ResultCallback1<ResType, ArgType>>;
54-
typedef ResultCallback1<ResType, ArgType> Callback;
55-
56-
static void CheckIsValid(const StorageType& callback) {
57-
GTEST_CHECK_(callback != nullptr)
58-
<< "NULL callback is passed into ResultOf().";
59-
callback->CheckIsRepeatable();
60-
}
61-
template <typename T>
62-
static ResType Invoke(const StorageType& callback, T arg) {
63-
return callback->Run(arg);
64-
}
65-
};
66-
67-
} // namespace internal
68-
} // namespace testing
69-
#endif // GTEST_GOOGLE3_MODE_
70-
7136
#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_

‎googlemock/include/gmock/internal/custom/gmock-port.h

-25
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,4 @@
3636
#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
3737
#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
3838

39-
#include "gtest/internal/gtest-port.h"
40-
41-
#if GTEST_GOOGLE3_MODE_
42-
43-
// Defines this iff Google Mock can use google3 callbacks. This is
44-
// internal as a user shouldn't rely on Google Mock to tell him
45-
// whether he can use google3 callbacks.
46-
# include "base/callback.h"
47-
# define GMOCK_HAS_GOOGLE3_CALLBACK_ 1
48-
49-
// Macros for declaring flags.
50-
# define GMOCK_DECLARE_bool_(name) DECLARE_bool(gmock_##name)
51-
# define GMOCK_DECLARE_int32_(name) DECLARE_int32(gmock_##name)
52-
# define GMOCK_DECLARE_string_(name) DECLARE_string(gmock_##name)
53-
54-
// Macros for defining flags.
55-
# define GMOCK_DEFINE_bool_(name, default_val, doc) \
56-
DEFINE_bool(gmock_##name, default_val, doc)
57-
# define GMOCK_DEFINE_int32_(name, default_val, doc) \
58-
DEFINE_int32(gmock_##name, default_val, doc)
59-
# define GMOCK_DEFINE_string_(name, default_val, doc) \
60-
DEFINE_string(gmock_##name, default_val, doc)
61-
62-
#endif // GTEST_GOOGLE3_MODE_
63-
6439
#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_

0 commit comments

Comments
 (0)