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

Merge branch '6.0.x'

This commit is contained in:
Sam Brannen 2023-08-26 15:28:50 +02:00
parent dac481da43 7598bca799
commit e0c3b1ae1d
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTestNGTests.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");
* you may not use this file except in compliance with the License.
@ -16,7 +16,6 @@
package org.springframework.test.context.junit4;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@ -35,6 +34,7 @@ import org.springframework.test.context.transaction.BeforeTransaction;
import org.springframework.util.ClassUtils;
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>'
@ -92,8 +92,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Test
@Ignore("Fails against TestNG 6.11")
public void runTestAndAssertCounters() throws Exception {
public void runTestAndAssertCounters() {
TrackingTestNGTestListener listener = new TrackingTestNGTestListener();
TestNG testNG = new TestNG();
testNG.addListener(listener);
@ -114,7 +113,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override
public void beforeTestClass(TestContext testContext) {
org.testng.Assert.fail("always failing beforeTestClass()");
fail("always failing beforeTestClass()");
}
}
@ -122,7 +121,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override
public void afterTestClass(TestContext testContext) {
org.testng.Assert.fail("always failing afterTestClass()");
fail("always failing afterTestClass()");
}
}
@ -130,7 +129,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override
public void prepareTestInstance(TestContext testContext) throws Exception {
org.testng.Assert.fail("always failing prepareTestInstance()");
fail("always failing prepareTestInstance()");
}
}
@ -138,7 +137,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override
public void beforeTestMethod(TestContext testContext) {
org.testng.Assert.fail("always failing beforeTestMethod()");
fail("always failing beforeTestMethod()");
}
}
@ -146,7 +145,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override
public void beforeTestExecution(TestContext testContext) {
org.testng.Assert.fail("always failing beforeTestExecution()");
fail("always failing beforeTestExecution()");
}
}
@ -154,7 +153,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override
public void afterTestExecution(TestContext testContext) {
org.testng.Assert.fail("always failing afterTestExecution()");
fail("always failing afterTestExecution()");
}
}
@ -162,7 +161,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@Override
public void afterTestMethod(TestContext testContext) {
org.testng.Assert.fail("always failing afterTestMethod()");
fail("always failing afterTestMethod()");
}
}
@ -212,7 +211,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@BeforeTransaction
public void beforeTransaction() {
org.testng.Assert.fail("always failing beforeTransaction()");
fail("always failing beforeTransaction()");
}
}
@ -225,7 +224,7 @@ public class FailingBeforeAndAfterMethodsTestNGTests {
@AfterTransaction
public void afterTransaction() {
org.testng.Assert.fail("always failing afterTransaction()");
fail("always failing afterTransaction()");
}
}

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

@ -42,7 +42,7 @@ import org.springframework.core.testfixture.io.buffer.AbstractLeakCheckingTests;
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
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
@ -331,7 +331,7 @@ public class Jackson2TokenizerTests extends AbstractLeakCheckingTests {
assertThat(numberType).isEqualTo(JsonParser.NumberType.BIG_DECIMAL);
}
catch (IOException ex) {
fail(ex);
fail(ex.getMessage(), ex);
}
})
.verifyComplete();

6
src/checkstyle/checkstyle.xml
View File

@ -233,14 +233,14 @@
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="id" value="junit4Assertions"/>
<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="ignoreComments" value="true"/>
</module>
<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
<property name="id" value="junitJupiterAssertions"/>
<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="ignoreComments" value="true"/>
</module>
@ -248,7 +248,7 @@
<property name="id" value="testNGAssertions"/>
<property name="maximum" value="0"/>
<!-- 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="ignoreComments" value="true"/>
</module>