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

Upgrade to JUnit Jupiter 5.6 

Closes gh-24299
This commit is contained in:
Sam Brannen 2020-02-13 15:44:58 +01:00
parent d481b81b7e
commit 05301d24c1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -33,7 +33,7 @@ configure(allprojects) { project ->
mavenBom "org.eclipse.jetty:jetty-bom:9.4.26.v20200117" mavenBom "org.eclipse.jetty:jetty-bom:9.4.26.v20200117"
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.3.61" mavenBom "org.jetbrains.kotlin:kotlin-bom:1.3.61"
mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.2" mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.2"
mavenBom "org.junit:junit-bom:5.5.2" mavenBom "org.junit:junit-bom:5.6.0"
} }
dependencies { dependencies {
dependencySet(group: 'org.apache.logging.log4j', version: '2.13.0') { dependencySet(group: 'org.apache.logging.log4j', version: '2.13.0') {
@ -368,7 +368,7 @@ configure([rootProject] + javaProjects) { project ->
"https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.10/", "https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.10/",
"https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/", "https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/",
"https://junit.org/junit4/javadoc/4.12/", "https://junit.org/junit4/javadoc/4.12/",
"https://junit.org/junit5/docs/5.5.2/api/" "https://junit.org/junit5/docs/5.6.0/api/"
] as String[] ] as String[]
} }

4
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/FailingBeforeAndAfterMethodsSpringExtensionTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2020 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.
@ -82,7 +82,7 @@ class FailingBeforeAndAfterMethodsSpringExtensionTests {
Events events = EngineTestKit.engine("junit-jupiter") Events events = EngineTestKit.engine("junit-jupiter")
.selectors(selectClass(testClass)) .selectors(selectClass(testClass))
.execute() .execute()
.tests() .testEvents()
.assertStatistics(stats -> stats .assertStatistics(stats -> stats
.skipped(0) .skipped(0)
.aborted(0) .aborted(0)

4
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/transaction/TimedTransactionalSpringExtensionTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2020 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.
@ -60,7 +60,7 @@ class TimedTransactionalSpringExtensionTests {
Events events = EngineTestKit.engine("junit-jupiter") Events events = EngineTestKit.engine("junit-jupiter")
.selectors(selectClass(TestCase.class)) .selectors(selectClass(TestCase.class))
.execute() .execute()
.tests() .testEvents()
.assertStatistics(stats -> stats.started(4).succeeded(2).failed(2)); .assertStatistics(stats -> stats.started(4).succeeded(2).failed(2));
events.failed().assertThatEvents().haveExactly(2, events.failed().assertThatEvents().haveExactly(2,