Skip to content

Bigtable: clean up redundant code #5286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chingor13 merged 2 commits into from
Jul 30, 2019
Merged

Bigtable: clean up redundant code #5286

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7124ba0
Redundant Code Clean Up.
liubonan Jun 3, 2019
296e428
Fix lint
chingor13 Jul 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions ...gtable/src/test/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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);

Expand All @@ -189,13 +189,10 @@ public ApiFuture<Empty> answer(InvocationOnMock invocationOnMock) {
public void testGetTable() {
// Setup
GetTableRequest expectedRequest =
GetTableRequest.newBuilder()
.setName(TABLE_NAME.toString())
.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.toString()).build();
com.google.bigtable.admin.v2.Table.newBuilder().setName(TABLE_NAME).build();

Mockito.when(mockGetTableCallable.futureCall(expectedRequest))
.thenReturn(ApiFutures.immediateFuture(expectedResponse));
Expand Down Expand Up @@ -286,7 +283,6 @@ public ApiFuture<Empty> answer(InvocationOnMock invocationOnMock) {
@Test
public void testAwaitReplication() {
// Setup
@SuppressWarnings("UnnecessaryLocalVariable")
TableName expectedRequest = TableName.parse(TABLE_NAME);

final AtomicBoolean wasCalled = new AtomicBoolean(false);
Expand All @@ -312,7 +308,7 @@ public ApiFuture<Void> 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));
Expand Down