Skip to content

Commit 248ace9

Browse files
sduskischingor13
sduskis
authored and
chingor13
committed
Bigtable: Using undeprecated Truth methods. (#5237)
1 parent 2efe4d4 commit 248ace9

6 files changed

Lines changed: 52 additions & 45 deletions

File tree

‎google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettingsTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,12 @@ public void testCredentials() throws IOException {
6262
.setCredentialsProvider(credentialsProvider)
6363
.build();
6464

65-
assertThat(settings.getCredentialsProvider()).isSameAs(credentialsProvider);
66-
assertThat(settings.getStubSettings().getCredentialsProvider()).isSameAs(credentialsProvider);
67-
assertThat(settings.toBuilder().getCredentialsProvider()).isSameAs(credentialsProvider);
68-
assertThat(settings.toBuilder().build().getCredentialsProvider()).isSameAs(credentialsProvider);
65+
assertThat(settings.getCredentialsProvider()).isSameInstanceAs(credentialsProvider);
66+
assertThat(settings.getStubSettings().getCredentialsProvider())
67+
.isSameInstanceAs(credentialsProvider);
68+
assertThat(settings.toBuilder().getCredentialsProvider()).isSameInstanceAs(credentialsProvider);
69+
assertThat(settings.toBuilder().build().getCredentialsProvider())
70+
.isSameInstanceAs(credentialsProvider);
6971
}
7072

7173
@Test

‎google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettingsTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,12 @@ public void testCredentials() throws IOException {
6464
.setCredentialsProvider(credentialsProvider)
6565
.build();
6666

67-
assertThat(settings.getCredentialsProvider()).isSameAs(credentialsProvider);
68-
assertThat(settings.getStubSettings().getCredentialsProvider()).isSameAs(credentialsProvider);
69-
assertThat(settings.toBuilder().getCredentialsProvider()).isSameAs(credentialsProvider);
70-
assertThat(settings.toBuilder().build().getCredentialsProvider()).isSameAs(credentialsProvider);
67+
assertThat(settings.getCredentialsProvider()).isSameInstanceAs(credentialsProvider);
68+
assertThat(settings.getStubSettings().getCredentialsProvider())
69+
.isSameInstanceAs(credentialsProvider);
70+
assertThat(settings.toBuilder().getCredentialsProvider()).isSameInstanceAs(credentialsProvider);
71+
assertThat(settings.toBuilder().build().getCredentialsProvider())
72+
.isSameInstanceAs(credentialsProvider);
7173
}
7274

7375
@Test

‎google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/stub/AwaitReplicationCallableTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void testGenerateFailure() throws Exception {
102102
actualError = e.getCause();
103103
}
104104

105-
assertThat(actualError).isSameAs(fakeError);
105+
assertThat(actualError).isSameInstanceAs(fakeError);
106106
}
107107

108108
@Test
@@ -136,7 +136,7 @@ public void testCheckFailure() throws Exception {
136136
actualError = e.getCause();
137137
}
138138

139-
assertThat(actualError).isSameAs(expectedError);
139+
assertThat(actualError).isSameInstanceAs(expectedError);
140140
}
141141

142142
@Test

