mirrors/acme4j
1
0
Fork 0
mirror of https://github.com/shred/acme4j.git synced 2025-12-13 11:14:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Optimize AssertJ exception checks

Browse Source
This commit is contained in:
Richard Körber
2023-05-07 09:25:04 +02:00
parent aa5e78c525
commit c26d6b1f8a
5 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.*;
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);

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

@@ -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();