Skip to content

Commit 9cfe553

Browse files
liubonanchingor13
authored andcommitted
Bigtable: clean up redundant code (#5286)
* Redundant Code Clean Up. * Fix lint
1 parent 32100ee commit 9cfe553

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void testCreateTable() {
118118
.build();
119119

120120
com.google.bigtable.admin.v2.Table expectedResponse =
121-
com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME.toString()).build();
121+
com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME).build();
122122

123123
Mockito.when(mockCreateTableCallable.futureCall(expectedRequest))
124124
.thenReturn(ApiFutures.immediateFuture(expectedResponse));
@@ -164,7 +164,7 @@ public void testModifyFamilies() {
164164
public void testDeleteTable() {
165165
// Setup
166166
DeleteTableRequest expectedRequest =
167-
DeleteTableRequest.newBuilder().setName(TABLE_NAME.toString()).build();
167+
DeleteTableRequest.newBuilder().setName(TABLE_NAME).build();
168168

169169
final AtomicBoolean wasCalled = new AtomicBoolean(false);
170170

@@ -189,13 +189,10 @@ public ApiFuture<Empty> answer(InvocationOnMock invocationOnMock) {
189189
public void testGetTable() {
190190
// Setup
191191
GetTableRequest expectedRequest =
192-
GetTableRequest.newBuilder()
193-
.setName(TABLE_NAME.toString())
194-
.setView(View.SCHEMA_VIEW)
195-
.build();
192+
GetTableRequest.newBuilder().setName(TABLE_NAME).setView(View.SCHEMA_VIEW).build();
196193

197194
com.google.bigtable.admin.v2.Table expectedResponse =
198-
com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME.toString()).build();
195+
com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME).build();
199196

200197
Mockito.when(mockGetTableCallable.futureCall(expectedRequest))
201198
.thenReturn(ApiFutures.immediateFuture(expectedResponse));
@@ -286,7 +283,6 @@ public ApiFuture<Empty> answer(InvocationOnMock invocationOnMock) {
286283
@Test
287284
public void testAwaitReplication() {
288285
// Setup
289-
@SuppressWarnings("UnnecessaryLocalVariable")
290286
TableName expectedRequest = TableName.parse(TABLE_NAME);
291287

292288
final AtomicBoolean wasCalled = new AtomicBoolean(false);
@@ -312,7 +308,7 @@ public ApiFuture<Void> answer(InvocationOnMock invocationOnMock) {
312308
public void testExistsTrue() {
313309
// Setup
314310
com.google.bigtable.admin.v2.Table expectedResponse =
315-
com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME.toString()).build();
311+
com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME).build();
316312

317313
Mockito.when(mockGetTableCallable.futureCall(Matchers.any(GetTableRequest.class)))
318314
.thenReturn(ApiFutures.immediateFuture(expectedResponse));

0 commit comments

Comments
 (0)