Skip to content
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

Jump to bottom

fix: Assertj-core cleanup #2102

Merged
merged 3 commits into from
Jun 7, 2022
Merged

fix: Assertj-core cleanup #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
860c4ba
Removed assertj-core
prash-mi Jun 7, 2022
a0e3def
Removed assertj-core
prash-mi Jun 7, 2022
b1ce223
Removed assertj-core and refactored compareQueryRequestInfo test
prash-mi Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions google-cloud-bigquery/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-datacatalog</artifactId>
Expand Down
24 changes: 22 additions & 2 deletions google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryRequestInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package com.google.cloud.bigquery;

import static org.assertj.core.api.Assertions.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;

import com.google.api.services.bigquery.model.QueryRequest;
import com.google.cloud.bigquery.JobInfo.CreateDisposition;
Expand Down Expand Up @@ -167,8 +167,28 @@ public void equalTo() {
compareQueryRequestInfo(new QueryRequestInfo(QUERY_JOB_CONFIGURATION), REQUEST_INFO);
}

/*
Ref: https://github.com/googleapis/java-bigquery/issues/2083
Refactoring to remove the assert4j dependency which was causing RequireUpperBoundDeps Error
*/
private void compareQueryRequestInfo(QueryRequestInfo expected, QueryRequestInfo actual) {
QueryRequest expectedQueryReq = expected.toPb();
QueryRequest actualQueryReq = actual.toPb();

// requestId are expected to be different
assertThat(actual).isEqualToIgnoringGivenFields(expected, "requestId");
assertNotEquals(expectedQueryReq.getRequestId(), actualQueryReq.getRequestId());
// rest of the attributes should be equal
assertEquals(
expectedQueryReq.getConnectionProperties(), actualQueryReq.getConnectionProperties());
assertEquals(expectedQueryReq.getDefaultDataset(), actualQueryReq.getDefaultDataset());
assertEquals(expectedQueryReq.getDryRun(), actualQueryReq.getDryRun());
assertEquals(expectedQueryReq.getLabels(), actualQueryReq.getLabels());
assertEquals(expectedQueryReq.getMaximumBytesBilled(), actualQueryReq.getMaximumBytesBilled());
assertEquals(expectedQueryReq.getMaxResults(), actualQueryReq.getMaxResults());
assertEquals(expectedQueryReq.getQuery(), actualQueryReq.getQuery());
assertEquals(expectedQueryReq.getQueryParameters(), actualQueryReq.getQueryParameters());
assertEquals(expectedQueryReq.getCreateSession(), actualQueryReq.getCreateSession());
assertEquals(expectedQueryReq.getUseQueryCache(), actualQueryReq.getUseQueryCache());
assertEquals(expectedQueryReq.getUseLegacySql(), actualQueryReq.getUseLegacySql());
}
}
7 changes: 0 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,6 @@
<version>2.7.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<!-- use 2.9.1 for Java 7 projects -->
<version>2.9.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down