Skip to content

Commit 1022615

Browse files
tensorflower-gardenertensorflow-copybara
tensorflower-gardener
authored and
tensorflow-copybara
committed
Internal changes: use the new Google Mock MOCK_METHOD macro instead of the older MOCK_METHOD<n> macros.
PiperOrigin-RevId: 317931090
1 parent 8078eca commit 1022615

File tree

10 files changed

+87
-74
lines changed

10 files changed

+87
-74
lines changed

‎tensorflow_serving/core/aspired_versions_manager_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,9 +1170,9 @@ TEST_P(AspiredVersionsManagerTest, UnaspireNewServableThenImmediatelyReaspire) {
11701170

11711171
class MockAspiredVersionPolicy : public AspiredVersionPolicy {
11721172
public:
1173-
MOCK_CONST_METHOD1(GetNextAction,
1174-
optional<ServableAction>(
1175-
const std::vector<AspiredServableStateSnapshot>&));
1173+
MOCK_METHOD(optional<ServableAction>, GetNextAction,
1174+
(const std::vector<AspiredServableStateSnapshot>&),
1175+
(const, override));
11761176
};
11771177

11781178
TEST(AspiredVersionsManagerTest, CallPolicyWithAllVersions) {

‎tensorflow_serving/core/test_util/mock_loader.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ namespace test_util {
2727

2828
class MockLoader : public Loader {
2929
public:
30-
MOCK_CONST_METHOD1(EstimateResources, Status(ResourceAllocation* estimate));
31-
MOCK_METHOD0(Load, Status());
32-
MOCK_METHOD1(LoadWithMetadata, Status(const Metadata&));
33-
MOCK_METHOD0(Unload, void());
34-
MOCK_METHOD0(servable, AnyPtr());
30+
MOCK_METHOD(Status, EstimateResources, (ResourceAllocation * estimate),
31+
(const, override));
32+
MOCK_METHOD(Status, Load, (), (override));
33+
MOCK_METHOD(Status, LoadWithMetadata, (const Metadata&), (override));
34+
MOCK_METHOD(void, Unload, (), (override));
35+
MOCK_METHOD(AnyPtr, servable, (), (override));
3536
};
3637

3738
} // namespace test_util

‎tensorflow_serving/core/test_util/mock_log_collector.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ namespace serving {
2727
class MockLogCollector : public LogCollector {
2828
public:
2929
MockLogCollector() = default;
30-
MOCK_METHOD1(CollectMessage, Status(const google::protobuf::Message& message));
31-
MOCK_METHOD0(Flush, Status());
30+
MOCK_METHOD(Status, CollectMessage, (const google::protobuf::Message& message),
31+
(override));
32+
MOCK_METHOD(Status, Flush, (), (override));
3233
};
3334

3435
} // namespace serving

‎tensorflow_serving/core/test_util/mock_request_logger.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,11 @@ class MockRequestLogger : public RequestLogger {
4848
}
4949
}
5050

51-
MOCK_METHOD4(CreateLogMessage, Status(const google::protobuf::Message& request,
52-
const google::protobuf::Message& response,
53-
const LogMetadata& log_metadata,
54-
std::unique_ptr<google::protobuf::Message>* log));
51+
MOCK_METHOD(Status, CreateLogMessage,
52+
(const google::protobuf::Message& request, const google::protobuf::Message& response,
53+
const LogMetadata& log_metadata,
54+
std::unique_ptr<google::protobuf::Message>* log),
55+
(override));
5556

5657
private:
5758
std::function<void(void)> notify_destruction_;

‎tensorflow_serving/core/test_util/mock_server_request_logger.h

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,15 @@ class MockServerRequestLogger : public ServerRequestLogger {
3030
public:
3131
MockServerRequestLogger() : ServerRequestLogger({}) {}
3232

33-
MOCK_METHOD1(Update,
34-
Status(const std::map<string, std::vector<LoggingConfig>>&
35-
logging_config_map));
36-
37-
MOCK_METHOD3(Log, Status(const google::protobuf::Message& request,
38-
const google::protobuf::Message& response,
39-
const LogMetadata& log_metadata));
33+
MOCK_METHOD(Status, Update,
34+
((const std::map<string, std::vector<LoggingConfig>>&
35+
logging_config_map)),
36+
(override));
37+
38+
MOCK_METHOD(Status, Log,
39+
(const google::protobuf::Message& request, const google::protobuf::Message& response,
40+
const LogMetadata& log_metadata),
41+
(override));
4042
};
4143

4244
} // namespace test_util

