From 145db059499a055bb1eba4677d6e3215701bb270 Mon Sep 17 00:00:00 2001
From: orrym <orrym@vatit.com>
Date: Sat, 3 Feb 2018 15:45:17 +0200
Subject: [PATCH] BAEL-1517: Upgrade AssertJ to 3.9.0; add Java 8 style
 assertion tests

---
 testing-modules/testing/pom.xml               |  2 +-
 .../exceptions/Java7StyleAssertions.java      |  5 ++-
 .../exceptions/Java8StyleAssertions.java      | 42 +++++++++++++++++++
 3 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 testing-modules/testing/src/test/java/com/baeldung/testing/assertj/exceptions/Java8StyleAssertions.java

diff --git a/testing-modules/testing/pom.xml b/testing-modules/testing/pom.xml
index c76045380b..91792a4681 100644
--- a/testing-modules/testing/pom.xml
+++ b/testing-modules/testing/pom.xml
@@ -173,7 +173,7 @@
         <jacoco.version>0.7.7.201606060606</jacoco.version>
         <guava.version>21.0</guava.version>
         <assertj-guava.version>3.1.0</assertj-guava.version>
-        <assertj-core.version>3.6.1</assertj-core.version>
+        <assertj-core.version>3.9.0</assertj-core.version>
         <assertj-generator.version>2.1.0</assertj-generator.version>
         <truth.version>0.32</truth.version>
         <jUnitParams.version>1.1.0</jUnitParams.version>
diff --git a/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/exceptions/Java7StyleAssertions.java b/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/exceptions/Java7StyleAssertions.java
index 0dff8d2964..07a5be1118 100644
--- a/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/exceptions/Java7StyleAssertions.java
+++ b/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/exceptions/Java7StyleAssertions.java
@@ -15,9 +15,10 @@ public class Java7StyleAssertions {
             int denominator = 0;
             int quotient = numerator / denominator;
             fail("ArithmeticException expected because dividing by zero yields an ArithmeticException.");
-            failBecauseExceptionWasNotThrown(IndexOutOfBoundsException.class);
-        } catch (ArithmeticException e) {
+            failBecauseExceptionWasNotThrown(ArithmeticException.class);
+        } catch (Exception e) {
             assertThat(e).hasMessage("/ by zero");
+            assertThat(e).isInstanceOf(ArithmeticException.class);
         }
     }
 }
diff --git a/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/exceptions/Java8StyleAssertions.java b/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/exceptions/Java8StyleAssertions.java
new file mode 100644
index 0000000000..53f192bb2f
--- /dev/null
+++ b/testing-modules/testing/src/test/java/com/baeldung/testing/assertj/exceptions/Java8StyleAssertions.java
@@ -0,0 +1,42 @@
+package com.baeldung.testing.assertj.exceptions;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.catchThrowable;
+
+import org.junit.Test;
+
+public class Java8StyleAssertions {
+
+    @Test
+    public void whenDividingByZero_thenArithmeticException() {
+        assertThatThrownBy(() -> {
+            int numerator = 10;
+            int denominator = 0;
+            int quotient = numerator / denominator;
+        }).isInstanceOf(ArithmeticException.class)
+            .hasMessageContaining("/ by zero");
+
+        assertThatExceptionOfType(ArithmeticException.class).isThrownBy(() -> {
+            int numerator = 10;
+            int denominator = 0;
+            int quotient = numerator / denominator;
+        })
+            .withMessageContaining("/ by zero");
+
+        // BDD style:
+
+        // when
+        Throwable thrown = catchThrowable(() -> {
+            int numerator = 10;
+            int denominator = 0;
+            int quotient = numerator / denominator;
+        });
+
+        // then
+        assertThat(thrown).isInstanceOf(ArithmeticException.class)
+            .hasMessageContaining("/ by zero");
+
+    }
+}