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

Merge branch '3.1.x'

Browse Source 
Closes gh-38728
This commit is contained in:
Moritz Halbritter
2023-12-11 09:44:19 +01:00
parent cc665dd529 52baf0003b
commit 6330190913
22 changed files with 34 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-test/src/test/kotlin/org/springframework/boot/test/context/KotlinApplicationWithMainThrowingException.kt
View File

@@ -4,8 +4,7 @@ import org.springframework.boot.SpringBootConfiguration
import org.springframework.boot.runApplication
@SpringBootConfiguration(proxyBeanMethods = false)
open class KotlinApplicationWithMainThrowingException {
}
open class KotlinApplicationWithMainThrowingException
fun main(args: Array<String>) {
runApplication<KotlinApplicationWithMainThrowingException>(*args)

2
spring-boot-project/spring-boot-test/src/test/kotlin/org/springframework/boot/test/context/SpringBootContextLoaderKotlinTests.kt
View File

@@ -18,9 +18,7 @@ package org.springframework.boot.test.context
import org.assertj.core.api.Assertions.assertThatIllegalStateException
import org.junit.jupiter.api.Test
import org.springframework.boot.SpringBootConfiguration
import org.springframework.boot.test.context.SpringBootTest.UseMainMethod
import org.springframework.context.annotation.Configuration
import org.springframework.test.context.TestContext
import org.springframework.test.context.TestContextManager