‎tensorflow_serving/core/test_util/mock_session.h

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -30,45 +30,49 @@ class MockSession : public tensorflow::Session {
3030
MockSession() : Session() {
3131
ON_CALL(*this, Close()).WillByDefault(::testing::Return(Status::OK()));
3232
}
33-
MOCK_METHOD1(Create, ::tensorflow::Status(const GraphDef& graph));
34-
MOCK_METHOD1(Extend, ::tensorflow::Status(const GraphDef& graph));
35-
MOCK_METHOD4(Run, ::tensorflow::Status(
36-
const std::vector<std::pair<string, Tensor>>& inputs,
37-
const std::vector<string>& output_names,
38-
const std::vector<string>& target_nodes,
39-
std::vector<Tensor>* outputs));
40-
MOCK_METHOD6(Run,
41-
::tensorflow::Status(
42-
const RunOptions& run_options,
43-
const std::vector<std::pair<string, Tensor>>& inputs,
44-
const std::vector<string>& output_names,
45-
const std::vector<string>& target_nodes,
46-
std::vector<Tensor>* outputs, RunMetadata* run_metadata));
47-
MOCK_METHOD7(
48-
Run,
49-
::tensorflow::Status(
50-
const RunOptions& run_options,
51-
const std::vector<std::pair<string, Tensor>>& inputs,
52-
const std::vector<string>& output_names,
53-
const std::vector<string>& target_nodes, std::vector<Tensor>* outputs,
54-
RunMetadata* run_metadata,
55-
const tensorflow::thread::ThreadPoolOptions& thread_pool_options));
56-
MOCK_METHOD4(PRunSetup,
57-
::tensorflow::Status(const std::vector<string>& input_names,
58-
const std::vector<string>& output_names,
59-
const std::vector<string>& target_nodes,
60-
string* handle));
61-
MOCK_METHOD4(PRun, ::tensorflow::Status(
62-
const string& handle,
63-
const std::vector<std::pair<string, Tensor>>& inputs,
64-
const std::vector<string>& output_names,
65-
std::vector<Tensor>* outputs));
33+
MOCK_METHOD(::tensorflow::Status, Create, (const GraphDef& graph),
34+
(override));
35+
MOCK_METHOD(::tensorflow::Status, Extend, (const GraphDef& graph),
36+
(override));
37+
MOCK_METHOD(::tensorflow::Status, Run,
38+
((const std::vector<std::pair<string, Tensor>>& inputs),
39+
const std::vector<string>& output_names,
40+
const std::vector<string>& target_nodes,
41+
std::vector<Tensor>* outputs),
42+
(override));
43+
MOCK_METHOD(::tensorflow::Status, Run,
44+
(const RunOptions& run_options,
45+
(const std::vector<std::pair<string, Tensor>>& inputs),
46+
const std::vector<string>& output_names,
47+
const std::vector<string>& target_nodes,
48+
std::vector<Tensor>* outputs, RunMetadata* run_metadata),
49+
(override));
50+
MOCK_METHOD(
51+
::tensorflow::Status, Run,
52+
(const RunOptions& run_options,
53+
(const std::vector<std::pair<string, Tensor>>& inputs),
54+
const std::vector<string>& output_names,
55+
const std::vector<string>& target_nodes, std::vector<Tensor>* outputs,
56+
RunMetadata* run_metadata,
57+
const tensorflow::thread::ThreadPoolOptions& thread_pool_options),
58+
(override));
59+
MOCK_METHOD(::tensorflow::Status, PRunSetup,
60+
(const std::vector<string>& input_names,
61+
const std::vector<string>& output_names,
62+
const std::vector<string>& target_nodes, string* handle),
63+
(override));
64+
MOCK_METHOD(::tensorflow::Status, PRun,
65+
(const string& handle,
66+
(const std::vector<std::pair<string, Tensor>>& inputs),
67+
const std::vector<string>& output_names,
68+
std::vector<Tensor>* outputs),
69+
(override));
6670

67-
MOCK_METHOD1(ListDevices,
68-
::tensorflow::Status(
69-
std::vector<::tensorflow::DeviceAttributes>* response));
71+
MOCK_METHOD(::tensorflow::Status, ListDevices,
72+
(std::vector<::tensorflow::DeviceAttributes> * response),
73+
(override));
7074

71-
MOCK_METHOD0(Close, ::tensorflow::Status());
75+
MOCK_METHOD(::tensorflow::Status, Close, (), (override));
7276
};
7377

