Skip to content

Commit aeeb6e4

Browse files
coryancoryan
authored
cleanup: use wildcard matcher (_) sparingly (#6263)
Many of our mocks said `EXPECT_CALL(..., Foo(_, _))` when one can simply say `EXPECT_CALL(..., Foo)` for the same effect. Furthermore, we were inconsistent about this, with newer libraries generally ommitting the extra `_` wildcards.
1 parent 21f3d91 commit aeeb6e4

File tree

68 files changed

+1134
-1289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1134
-1289
lines changed

‎generator/integration_tests/golden/tests/golden_kitchen_sink_logging_decorator_test.cc‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class LoggingDecoratorTest : public ::testing::Test {
9090

9191
TEST_F(LoggingDecoratorTest, GenerateAccessToken) {
9292
::google::test::admin::database::v1::GenerateAccessTokenResponse response;
93-
EXPECT_CALL(*mock_, GenerateAccessToken(_, _)).WillOnce(Return(response));
93+
EXPECT_CALL(*mock_, GenerateAccessToken).WillOnce(Return(response));
9494
GoldenKitchenSinkLogging stub(mock_, TracingOptions{}, {});
9595
grpc::ClientContext context;
9696
auto status = stub.GenerateAccessToken(
@@ -102,8 +102,7 @@ TEST_F(LoggingDecoratorTest, GenerateAccessToken) {
102102
}
103103

104104
TEST_F(LoggingDecoratorTest, GenerateAccessTokenError) {
105-
EXPECT_CALL(*mock_, GenerateAccessToken(_, _))
106-
.WillOnce(Return(TransientError()));
105+
EXPECT_CALL(*mock_, GenerateAccessToken).WillOnce(Return(TransientError()));
107106
GoldenKitchenSinkLogging stub(mock_, TracingOptions{}, {});
108107
grpc::ClientContext context;
109108
auto status = stub.GenerateAccessToken(
@@ -117,7 +116,7 @@ TEST_F(LoggingDecoratorTest, GenerateAccessTokenError) {
117116

118117
TEST_F(LoggingDecoratorTest, GenerateIdToken) {
119118
::google::test::admin::database::v1::GenerateIdTokenResponse response;
120-
EXPECT_CALL(*mock_, GenerateIdToken(_, _)).WillOnce(Return(response));
119+
EXPECT_CALL(*mock_, GenerateIdToken).WillOnce(Return(response));
121120
GoldenKitchenSinkLogging stub(mock_, TracingOptions{}, {});
122121
grpc::ClientContext context;
123122
auto status = stub.GenerateIdToken(
@@ -129,7 +128,7 @@ TEST_F(LoggingDecoratorTest, GenerateIdToken) {
129128
}
130129

131130
TEST_F(LoggingDecoratorTest, GenerateIdTokenError) {
132-
EXPECT_CALL(*mock_, GenerateIdToken(_, _)).WillOnce(Return(TransientError()));
131+
EXPECT_CALL(*mock_, GenerateIdToken).WillOnce(Return(TransientError()));
133132
GoldenKitchenSinkLogging stub(mock_, TracingOptions{}, {});
134133
grpc::ClientContext context;
135134
auto status = stub.GenerateIdToken(
@@ -143,7 +142,7 @@ TEST_F(LoggingDecoratorTest, GenerateIdTokenError) {
143142

144143
TEST_F(LoggingDecoratorTest, WriteLogEntries) {
145144
::google::test::admin::database::v1::WriteLogEntriesResponse response;
146-
EXPECT_CALL(*mock_, WriteLogEntries(_, _)).WillOnce(Return(response));
145+
EXPECT_CALL(*mock_, WriteLogEntries).WillOnce(Return(response));
147146
GoldenKitchenSinkLogging stub(mock_, TracingOptions{}, {});
148147
grpc::ClientContext context;
149148
auto status = stub.WriteLogEntries(
@@ -155,7 +154,7 @@ TEST_F(LoggingDecoratorTest, WriteLogEntries) {
155154
}
156155

157156
TEST_F(LoggingDecoratorTest, WriteLogEntriesError) {
158-
EXPECT_CALL(*mock_, WriteLogEntries(_, _)).WillOnce(Return(TransientError()));
157+
EXPECT_CALL(*mock_, WriteLogEntries).WillOnce(Return(TransientError()));
159158
GoldenKitchenSinkLogging stub(mock_, TracingOptions{}, {});
160159
grpc::ClientContext context;
161160
auto status = stub.WriteLogEntries(
@@ -169,7 +168,7 @@ TEST_F(LoggingDecoratorTest, WriteLogEntriesError) {
169168

170169
TEST_F(LoggingDecoratorTest, ListLogs) {
171170
::google::test::admin::database::v1::ListLogsResponse response;
172-
EXPECT_CALL(*mock_, ListLogs(_, _)).WillOnce(Return(response));
171+
EXPECT_CALL(*mock_, ListLogs).WillOnce(Return(response));
173172
GoldenKitchenSinkLogging stub(mock_, TracingOptions{}, {});
174173
grpc::ClientContext context;
175174
auto status = stub.ListLogs(
@@ -181,7 +180,7 @@ TEST_F(LoggingDecoratorTest, ListLogs) {
181180
}
182181

183182
TEST_F(LoggingDecoratorTest, ListLogsError) {
184-
EXPECT_CALL(*mock_, ListLogs(_, _)).WillOnce(Return(TransientError()));
183+
EXPECT_CALL(*mock_, ListLogs).WillOnce(Return(TransientError()));
185184
GoldenKitchenSinkLogging stub(mock_, TracingOptions{}, {});
186185
grpc::ClientContext context;
187186
auto status = stub.ListLogs(
@@ -207,7 +206,7 @@ class MockTailLogEntriesStreamingReadRpc
207206
TEST_F(LoggingDecoratorTest, TailLogEntriesRpcNoRpcStreams) {
208207
auto mock_response = new MockTailLogEntriesStreamingReadRpc;
209208
EXPECT_CALL(*mock_response, Read).WillOnce(Return(Status()));
210-
EXPECT_CALL(*mock_, TailLogEntries(_, _))
209+
EXPECT_CALL(*mock_, TailLogEntries)
211210
.WillOnce(Return(ByMove(
212211
std::unique_ptr<internal::StreamingReadRpc<
213212
google::test::admin::database::v1::TailLogEntriesResponse>>(
@@ -227,7 +226,7 @@ TEST_F(LoggingDecoratorTest, TailLogEntriesRpcNoRpcStreams) {
227226
TEST_F(LoggingDecoratorTest, TailLogEntriesRpcWithRpcStreams) {
228227
auto mock_response = new MockTailLogEntriesStreamingReadRpc;
229228
EXPECT_CALL(*mock_response, Read).WillOnce(Return(Status()));
230-
EXPECT_CALL(*mock_, TailLogEntries(_, _))
229+
EXPECT_CALL(*mock_, TailLogEntries)
231230
.WillOnce(Return(ByMove(
232231
std::unique_ptr<internal::StreamingReadRpc<
233232
google::test::admin::database::v1::TailLogEntriesResponse>>(

‎generator/integration_tests/golden/tests/golden_kitchen_sink_metadata_decorator_test.cc‎

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

2828
using ::google::cloud::testing_util::IsContextMDValid;
2929
using ::google::cloud::testing_util::IsOk;
30-
using ::testing::_;
3130
using ::testing::Not;
3231
using ::testing::Return;
3332

@@ -92,7 +91,7 @@ class MetadataDecoratorTest : public ::testing::Test {
9291
};
9392

9493
TEST_F(MetadataDecoratorTest, GenerateAccessToken) {
95-
EXPECT_CALL(*mock_, GenerateAccessToken(_, _))
94+
EXPECT_CALL(*mock_, GenerateAccessToken)
9695
.WillOnce([this](grpc::ClientContext& context,
9796
google::test::admin::database::v1::
9897
GenerateAccessTokenRequest const&) {
@@ -113,7 +112,7 @@ TEST_F(MetadataDecoratorTest, GenerateAccessToken) {
113112
}
114113

115114
TEST_F(MetadataDecoratorTest, GenerateIdToken) {
116-
EXPECT_CALL(*mock_, GenerateIdToken(_, _))
115+
EXPECT_CALL(*mock_, GenerateIdToken)
117116
.WillOnce([this](grpc::ClientContext& context,
118117
google::test::admin::database::v1::
119118
GenerateIdTokenRequest const&) {
@@ -133,7 +132,7 @@ TEST_F(MetadataDecoratorTest, GenerateIdToken) {
133132
}
134133

135134
TEST_F(MetadataDecoratorTest, WriteLogEntries) {
136-
EXPECT_CALL(*mock_, WriteLogEntries(_, _))
135+
EXPECT_CALL(*mock_, WriteLogEntries)
137136
.WillOnce([this](grpc::ClientContext& context,
138137
google::test::admin::database::v1::
139138
WriteLogEntriesRequest const&) {
@@ -152,7 +151,7 @@ TEST_F(MetadataDecoratorTest, WriteLogEntries) {
152151
}
153152

154153
TEST_F(MetadataDecoratorTest, ListLogs) {
155-
EXPECT_CALL(*mock_, ListLogs(_, _))
154+
EXPECT_CALL(*mock_, ListLogs)
156155
.WillOnce([this](
157156
grpc::ClientContext& context,
158157
google::test::admin::database::v1::ListLogsRequest const&) {

‎generator/integration_tests/golden/tests/golden_thing_admin_logging_decorator_test.cc‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class LoggingDecoratorTest : public ::testing::Test {
175175
TEST_F(LoggingDecoratorTest, GetDatabaseSuccess) {
176176
google::test::admin::database::v1::Database database;
177177
database.set_name("my_database");
178-
EXPECT_CALL(*mock_, GetDatabase(_, _)).WillOnce(Return(database));
178+
EXPECT_CALL(*mock_, GetDatabase).WillOnce(Return(database));
179179

180180
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
181181
grpc::ClientContext context;
@@ -189,7 +189,7 @@ TEST_F(LoggingDecoratorTest, GetDatabaseSuccess) {
189189
}
190190

191191
TEST_F(LoggingDecoratorTest, GetDatabase) {
192-
EXPECT_CALL(*mock_, GetDatabase(_, _)).WillOnce(Return(TransientError()));
192+
EXPECT_CALL(*mock_, GetDatabase).WillOnce(Return(TransientError()));
193193

194194
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
195195
grpc::ClientContext context;
@@ -203,7 +203,7 @@ TEST_F(LoggingDecoratorTest, GetDatabase) {
203203
}
204204

205205
TEST_F(LoggingDecoratorTest, ListDatabases) {
206-
EXPECT_CALL(*mock_, ListDatabases(_, _)).WillOnce(Return(TransientError()));
206+
EXPECT_CALL(*mock_, ListDatabases).WillOnce(Return(TransientError()));
207207

208208
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
209209
grpc::ClientContext context;
@@ -217,7 +217,7 @@ TEST_F(LoggingDecoratorTest, ListDatabases) {
217217
}
218218

219219
TEST_F(LoggingDecoratorTest, CreateDatabase) {
220-
EXPECT_CALL(*mock_, CreateDatabase(_, _)).WillOnce(Return(TransientError()));
220+
EXPECT_CALL(*mock_, CreateDatabase).WillOnce(Return(TransientError()));
221221

222222
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
223223
grpc::ClientContext context;
@@ -231,8 +231,7 @@ TEST_F(LoggingDecoratorTest, CreateDatabase) {
231231
}
232232

233233
TEST_F(LoggingDecoratorTest, UpdateDatabaseDdl) {
234-
EXPECT_CALL(*mock_, UpdateDatabaseDdl(_, _))
235-
.WillOnce(Return(TransientError()));
234+
EXPECT_CALL(*mock_, UpdateDatabaseDdl).WillOnce(Return(TransientError()));
236235

237236
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
238237
grpc::ClientContext context;
@@ -246,7 +245,7 @@ TEST_F(LoggingDecoratorTest, UpdateDatabaseDdl) {
246245
}
247246

248247
TEST_F(LoggingDecoratorTest, DropDatabase) {
249-
EXPECT_CALL(*mock_, DropDatabase(_, _)).WillOnce(Return(TransientError()));
248+
EXPECT_CALL(*mock_, DropDatabase).WillOnce(Return(TransientError()));
250249

251250
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
252251
grpc::ClientContext context;
@@ -260,7 +259,7 @@ TEST_F(LoggingDecoratorTest, DropDatabase) {
260259
}
261260

262261
TEST_F(LoggingDecoratorTest, GetDatabaseDdl) {
263-
EXPECT_CALL(*mock_, GetDatabaseDdl(_, _)).WillOnce(Return(TransientError()));
262+
EXPECT_CALL(*mock_, GetDatabaseDdl).WillOnce(Return(TransientError()));
264263

265264
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
266265
grpc::ClientContext context;
@@ -274,7 +273,7 @@ TEST_F(LoggingDecoratorTest, GetDatabaseDdl) {
274273
}
275274

276275
TEST_F(LoggingDecoratorTest, SetIamPolicy) {
277-
EXPECT_CALL(*mock_, SetIamPolicy(_, _)).WillOnce(Return(TransientError()));
276+
EXPECT_CALL(*mock_, SetIamPolicy).WillOnce(Return(TransientError()));
278277

279278
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
280279
grpc::ClientContext context;
@@ -288,7 +287,7 @@ TEST_F(LoggingDecoratorTest, SetIamPolicy) {
288287
}
289288

290289
TEST_F(LoggingDecoratorTest, GetIamPolicy) {
291-
EXPECT_CALL(*mock_, GetIamPolicy(_, _)).WillOnce(Return(TransientError()));
290+
EXPECT_CALL(*mock_, GetIamPolicy).WillOnce(Return(TransientError()));
292291

293292
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
294293
grpc::ClientContext context;
@@ -302,8 +301,7 @@ TEST_F(LoggingDecoratorTest, GetIamPolicy) {
302301
}
303302

304303
TEST_F(LoggingDecoratorTest, TestIamPermissions) {
305-
EXPECT_CALL(*mock_, TestIamPermissions(_, _))
306-
.WillOnce(Return(TransientError()));
304+
EXPECT_CALL(*mock_, TestIamPermissions).WillOnce(Return(TransientError()));
307305

308306
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
309307
grpc::ClientContext context;
@@ -317,7 +315,7 @@ TEST_F(LoggingDecoratorTest, TestIamPermissions) {
317315
}
318316

319317
TEST_F(LoggingDecoratorTest, CreateBackup) {
320-
EXPECT_CALL(*mock_, CreateBackup(_, _)).WillOnce(Return(TransientError()));
318+
EXPECT_CALL(*mock_, CreateBackup).WillOnce(Return(TransientError()));
321319

322320
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
323321
grpc::ClientContext context;
@@ -331,7 +329,7 @@ TEST_F(LoggingDecoratorTest, CreateBackup) {
331329
}
332330

333331
TEST_F(LoggingDecoratorTest, GetBackup) {
334-
EXPECT_CALL(*mock_, GetBackup(_, _)).WillOnce(Return(TransientError()));
332+
EXPECT_CALL(*mock_, GetBackup).WillOnce(Return(TransientError()));
335333

336334
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
337335
grpc::ClientContext context;
@@ -345,7 +343,7 @@ TEST_F(LoggingDecoratorTest, GetBackup) {
345343
}
346344

347345
TEST_F(LoggingDecoratorTest, UpdateBackup) {
348-
EXPECT_CALL(*mock_, UpdateBackup(_, _)).WillOnce(Return(TransientError()));
346+
EXPECT_CALL(*mock_, UpdateBackup).WillOnce(Return(TransientError()));
349347

350348
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
351349
grpc::ClientContext context;
@@ -359,7 +357,7 @@ TEST_F(LoggingDecoratorTest, UpdateBackup) {
359357
}
360358

361359
TEST_F(LoggingDecoratorTest, DeleteBackup) {
362-
EXPECT_CALL(*mock_, DeleteBackup(_, _)).WillOnce(Return(TransientError()));
360+
EXPECT_CALL(*mock_, DeleteBackup).WillOnce(Return(TransientError()));
363361

364362
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
365363
grpc::ClientContext context;
@@ -373,7 +371,7 @@ TEST_F(LoggingDecoratorTest, DeleteBackup) {
373371
}
374372

375373
TEST_F(LoggingDecoratorTest, ListBackups) {
376-
EXPECT_CALL(*mock_, ListBackups(_, _)).WillOnce(Return(TransientError()));
374+
EXPECT_CALL(*mock_, ListBackups).WillOnce(Return(TransientError()));
377375

378376
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
379377
grpc::ClientContext context;
@@ -387,7 +385,7 @@ TEST_F(LoggingDecoratorTest, ListBackups) {
387385
}
388386

389387
TEST_F(LoggingDecoratorTest, RestoreDatabase) {
390-
EXPECT_CALL(*mock_, RestoreDatabase(_, _)).WillOnce(Return(TransientError()));
388+
EXPECT_CALL(*mock_, RestoreDatabase).WillOnce(Return(TransientError()));
391389

392390
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
393391
grpc::ClientContext context;
@@ -401,7 +399,7 @@ TEST_F(LoggingDecoratorTest, RestoreDatabase) {
401399
}
402400

403401
TEST_F(LoggingDecoratorTest, ListDatabaseOperations) {
404-
EXPECT_CALL(*mock_, ListDatabaseOperations(_, _))
402+
EXPECT_CALL(*mock_, ListDatabaseOperations)
405403
.WillOnce(Return(TransientError()));
406404

407405
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
@@ -417,8 +415,7 @@ TEST_F(LoggingDecoratorTest, ListDatabaseOperations) {
417415
}
418416

419417
TEST_F(LoggingDecoratorTest, ListBackupOperations) {
420-
EXPECT_CALL(*mock_, ListBackupOperations(_, _))
421-
.WillOnce(Return(TransientError()));
418+
EXPECT_CALL(*mock_, ListBackupOperations).WillOnce(Return(TransientError()));
422419

423420
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
424421
grpc::ClientContext context;
@@ -433,7 +430,7 @@ TEST_F(LoggingDecoratorTest, ListBackupOperations) {
433430
}
434431

435432
TEST_F(LoggingDecoratorTest, GetOperation) {
436-
EXPECT_CALL(*mock_, GetOperation(_, _)).WillOnce(Return(TransientError()));
433+
EXPECT_CALL(*mock_, GetOperation).WillOnce(Return(TransientError()));
437434

438435
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
439436
grpc::ClientContext context;
@@ -447,7 +444,7 @@ TEST_F(LoggingDecoratorTest, GetOperation) {
447444
}
448445

449446
TEST_F(LoggingDecoratorTest, CancelOperation) {
450-
EXPECT_CALL(*mock_, CancelOperation(_, _)).WillOnce(Return(TransientError()));
447+
EXPECT_CALL(*mock_, CancelOperation).WillOnce(Return(TransientError()));
451448

452449
GoldenThingAdminLogging stub(mock_, TracingOptions{}, {});
453450
grpc::ClientContext context;

0 commit comments

Comments
 (0)