From 4630c50db7428d888b726297408b7a223b39b28a Mon Sep 17 00:00:00 2001
From: Prashant Mishra <11733935+prash-mi@users.noreply.github.com>
Date: Wed, 8 Jun 2022 01:24:10 +0530
Subject: [PATCH] fix: Assertj-core cleanup (#2102)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removed Assertj-core  and refactored related testcase

Fixes #2083☕️
---
 google-cloud-bigquery/pom.xml                 |  5 ----
 .../cloud/bigquery/QueryRequestInfoTest.java  | 24 +++++++++++++++++--
 pom.xml                                       |  7 ------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/google-cloud-bigquery/pom.xml b/google-cloud-bigquery/pom.xml
index 399eecfc2..e0b608f7f 100644
--- a/google-cloud-bigquery/pom.xml
+++ b/google-cloud-bigquery/pom.xml
@@ -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>
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryRequestInfoTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryRequestInfoTest.java
index 5c224af80..a62e3c0a0 100644
--- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryRequestInfoTest.java
+++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryRequestInfoTest.java
@@ -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;
@@ -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());
   }
 }
diff --git a/pom.xml b/pom.xml
index 9904f051f..a06c2e016 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>