7478
} // namespace test_util

‎tensorflow_serving/core/test_util/mock_storage_path_target.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ namespace test_util {
3030
class MockStoragePathTarget : public TargetBase<StoragePath> {
3131
public:
3232
~MockStoragePathTarget() override { Detach(); }
33-
MOCK_METHOD2(SetAspiredVersions,
34-
void(const StringPiece, std::vector<ServableData<StoragePath>>));
33+
MOCK_METHOD(void, SetAspiredVersions,
34+
(const StringPiece, std::vector<ServableData<StoragePath>>),
35+
(override));
3536
};
3637

3738
} // namespace test_util

‎tensorflow_serving/model_servers/test_util/mock_server_core.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,13 @@ class MockServerCore : public ServerCore {
7979
explicit MockServerCore(const PlatformConfigMap& platform_config_map)
8080
: ServerCore(GetOptions(platform_config_map)) {}
8181

82-
MOCK_CONST_METHOD0(servable_state_monitor, ServableStateMonitor*());
83-
MOCK_METHOD1(ReloadConfig, Status(const ModelServerConfig&));
84-
MOCK_METHOD3(Log, Status(const google::protobuf::Message& request,
85-
const google::protobuf::Message& response,
86-
const LogMetadata& log_metadata));
82+
MOCK_METHOD(ServableStateMonitor*, servable_state_monitor, (),
83+
(const, override));
84+
MOCK_METHOD(Status, ReloadConfig, (const ModelServerConfig&), (override));
85+
MOCK_METHOD(Status, Log,
86+
(const google::protobuf::Message& request, const google::protobuf::Message& response,
87+
const LogMetadata& log_metadata),
88+
(override));
8789

8890
template <typename T>
8991
Status GetServableHandle(const ModelSpec& model_spec,

‎tensorflow_serving/servables/tensorflow/curried_session_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ MATCHER_P(EqualsTensor, value, "") {
4242

4343
class MockThreadPool : public thread::ThreadPoolInterface {
4444
public:
45-
MOCK_METHOD1(Schedule, void(std::function<void()>));
46-
MOCK_METHOD0(Cancel, void());
47-
MOCK_CONST_METHOD0(NumThreads, int());
48-
MOCK_CONST_METHOD0(CurrentThreadId, int());
45+
MOCK_METHOD(void, Schedule, (std::function<void()>), (override));
46+
MOCK_METHOD(void, Cancel, (), (override));
47+
MOCK_METHOD(int, NumThreads, (), (const, override));
48+
MOCK_METHOD(int, CurrentThreadId, (), (const, override));
4949
};
5050

5151
TEST(CurriedSessionTest, ZeroCurriedInputs) {

‎tensorflow_serving/util/test_util/mock_file_probing_env.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ namespace test_util {
2626

2727
class MockFileProbingEnv : public FileProbingEnv {
2828
public:
29-
MOCK_METHOD1(FileExists, Status(const string& fname));
30-
MOCK_METHOD2(GetChildren,
31-
Status(const string& fname, std::vector<string>* children));
32-
MOCK_METHOD1(IsDirectory, Status(const string& fname));
33-
MOCK_METHOD2(GetFileSize, Status(const string& fname, uint64* file_size));
29+
MOCK_METHOD(Status, FileExists, (const string& fname), (override));
30+
MOCK_METHOD(Status, GetChildren,
31+
(const string& fname, std::vector<string>* children), (override));
32+
MOCK_METHOD(Status, IsDirectory, (const string& fname), (override));
33+
MOCK_METHOD(Status, GetFileSize, (const string& fname, uint64* file_size),
34+
(override));
3435
};
3536

3637
} // namespace test_util

0 commit comments

Comments
 (0)