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

Revise Checkstyle rules to prohibit use of assertions other than AssertJ 

Closes gh-31116
This commit is contained in:
Sam Brannen 2023-08-26 15:28:25 +02:00
parent f9588de247
commit 7598bca799
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.java
View File

@ -34,6 +34,7 @@ import org.springframework.test.context.transaction.BeforeTransaction;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
/** /**
* Integration tests which verify that '<i>before</i>' and '<i>after</i>' * Integration tests which verify that '<i>before</i>' and '<i>after</i>'
@ -112,7 +113,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override @Override
public void beforeTestClass(TestContext testContext) { public void beforeTestClass(TestContext testContext) {
org.testng.Assert.fail("always failing beforeTestClass()"); fail("always failing beforeTestClass()");
} }
} }
@ -120,7 +121,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override @Override
public void afterTestClass(TestContext testContext) { public void afterTestClass(TestContext testContext) {
org.testng.Assert.fail("always failing afterTestClass()"); fail("always failing afterTestClass()");
} }
} }
@ -128,7 +129,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override @Override
public void prepareTestInstance(TestContext testContext) throws Exception { public void prepareTestInstance(TestContext testContext) throws Exception {
org.testng.Assert.fail("always failing prepareTestInstance()"); fail("always failing prepareTestInstance()");
} }
} }
@ -136,7 +137,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override @Override
public void beforeTestMethod(TestContext testContext) { public void beforeTestMethod(TestContext testContext) {
org.testng.Assert.fail("always failing beforeTestMethod()"); fail("always failing beforeTestMethod()");
} }
} }
@ -144,7 +145,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override @Override
public void beforeTestExecution(TestContext testContext) { public void beforeTestExecution(TestContext testContext) {
org.testng.Assert.fail("always failing beforeTestExecution()"); fail("always failing beforeTestExecution()");
} }
} }
@ -152,7 +153,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override @Override
public void afterTestExecution(TestContext testContext) { public void afterTestExecution(TestContext testContext) {
org.testng.Assert.fail("always failing afterTestExecution()"); fail("always failing afterTestExecution()");
} }
} }
@ -160,7 +161,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override @Override
public void afterTestMethod(TestContext testContext) { public void afterTestMethod(TestContext testContext) {
org.testng.Assert.fail("always failing afterTestMethod()"); fail("always failing afterTestMethod()");
} }
} }
@ -210,7 +211,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@BeforeTransaction @BeforeTransaction
public void beforeTransaction() { public void beforeTransaction() {
org.testng.Assert.fail("always failing beforeTransaction()"); fail("always failing beforeTransaction()");
} }
} }
@ -223,7 +224,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@AfterTransaction @AfterTransaction
public void afterTransaction() { public void afterTransaction() {
org.testng.Assert.fail("always failing afterTransaction()"); fail("always failing afterTransaction()");
} }
} }

6
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -44,7 +44,7 @@ import org.springframework.core.testfixture.io.buffer.AbstractLeakCheckingTests;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static java.util.Collections.singletonList; import static java.util.Collections.singletonList;
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;
/** /**
* @author Arjen Poutsma * @author Arjen Poutsma
@ -339,7 +339,7 @@ public class Jackson2TokenizerTests extends AbstractLeakCheckingTests {
} }
} }
catch (IOException ex) { catch (IOException ex) {
fail(ex); fail(ex.getMessage(), ex);
} }
}) })
.verifyComplete(); .verifyComplete();

6
src/checkstyle/checkstyle.xml
View File

@ -233,14 +233,14 @@
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="id" value="junit4Assertions"/> <property name="id" value="junit4Assertions"/>
<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"/>
<property name="message" value="Please use AssertJ assertions."/> <property name="message" value="Please use AssertJ assertions."/>
<property name="ignoreComments" value="true"/> <property name="ignoreComments" value="true"/>
</module> </module>
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck"> <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="id" value="junitJupiterAssertions"/> <property name="id" value="junitJupiterAssertions"/>
<property name="maximum" value="0"/> <property name="maximum" value="0"/>
<property name="format" value="org\.junit\.jupiter\.api\.Assertions\.assert"/> <property name="format" value="org\.junit\.jupiter\.api\.Assertions"/>
<property name="message" value="Please use AssertJ assertions."/> <property name="message" value="Please use AssertJ assertions."/>
<property name="ignoreComments" value="true"/> <property name="ignoreComments" value="true"/>
</module> </module>
@ -248,7 +248,7 @@
<property name="id" value="testNGAssertions"/> <property name="id" value="testNGAssertions"/>
<property name="maximum" value="0"/> <property name="maximum" value="0"/>
<!-- should cover org.testng.Assert and org.testng.AssertJUnit --> <!-- should cover org.testng.Assert and org.testng.AssertJUnit -->
<property name="format" value="org\.testng\.Assert(JUnit)?\.assert"/> <property name="format" value="org\.testng\.Assert(JUnit)?"/>
<property name="message" value="Please use AssertJ assertions."/> <property name="message" value="Please use AssertJ assertions."/>
<property name="ignoreComments" value="true"/> <property name="ignoreComments" value="true"/>
</module> </module>