commit 4d964e00d6402225fe58674fcfc884e87222cd31
author Dom G <dominic.garguilo@gmail.com> Sat Dec 03 09:19:11 2022 -0500
committer GitHub <noreply@github.com> Sat Dec 03 14:19:11 2022 +0000
tree c3e9bc108166cd76be924644654f511913d5a3f5
parent e02d5bf03775af5731819a923171563319c9aafb

Use asserThrows in place of deprecated Exception.none() (#1128)

modules/integration-tests/src/main/java/org/apache/fluo/integration/impl/FailureIT.java

diff --git a/modules/integration-tests/src/main/java/org/apache/fluo/integration/impl/FailureIT.java b/modules/integration-tests/src/main/java/org/apache/fluo/integration/impl/FailureIT.java
index cc23f7d..8c3c6af 100644
--- a/modules/integration-tests/src/main/java/org/apache/fluo/integration/impl/FailureIT.java
+++ b/modules/integration-tests/src/main/java/org/apache/fluo/integration/impl/FailureIT.java
@@ -53,7 +53,6 @@
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.rules.Timeout;
 
 import static org.apache.fluo.api.observer.Observer.NotificationType.STRONG;
@@ -62,8 +61,6 @@
 public class FailureIT extends ITBaseImpl {
   @Rule
   public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
-  @Rule
-  public ExpectedException exception = ExpectedException.none();
 
   public static class NullObserver implements Observer {
     @Override
@@ -132,8 +129,7 @@
 
     if (killTransactor) {
       Stamp commitTs = env.getSharedResources().getOracleClient().getStamp();
-      exception.expect(FluoException.class);
-      tx2.commitPrimaryColumn(cd, commitTs);
+      Assert.assertThrows(FluoException.class, () -> tx2.commitPrimaryColumn(cd, commitTs));
     } else {
       Stamp commitTs = env.getSharedResources().getOracleClient().getStamp();
       Assert.assertFalse(tx2.commitPrimaryColumn(cd, commitTs));
@@ -322,9 +318,7 @@
     Stamp commitTs = env.getSharedResources().getOracleClient().getStamp();
 
     if (killTransactor) {
-      // test for exception
-      exception.expect(FluoException.class);
-      tx2.commitPrimaryColumn(cd, commitTs);
+      Assert.assertThrows(FluoException.class, () -> tx2.commitPrimaryColumn(cd, commitTs));
     } else {
       Assert.assertFalse(tx2.commitPrimaryColumn(cd, commitTs));
       t1.close();