Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate from ExpectedException rule to AssertJ

Browse Source 
Replace ExpectedException JUnit rules with AssertJ exception
assertions.

Closes gh-14336
This commit is contained in:
Phillip Webb
2018-10-01 11:18:16 -07:00
parent 42cb0effc4
commit d76bba5e6f
273 changed files with 2752 additions and 3624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/checkstyle/checkstyle.xml
View File

@@ -9,7 +9,7 @@
<property name="illegalPkgs"
value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|lang|lang3|logging|pool2).*, ^com\.google\.common.*, ^org\.flywaydb\.core\.internal.*" />
<property name="illegalClasses"
value="^reactor\.core\.support\.Assert" />
value="^reactor\.core\.support\.Assert, ^org\.junit\.rules\.ExpectedException" />
</module>
<module
name="com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck">
@@ -17,5 +17,14 @@
value="${main.basedir}/src/checkstyle/import-control.xml" />
<property name="path" value="^.*[\\/]src[\\/]main[\\/].*$" />
</module>
<module
name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="maximum" value="0" />
<property name="format"
value="assertThatExceptionOfType\((NullPointerException|IllegalArgumentException|IOException|IllegalStateException)\.class\)" />
<property name="message"
value="Please use specialized AssertJ assertThat*Exception method." />
<property name="ignoreComments" value="true" />
</module>
</module>
</module>