root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Use AssertJ's fail, not JUnit's 

This commit also updates Checkstyle to prevent use of JUnit's
assertions from being reintroduced.

See gh-37655
This commit is contained in:
Johnny Lim 2023-10-03 14:50:51 +09:00 committed by Andy Wilkinson
parent ed4ab667a1
commit c9932bb73a
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/ValidationFailureAnalyzerTests.java
View File

@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail; import static org.assertj.core.api.Assertions.fail;
/** /**
* Tests for {@link ValidationFailureAnalyzer}. * Tests for {@link ValidationFailureAnalyzer}.

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfigurationTests.java
View File

@ -43,7 +43,7 @@ import org.springframework.jmx.export.MBeanExporter;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.jupiter.api.Assertions.fail; import static org.assertj.core.api.Assertions.fail;
/** /**
* Tests for {@link SpringApplicationAdminJmxAutoConfiguration}. * Tests for {@link SpringApplicationAdminJmxAutoConfiguration}.

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
View File

@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableMBeanExport; import org.springframework.context.annotation.EnableMBeanExport;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail; import static org.assertj.core.api.Assertions.fail;
/** /**
* Tests for {@link TomcatDataSourceConfiguration}. * Tests for {@link TomcatDataSourceConfiguration}.

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfigurationTests.java
View File

@ -69,7 +69,7 @@ import org.springframework.web.socket.sockjs.client.Transport;
import org.springframework.web.socket.sockjs.client.WebSocketTransport; import org.springframework.web.socket.sockjs.client.WebSocketTransport;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail; import static org.assertj.core.api.Assertions.fail;
/** /**
* Tests for {@link WebSocketMessagingAutoConfiguration}. * Tests for {@link WebSocketMessagingAutoConfiguration}.

2
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandlerTests.java
View File

@ -21,7 +21,7 @@ import java.util.concurrent.CountDownLatch;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail; import static org.assertj.core.api.Assertions.fail;
/** /**
* Tests for {@link SilentExitExceptionHandler}. * Tests for {@link SilentExitExceptionHandler}.

26
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/PropertyMapperTests.java
View File

@ -18,11 +18,11 @@ package org.springframework.boot.context.properties;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.fail;
/** /**
* Tests for {@link PropertyMapper}. * Tests for {@link PropertyMapper}.
@ -56,7 +56,7 @@ class PropertyMapperTests {
@Test @Test
void fromValueAlwaysApplyingWhenNonNullShouldAlwaysApplyNonNullToSource() { void fromValueAlwaysApplyingWhenNonNullShouldAlwaysApplyNonNullToSource() {
this.map.alwaysApplyingWhenNonNull().from((String) null).toCall(Assertions::fail); this.map.alwaysApplyingWhenNonNull().from((String) null).toCall(() -> fail(null));
} }
@Test @Test
@ -100,14 +100,14 @@ class PropertyMapperTests {
@Test @Test
void whenNonNullWhenSuppliedNullShouldNotMap() { void whenNonNullWhenSuppliedNullShouldNotMap() {
this.map.from(() -> null).whenNonNull().as(String::valueOf).toCall(Assertions::fail); this.map.from(() -> null).whenNonNull().as(String::valueOf).toCall(() -> fail(null));
} }
@Test @Test
void whenNonNullWhenSuppliedThrowsNullPointerExceptionShouldNotMap() { void whenNonNullWhenSuppliedThrowsNullPointerExceptionShouldNotMap() {
this.map.from(() -> { this.map.from(() -> {
throw new NullPointerException(); throw new NullPointerException();
}).whenNonNull().as(String::valueOf).toCall(Assertions::fail); }).whenNonNull().as(String::valueOf).toCall(() -> fail(null));
} }
@Test @Test
@ -118,7 +118,7 @@ class PropertyMapperTests {
@Test @Test
void whenTrueWhenValueIsFalseShouldNotMap() { void whenTrueWhenValueIsFalseShouldNotMap() {
this.map.from(false).whenTrue().toCall(Assertions::fail); this.map.from(false).whenTrue().toCall(() -> fail(null));
} }
@Test @Test
@ -129,17 +129,17 @@ class PropertyMapperTests {
@Test @Test
void whenFalseWhenValueIsTrueShouldNotMap() { void whenFalseWhenValueIsTrueShouldNotMap() {
this.map.from(true).whenFalse().toCall(Assertions::fail); this.map.from(true).whenFalse().toCall(() -> fail(null));
} }
@Test @Test
void whenHasTextWhenValueIsNullShouldNotMap() { void whenHasTextWhenValueIsNullShouldNotMap() {
this.map.from(() -> null).whenHasText().toCall(Assertions::fail); this.map.from(() -> null).whenHasText().toCall(() -> fail(null));
} }
@Test @Test
void whenHasTextWhenValueIsEmptyShouldNotMap() { void whenHasTextWhenValueIsEmptyShouldNotMap() {
this.map.from("").whenHasText().toCall(Assertions::fail); this.map.from("").whenHasText().toCall(() -> fail(null));
} }
@Test @Test
@ -156,7 +156,7 @@ class PropertyMapperTests {
@Test @Test
void whenEqualToWhenValueIsNotEqualShouldNotMatch() { void whenEqualToWhenValueIsNotEqualShouldNotMatch() {
this.map.from("123").whenEqualTo("321").toCall(Assertions::fail); this.map.from("123").whenEqualTo("321").toCall(() -> fail(null));
} }
@Test @Test
@ -168,7 +168,7 @@ class PropertyMapperTests {
@Test @Test
void whenInstanceOfWhenValueIsNotTargetTypeShouldNotMatch() { void whenInstanceOfWhenValueIsNotTargetTypeShouldNotMatch() {
Supplier<Number> supplier = () -> 123L; Supplier<Number> supplier = () -> 123L;
this.map.from(supplier).whenInstanceOf(Double.class).toCall(Assertions::fail); this.map.from(supplier).whenInstanceOf(Double.class).toCall(() -> fail(null));
} }
@Test @Test
@ -179,7 +179,7 @@ class PropertyMapperTests {
@Test @Test
void whenWhenValueDoesNotMatchShouldNotMap() { void whenWhenValueDoesNotMatchShouldNotMap() {
this.map.from("123").when("321"::equals).toCall(Assertions::fail); this.map.from("123").when("321"::equals).toCall(() -> fail(null));
} }
@Test @Test
@ -197,12 +197,12 @@ class PropertyMapperTests {
@Test @Test
void alwaysApplyingWhenNonNullShouldAlwaysApplyNonNullToSource() { void alwaysApplyingWhenNonNullShouldAlwaysApplyNonNullToSource() {
this.map.alwaysApplyingWhenNonNull().from(() -> null).toCall(Assertions::fail); this.map.alwaysApplyingWhenNonNull().from(() -> null).toCall(() -> fail(null));
} }
@Test @Test
void whenWhenValueNotMatchesShouldSupportChainedCalls() { void whenWhenValueNotMatchesShouldSupportChainedCalls() {
this.map.from("123").when("456"::equals).when("123"::equals).toCall(Assertions::fail); this.map.from("123").when("456"::equals).when("123"::equals).toCall(() -> fail(null));
} }
@Test @Test

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java
View File

@ -37,7 +37,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail; import static org.assertj.core.api.Assertions.fail;
/** /**
* Tests for {@link BeanCurrentlyInCreationFailureAnalyzer}. * Tests for {@link BeanCurrentlyInCreationFailureAnalyzer}.

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanNotOfRequiredTypeFailureAnalyzerTests.java
View File

@ -29,7 +29,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail; import static org.assertj.core.api.Assertions.fail;
/** /**
* Tests for {@link BeanNotOfRequiredTypeFailureAnalyzer}. * Tests for {@link BeanNotOfRequiredTypeFailureAnalyzer}.

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/util/LambdaSafeTests.java
View File

@ -29,7 +29,7 @@ import org.springframework.boot.util.LambdaSafe.InvocationResult;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.junit.jupiter.api.Assertions.fail; import static org.assertj.core.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.contains; import static org.mockito.ArgumentMatchers.contains;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
View File

@ -149,7 +149,7 @@ import static org.assertj.core.api.Assertions.assertThatIOException;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.fail; import static org.assertj.core.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.then; import static org.mockito.BDDMockito.then;

2
src/checkstyle/checkstyle.xml
View File

@ -32,7 +32,7 @@
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="maximum" value="0"/> <property name="maximum" value="0"/>
<property name="format" value="org\.junit\.Assert\.assert" /> <property name="format" value="org\.junit\.Assert|org\.junit\.jupiter\.api\.Assertions" />
<property name="message" <property name="message"
value="Please use AssertJ imports." /> value="Please use AssertJ imports." />
<property name="ignoreComments" value="true" /> <property name="ignoreComments" value="true" />