‎google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/BigtableDataClientTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public void proxyCloseTest() throws Exception {
9797

9898
@Test
9999
public void proxyReadRowsCallableTest() {
100-
assertThat(bigtableDataClient.readRowsCallable()).isSameAs(mockReadRowsCallable);
100+
assertThat(bigtableDataClient.readRowsCallable()).isSameInstanceAs(mockReadRowsCallable);
101101
}
102102

103103
@Test
@@ -229,7 +229,8 @@ public void proxyReadRowsAsyncTest() {
229229

230230
@Test
231231
public void proxySampleRowKeysCallableTest() {
232-
assertThat(bigtableDataClient.sampleRowKeysCallable()).isSameAs(mockSampleRowKeysCallable);
232+
assertThat(bigtableDataClient.sampleRowKeysCallable())
233+
.isSameInstanceAs(mockSampleRowKeysCallable);
233234
}
234235

235236
@Test
@@ -248,7 +249,7 @@ public void sampleRowKeysTest() {
248249

249250
@Test
250251
public void proxyMutateRowCallableTest() {
251-
assertThat(bigtableDataClient.mutateRowCallable()).isSameAs(mockMutateRowCallable);
252+
assertThat(bigtableDataClient.mutateRowCallable()).isSameInstanceAs(mockMutateRowCallable);
252253
}
253254

254255
@Test
@@ -325,7 +326,7 @@ public void proxyBulkMutationsBatchingSendTest() {
325326
Mockito.when(mockBulkMutateRowsBatchingCallable.futureCall(request)).thenReturn(innerResult);
326327

327328
ApiFuture<Void> actualResult = batcher.add(request);
328-
assertThat(actualResult).isSameAs(innerResult);
329+
assertThat(actualResult).isSameInstanceAs(innerResult);
329330
}
330331

331332
@Test
@@ -404,7 +405,7 @@ public void bulkMutationsBatchingFailureTest() throws Exception {
404405
@Test
405406
public void proxyCheckAndMutateRowCallableTest() {
406407
assertThat(bigtableDataClient.checkAndMutateRowCallable())
407-
.isSameAs(mockStub.checkAndMutateRowCallable());
408+
.isSameInstanceAs(mockStub.checkAndMutateRowCallable());
408409
}
409410

410411
@Test
@@ -455,6 +456,6 @@ public void readModifyWriteRowTest() {
455456
@Test
456457
public void proxyReadModifyWriterRowCallableTest() {
457458
assertThat(bigtableDataClient.readModifyWriteRowCallable())
458-
.isSameAs(mockReadModifyWriteRowCallable);
459+
.isSameInstanceAs(mockReadModifyWriteRowCallable);
459460
}
460461
}

‎google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettingsTest.java‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private void verifyBuilder(
119119
assertThat(builder.getAppProfileId()).isEqualTo(appProfileId);
120120
assertThat(builder.getEndpoint()).isEqualTo(endpoint);
121121
assertThat(builder.getCredentialsProvider()).isEqualTo(credentialsProvider);
122-
assertThat(builder.getStreamWatchdogProvider()).isSameAs(watchdogProvider);
122+
assertThat(builder.getStreamWatchdogProvider()).isSameInstanceAs(watchdogProvider);
123123
assertThat(builder.getStreamWatchdogCheckInterval()).isEqualTo(watchdogInterval);
124124
}
125125

@@ -137,7 +137,7 @@ private void verifySettings(
137137
assertThat(settings.getAppProfileId()).isEqualTo(appProfileId);
138138
assertThat(settings.getEndpoint()).isEqualTo(endpoint);
139139
assertThat(settings.getCredentialsProvider()).isEqualTo(credentialsProvider);
140-
assertThat(settings.getStreamWatchdogProvider()).isSameAs(watchdogProvider);
140+
assertThat(settings.getStreamWatchdogProvider()).isSameInstanceAs(watchdogProvider);
141141
assertThat(settings.getStreamWatchdogCheckInterval()).isEqualTo(watchdogInterval);
142142
}
143143

@@ -189,19 +189,19 @@ public void readRowsIsNotLostTest() {
189189

190190
assertThat(builder.readRowsSettings().getIdleTimeout()).isEqualTo(Duration.ofMinutes(5));
191191
assertThat(builder.readRowsSettings().getRetryableCodes())
192-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
192+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
193193
assertThat(builder.readRowsSettings().getRetrySettings()).isEqualTo(retrySettings);
194194

195195
assertThat(builder.build().readRowsSettings().getIdleTimeout())
196196
.isEqualTo(Duration.ofMinutes(5));
197197
assertThat(builder.build().readRowsSettings().getRetryableCodes())
198-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
198+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
199199
assertThat(builder.build().readRowsSettings().getRetrySettings()).isEqualTo(retrySettings);
200200

201201
assertThat(builder.build().toBuilder().readRowsSettings().getIdleTimeout())
202202
.isEqualTo(Duration.ofMinutes(5));
203203
assertThat(builder.build().toBuilder().readRowsSettings().getRetryableCodes())
204-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
204+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
205205
assertThat(builder.build().toBuilder().readRowsSettings().getRetrySettings())
206206
.isEqualTo(retrySettings);
207207
}
@@ -241,15 +241,15 @@ public void readRowIsNotLostTest() {
241241
builder.readRowsSettings().setRetryableCodes(Code.ABORTED, Code.DEADLINE_EXCEEDED);
242242

243243
assertThat(builder.readRowSettings().getRetryableCodes())
244-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
244+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
245245
assertThat(builder.readRowSettings().getRetrySettings()).isEqualTo(retrySettings);
246246

247247
assertThat(builder.build().readRowSettings().getRetryableCodes())
248-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
248+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
249249
assertThat(builder.build().readRowSettings().getRetrySettings()).isEqualTo(retrySettings);
250250

251251
assertThat(builder.build().toBuilder().readRowSettings().getRetryableCodes())
252-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
252+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
253253
assertThat(builder.build().toBuilder().readRowSettings().getRetrySettings())
254254
.isEqualTo(retrySettings);
255255
}
@@ -319,15 +319,15 @@ public void sampleRowKeysSettingsAreNotLostTest() {
319319
.build();
320320

321321
assertThat(builder.sampleRowKeysSettings().getRetryableCodes())
322-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
322+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
323323
assertThat(builder.sampleRowKeysSettings().getRetrySettings()).isEqualTo(retrySettings);
324324

325325
assertThat(builder.build().sampleRowKeysSettings().getRetryableCodes())
326-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
326+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
327327
assertThat(builder.build().sampleRowKeysSettings().getRetrySettings()).isEqualTo(retrySettings);
328328

329329
assertThat(builder.build().toBuilder().sampleRowKeysSettings().getRetryableCodes())
330-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
330+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
331331
assertThat(builder.build().toBuilder().sampleRowKeysSettings().getRetrySettings())
332332
.isEqualTo(retrySettings);
333333
}
@@ -366,15 +366,15 @@ public void mutateRowSettingsAreNotLostTest() {
366366
.build();
367367

368368
assertThat(builder.mutateRowSettings().getRetryableCodes())
369-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
369+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
370370
assertThat(builder.mutateRowSettings().getRetrySettings()).isEqualTo(retrySettings);
371371

372372
assertThat(builder.build().mutateRowSettings().getRetryableCodes())
373-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
373+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
374374
assertThat(builder.build().mutateRowSettings().getRetrySettings()).isEqualTo(retrySettings);
375375

376376
assertThat(builder.build().toBuilder().mutateRowSettings().getRetryableCodes())
377-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
377+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
378378
assertThat(builder.build().toBuilder().mutateRowSettings().getRetrySettings())
379379
.isEqualTo(retrySettings);
380380
}
@@ -416,23 +416,24 @@ public void bulkMutateRowsSettingsAreNotLostTest() {
416416
.build();
417417

418418
assertThat(builder.bulkMutateRowsSettings().getRetryableCodes())
419-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
419+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
420420
assertThat(builder.bulkMutateRowsSettings().getRetrySettings()).isEqualTo(retrySettings);
421-
assertThat(builder.bulkMutateRowsSettings().getBatchingSettings()).isSameAs(batchingSettings);
421+
assertThat(builder.bulkMutateRowsSettings().getBatchingSettings())
422+
.isSameInstanceAs(batchingSettings);
422423

423424
assertThat(builder.build().bulkMutateRowsSettings().getRetryableCodes())
424-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
425+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
425426
assertThat(builder.build().bulkMutateRowsSettings().getRetrySettings())
426427
.isEqualTo(retrySettings);
427428
assertThat(builder.build().bulkMutateRowsSettings().getBatchingSettings())
428-
.isSameAs(batchingSettings);
429+
.isSameInstanceAs(batchingSettings);
429430

430431
assertThat(builder.build().toBuilder().bulkMutateRowsSettings().getRetryableCodes())
431-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
432+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
432433
assertThat(builder.build().toBuilder().bulkMutateRowsSettings().getRetrySettings())
433434
.isEqualTo(retrySettings);
434435
assertThat(builder.build().toBuilder().bulkMutateRowsSettings().getBatchingSettings())
435-
.isSameAs(batchingSettings);
436+
.isSameInstanceAs(batchingSettings);
436437
}
437438

438439
@Test
@@ -475,18 +476,19 @@ public void checkAndMutateRowSettingsAreNotLostTest() {
475476
.build();
476477

477478
assertThat(builder.checkAndMutateRowSettings().getRetryableCodes())
478-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
479-
assertThat(builder.checkAndMutateRowSettings().getRetrySettings()).isSameAs(retrySettings);
479+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
480+
assertThat(builder.checkAndMutateRowSettings().getRetrySettings())
481+
.isSameInstanceAs(retrySettings);
480482

481483
assertThat(builder.build().checkAndMutateRowSettings().getRetryableCodes())
482-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
484+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
483485
assertThat(builder.build().checkAndMutateRowSettings().getRetrySettings())
484-
.isSameAs(retrySettings);
486+
.isSameInstanceAs(retrySettings);
485487

486488
assertThat(builder.build().toBuilder().checkAndMutateRowSettings().getRetryableCodes())
487-
.containsAllOf(Code.ABORTED, Code.DEADLINE_EXCEEDED);
489+
.containsAtLeast(Code.ABORTED, Code.DEADLINE_EXCEEDED);
488490
assertThat(builder.build().toBuilder().checkAndMutateRowSettings().getRetrySettings())
489-
.isSameAs(retrySettings);
491+
.isSameInstanceAs(retrySettings);
490492
}
491493

492494
@Test
@@ -501,7 +503,7 @@ public void checkAndMutateRowSettingsAreSane() {
501503
}
502504

503505
private void verifyRetrySettingAreSane(Set<Code> retryCodes, RetrySettings retrySettings) {
504-
assertThat(retryCodes).containsAllOf(Code.DEADLINE_EXCEEDED, Code.UNAVAILABLE);
506+
assertThat(retryCodes).containsAtLeast(Code.DEADLINE_EXCEEDED, Code.UNAVAILABLE);
505507

506508
assertThat(retrySettings.getTotalTimeout()).isGreaterThan(Duration.ZERO);
507509

‎google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/mutaterows/MutateRowsBatchingDescriptorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,15 @@ public void splitRpcExceptionTest() throws Exception {
125125
} catch (ExecutionException t) {
126126
error1 = t.getCause();
127127
}
128-
assertThat(error1).isSameAs(serverError);
128+
assertThat(error1).isSameInstanceAs(serverError);
129129

130130
Throwable error2 = null;
131131
try {
132132
result2.get(1, TimeUnit.SECONDS);
133133
} catch (ExecutionException t) {
134134
error2 = t.getCause();
135135
}
136-
assertThat(error2).isSameAs(serverError);
136+
assertThat(error2).isSameInstanceAs(serverError);
137137
}
138138

139139
@Test

0 commit comments

Comments
 (0)