Optimize AssertJ exception checks

acme4j-client/src/test/java/org/shredzone/acme4j/OrderTest.java

@@ -308,7 +308,7 @@ public class OrderTest {
         var order = login.bindOrder(locationUrl);
 
         try (var softly = new AutoCloseableSoftAssertions()) {
-            softly.assertThatExceptionOfType(IllegalStateException.class)
+            softly.assertThatIllegalStateException()
                     .isThrownBy(order::getCertificate);
             softly.assertThat(order.getAutoRenewalCertificate().orElseThrow().getLocation())
                     .isEqualTo(url("https://example.com/acme/cert/1234"));

acme4j-client/src/test/java/org/shredzone/acme4j/connector/SessionProviderTest.java

@@ -14,7 +14,7 @@
 package org.shredzone.acme4j.connector;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
 import java.net.URI;
 import java.net.URL;
@@ -40,7 +40,7 @@ public class SessionProviderTest {
      */
     @Test
     public void testNone() {
-        assertThatExceptionOfType(IllegalArgumentException.class)
+        assertThatIllegalArgumentException()
                 .isThrownBy(() -> new Session(new URI("acme://example.org")).provider())
                 .withMessage("No ACME provider found for acme://example.org");
     }
@@ -67,7 +67,7 @@ public class SessionProviderTest {
      */
     @Test
     public void testDuplicate() {
-        assertThatExceptionOfType(IllegalArgumentException.class)
+        assertThatIllegalArgumentException()
                 .isThrownBy(() -> new Session(new URI("acme://example.net")).provider())
                 .withMessage("Both ACME providers Provider1 and Provider2 accept" +
                         " acme://example.net. Please check your classpath.");

acme4j-smime/src/test/java/org/shredzone/acme4j/smime/csr/SMIMECSRBuilderTest.java

@@ -14,8 +14,7 @@
 package org.shredzone.acme4j.smime.csr;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.ByteArrayOutputStream;
@@ -155,16 +154,16 @@ public class SMIMECSRBuilderTest {
 
         assertThat(builder.toString()).isEqualTo(",TYPE=SIGNING_AND_ENCRYPTION");
 
-        assertThatExceptionOfType(NullPointerException.class)
+        assertThatNullPointerException()
                 .as("addValue(String, String)")
                 .isThrownBy(() -> new SMIMECSRBuilder().addValue((String) null, "value"));
-        assertThatExceptionOfType(NullPointerException.class)
+        assertThatNullPointerException()
                 .as("addValue(ASN1ObjectIdentifier, String)")
                 .isThrownBy(() -> new SMIMECSRBuilder().addValue((ASN1ObjectIdentifier) null, "value"));
-        assertThatExceptionOfType(NullPointerException.class)
+        assertThatNullPointerException()
                 .as("addValue(String, null)")
                 .isThrownBy(() -> new SMIMECSRBuilder().addValue("C", null));
-        assertThatExceptionOfType(IllegalArgumentException.class)
+        assertThatIllegalArgumentException()
                 .as("addValue(String, null)")
                 .isThrownBy(() -> new SMIMECSRBuilder().addValue("UNKNOWNATT", "val"))
                 .withMessage(invAttNameExMessage);

acme4j-smime/src/test/java/org/shredzone/acme4j/smime/email/EmailProcessorTest.java

@@ -234,7 +234,7 @@ public class EmailProcessorTest extends SMIMETests {
 
     @Test
     public void textNoChallengeFails1() {
-        assertThatExceptionOfType(IllegalStateException.class)
+        assertThatIllegalStateException()
                 .isThrownBy(() -> {
                     var processor = EmailProcessor.plainMessage(message);
                     processor.getToken();
@@ -244,7 +244,7 @@ public class EmailProcessorTest extends SMIMETests {
 
     @Test
     public void textNoChallengeFails2() {
-        assertThatExceptionOfType(IllegalStateException.class)
+        assertThatIllegalStateException()
                 .isThrownBy(() -> {
                     var processor = EmailProcessor.plainMessage(message);
                     processor.getAuthorization();
@@ -254,7 +254,7 @@ public class EmailProcessorTest extends SMIMETests {
 
     @Test
     public void textNoChallengeFails3() {
-        assertThatExceptionOfType(IllegalStateException.class)
+        assertThatIllegalStateException()
                 .isThrownBy(() -> {
                     var processor = EmailProcessor.plainMessage(message);
                     processor.respond();

acme4j-utils/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java

@@ -13,8 +13,7 @@
  */
 package org.shredzone.acme4j.util;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.*;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.ByteArrayOutputStream;
@@ -133,17 +132,17 @@ public class CSRBuilderTest {
     public void testNoSign() {
         var builder = new CSRBuilder();
 
-        assertThatExceptionOfType(IllegalStateException.class)
+        assertThatIllegalStateException()
             .isThrownBy(builder::getCSR)
             .as("getCSR()")
             .withMessage("sign CSR first");
 
-        assertThatExceptionOfType(IllegalStateException.class)
+        assertThatIllegalStateException()
             .isThrownBy(builder::getEncoded)
             .as("getCSR()")
             .withMessage("sign CSR first");
 
-        assertThatExceptionOfType(IllegalStateException.class)
+        assertThatIllegalStateException()
             .isThrownBy(() -> {
                 try (StringWriter w = new StringWriter()) {
                     builder.write(w);
@@ -167,16 +166,16 @@ public class CSRBuilderTest {
         
         assertThat(builder.toString()).isEqualTo("");
 
-        assertThatExceptionOfType(NullPointerException.class)
+        assertThatNullPointerException()
             .isThrownBy(() -> new CSRBuilder().addValue((String) null, "value"))
             .as("addValue(String, String)");
-        assertThatExceptionOfType(NullPointerException.class)
+        assertThatNullPointerException()
             .isThrownBy(() -> new CSRBuilder().addValue((ASN1ObjectIdentifier) null, "value"))
             .as("addValue(ASN1ObjectIdentifier, String)");
-        assertThatExceptionOfType(NullPointerException.class)
+        assertThatNullPointerException()
             .isThrownBy(() -> new CSRBuilder().addValue("C", null))
             .as("addValue(String, null)");
-        assertThatExceptionOfType(IllegalArgumentException.class)
+        assertThatIllegalArgumentException()
             .isThrownBy(() -> new CSRBuilder().addValue("UNKNOWNATT", "val"))
             .as("addValue(String, null)")
             .withMessage(invAttNameExMessage);