From ba5bf4a7c4f9097d540352afa1e895d2f1019328 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Tue, 6 Oct 2015 13:14:11 +0100
Subject: Avoid supressing warnings

---
 .../java/org/zwobble/couscous/tests/util/ExtraAsserts.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/test/java')

diff --git a/src/test/java/org/zwobble/couscous/tests/util/ExtraAsserts.java b/src/test/java/org/zwobble/couscous/tests/util/ExtraAsserts.java
index 98ea75a..c5f1668 100644
--- a/src/test/java/org/zwobble/couscous/tests/util/ExtraAsserts.java
+++ b/src/test/java/org/zwobble/couscous/tests/util/ExtraAsserts.java
@@ -1,19 +1,19 @@
 package org.zwobble.couscous.tests.util;
 
 import org.zwobble.couscous.util.Action;
+import org.zwobble.couscous.util.Casts;
+
+import lombok.SneakyThrows;
 
 public class ExtraAsserts {
-    @SuppressWarnings("unchecked")
+    @SneakyThrows
     public static <T extends Throwable> T assertThrows(Class<T> exceptionType, Action action) {
         try {
             action.run();
             throw new AssertionError("Expected exception");
         } catch (Exception exception) {
-            if (exceptionType.isInstance(exception)) {
-                return (T)exception;
-            } else {
-                throw exception;
-            }
+            return Casts.tryCast(exceptionType, exception)
+                .orElseThrow(() -> exception);
         }
     }
 }
-- 
cgit v1.2.3