Replace deprecated AssertJ method

adutra · adutra · commit f3ee4847464a · 2021-03-14T20:35:09.000+01:00
diff --git a/core/src/test/java/com/datastax/dse/driver/internal/core/graph/ContinuousGraphRequestHandlerTest.java b/core/src/test/java/com/datastax/dse/driver/internal/core/graph/ContinuousGraphRequestHandlerTest.java
@@ -20,6 +20,7 @@
 import static com.datastax.dse.driver.internal.core.graph.GraphTestUtils.tenGraphRows;
 import static com.datastax.oss.driver.Assertions.assertThat;
 import static com.datastax.oss.driver.Assertions.assertThatStage;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
@@ -182,9 +183,10 @@ public void should_honor_default_timeout() throws Exception {
 
       // will trigger the global timeout and complete it exceptionally
       globalTimeout.task().run(globalTimeout);
-      assertThat(page1Future.toCompletableFuture())
-          .hasFailedWithThrowableThat()
-          .isInstanceOf(DriverTimeoutException.class)
+      assertThat(page1Future.toCompletableFuture()).isCompletedExceptionally();
+
+      assertThatThrownBy(() -> page1Future.toCompletableFuture().get())
+          .hasRootCauseExactlyInstanceOf(DriverTimeoutException.class)
           .hasMessageContaining("Query timed out after " + defaultTimeout);
     }
   }
@@ -233,9 +235,10 @@ public void should_honor_statement_timeout() throws Exception {
 
       // will trigger the global timeout and complete it exceptionally
       globalTimeout.task().run(globalTimeout);
-      assertThat(page1Future.toCompletableFuture())
-          .hasFailedWithThrowableThat()
-          .isInstanceOf(DriverTimeoutException.class)
+      assertThat(page1Future.toCompletableFuture()).isCompletedExceptionally();
+
+      assertThatThrownBy(() -> page1Future.toCompletableFuture().get())
+          .hasRootCauseExactlyInstanceOf(DriverTimeoutException.class)
           .hasMessageContaining("Query timed out after " + statementTimeout);
     }
   }
