From 7124ba0f0c0943dbb66f6ab980f25d51f3414180 Mon Sep 17 00:00:00 2001 From: Bonan Liu Date: Mon, 3 Jun 2019 22:11:33 +0000 Subject: [PATCH 1/2] Redundant Code Clean Up. --- .../admin/v2/BigtableTableAdminClientTest.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java index cad9f21909f3..5e3659951c65 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java @@ -118,7 +118,7 @@ public void testCreateTable() { .build(); com.google.bigtable.admin.v2.Table expectedResponse = - com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME.toString()).build(); + com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME).build(); Mockito.when(mockCreateTableCallable.futureCall(expectedRequest)) .thenReturn(ApiFutures.immediateFuture(expectedResponse)); @@ -164,7 +164,7 @@ public void testModifyFamilies() { public void testDeleteTable() { // Setup DeleteTableRequest expectedRequest = - DeleteTableRequest.newBuilder().setName(TABLE_NAME.toString()).build(); + DeleteTableRequest.newBuilder().setName(TABLE_NAME).build(); final AtomicBoolean wasCalled = new AtomicBoolean(false); @@ -190,12 +190,12 @@ public void testGetTable() { // Setup GetTableRequest expectedRequest = GetTableRequest.newBuilder() - .setName(TABLE_NAME.toString()) + .setName(TABLE_NAME) .setView(View.SCHEMA_VIEW) .build(); com.google.bigtable.admin.v2.Table expectedResponse = - com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME.toString()).build(); + com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME).build(); Mockito.when(mockGetTableCallable.futureCall(expectedRequest)) .thenReturn(ApiFutures.immediateFuture(expectedResponse)); @@ -286,7 +286,6 @@ public ApiFuture answer(InvocationOnMock invocationOnMock) { @Test public void testAwaitReplication() { // Setup - @SuppressWarnings("UnnecessaryLocalVariable") TableName expectedRequest = TableName.parse(TABLE_NAME); final AtomicBoolean wasCalled = new AtomicBoolean(false); @@ -312,7 +311,7 @@ public ApiFuture answer(InvocationOnMock invocationOnMock) { public void testExistsTrue() { // Setup com.google.bigtable.admin.v2.Table expectedResponse = - com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME.toString()).build(); + com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME).build(); Mockito.when(mockGetTableCallable.futureCall(Matchers.any(GetTableRequest.class))) .thenReturn(ApiFutures.immediateFuture(expectedResponse)); From 296e428115a0f7f34e7c19de41bc643e7b979389 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 30 Jul 2019 14:32:18 -0700 Subject: [PATCH 2/2] Fix lint --- .../bigtable/admin/v2/BigtableTableAdminClientTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java index 5e3659951c65..358d2990c5bb 100644 --- a/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java +++ b/google-cloud-clients/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java @@ -189,10 +189,7 @@ public ApiFuture answer(InvocationOnMock invocationOnMock) { public void testGetTable() { // Setup GetTableRequest expectedRequest = - GetTableRequest.newBuilder() - .setName(TABLE_NAME) - .setView(View.SCHEMA_VIEW) - .build(); + GetTableRequest.newBuilder().setName(TABLE_NAME).setView(View.SCHEMA_VIEW).build(); com.google.bigtable.admin.v2.Table expectedResponse = com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME).build();