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

Merge branch '6.0.x'

Browse Source
This commit is contained in:
Sébastien Deleuze
2023-07-08 11:11:37 +02:00
parent bf99361abb b3de1b8e95
commit 8fb412ea74
27 changed files with 81 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-core/src/test/kotlin/org/springframework/aot/hint/KotlinBindingReflectionHintsRegistrarTests.kt → spring-core/src/test/kotlin/org/springframework/aot/hint/BindingReflectionHintsRegistrarKotlinTests.kt
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 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.
@@ -27,7 +27,7 @@ import java.lang.reflect.Method
*
* @author Sebastien Deleuze
*/
class KotlinBindingReflectionHintsRegistrarTests {
class BindingReflectionHintsRegistrarKotlinTests {
private val bindingRegistrar = BindingReflectionHintsRegistrar()

2
spring-core/src/test/kotlin/org/springframework/core/AbstractKotlinReflectionParameterNameDiscovererTests.kt → spring-core/src/test/kotlin/org/springframework/core/AbstractReflectionParameterNameDiscovererKotlinTests.kt
View File

@@ -27,7 +27,7 @@ import org.springframework.util.ReflectionUtils
* @author Sebastien Deleuze
*/
@Suppress("UNUSED_PARAMETER")
abstract class AbstractKotlinReflectionParameterNameDiscovererTests(protected val parameterNameDiscoverer: ParameterNameDiscoverer) {
abstract class AbstractReflectionParameterNameDiscovererKotlinTests(protected val parameterNameDiscoverer: ParameterNameDiscoverer) {
@Test
fun getParameterNamesOnInterface() {

9
spring-core/src/test/kotlin/org/springframework/core/KotlinBridgeMethodResolverTests.kt → spring-core/src/test/kotlin/org/springframework/core/BridgeMethodResolverKotlinTests.kt
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 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.
@@ -19,7 +19,12 @@ package org.springframework.core
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
class KotlinBridgeMethodResolverTests {
/**
* Kotlin tests for [BridgeMethodResolver].
*
* @author Sebastien Deleuzes
*/
class BridgeMethodResolverKotlinTests {
@Test
fun findBridgedMethod() {

21
spring-core/src/test/kotlin/org/springframework/core/KotlinCoroutinesUtilsTests.kt → spring-core/src/test/kotlin/org/springframework/core/CoroutinesUtilsTests.kt
View File

@@ -28,7 +28,12 @@ import reactor.test.StepVerifier
import kotlin.coroutines.Continuation
import kotlin.coroutines.coroutineContext
class KotlinCoroutinesUtilsTests {
/**
* Kotlin tests for [CoroutinesUtils].
*
* @author Sebastien Deleuze
*/
class CoroutinesUtilsTests {
@Test
fun deferredToMono() {
@@ -56,7 +61,7 @@ class KotlinCoroutinesUtilsTests {
@Test
fun invokeSuspendingFunctionWithNullContinuationParameter() {
val method = KotlinCoroutinesUtilsTests::class.java.getDeclaredMethod("suspendingFunction", String::class.java, Continuation::class.java)
val method = CoroutinesUtilsTests::class.java.getDeclaredMethod("suspendingFunction", String::class.java, Continuation::class.java)
val publisher = CoroutinesUtils.invokeSuspendingFunction(method, this, "foo", null)
Assertions.assertThat(publisher).isInstanceOf(Mono::class.java)
StepVerifier.create(publisher)
@@ -67,7 +72,7 @@ class KotlinCoroutinesUtilsTests {
@Test
fun invokeSuspendingFunctionWithoutContinuationParameter() {
val method = KotlinCoroutinesUtilsTests::class.java.getDeclaredMethod("suspendingFunction", String::class.java, Continuation::class.java)
val method = CoroutinesUtilsTests::class.java.getDeclaredMethod("suspendingFunction", String::class.java, Continuation::class.java)
val publisher = CoroutinesUtils.invokeSuspendingFunction(method, this, "foo")
Assertions.assertThat(publisher).isInstanceOf(Mono::class.java)
StepVerifier.create(publisher)
@@ -78,13 +83,13 @@ class KotlinCoroutinesUtilsTests {
@Test
fun invokeNonSuspendingFunction() {
val method = KotlinCoroutinesUtilsTests::class.java.getDeclaredMethod("nonSuspendingFunction", String::class.java)
val method = CoroutinesUtilsTests::class.java.getDeclaredMethod("nonSuspendingFunction", String::class.java)
Assertions.assertThatIllegalArgumentException().isThrownBy { CoroutinesUtils.invokeSuspendingFunction(method, this, "foo") }
}
@Test
fun invokeSuspendingFunctionWithFlow() {
val method = KotlinCoroutinesUtilsTests::class.java.getDeclaredMethod("suspendingFunctionWithFlow", Continuation::class.java)
val method = CoroutinesUtilsTests::class.java.getDeclaredMethod("suspendingFunctionWithFlow", Continuation::class.java)
val publisher = CoroutinesUtils.invokeSuspendingFunction(method, this)
Assertions.assertThat(publisher).isInstanceOf(Flux::class.java)
StepVerifier.create(publisher)
@@ -96,7 +101,7 @@ class KotlinCoroutinesUtilsTests {
@Test
fun invokeSuspendingFunctionWithNullContinuationParameterAndContext() {
val method = KotlinCoroutinesUtilsTests::class.java.getDeclaredMethod("suspendingFunctionWithContext", String::class.java, Continuation::class.java)
val method = CoroutinesUtilsTests::class.java.getDeclaredMethod("suspendingFunctionWithContext", String::class.java, Continuation::class.java)
val context = CoroutineName("name")
val mono = CoroutinesUtils.invokeSuspendingFunction(context, method, this, "foo", null) as Mono
runBlocking {
@@ -106,7 +111,7 @@ class KotlinCoroutinesUtilsTests {
@Test
fun invokeSuspendingFunctionWithoutContinuationParameterAndContext() {
val method = KotlinCoroutinesUtilsTests::class.java.getDeclaredMethod("suspendingFunctionWithContext", String::class.java, Continuation::class.java)
val method = CoroutinesUtilsTests::class.java.getDeclaredMethod("suspendingFunctionWithContext", String::class.java, Continuation::class.java)
val context = CoroutineName("name")
val mono = CoroutinesUtils.invokeSuspendingFunction(context, method, this, "foo") as Mono
runBlocking {
@@ -116,7 +121,7 @@ class KotlinCoroutinesUtilsTests {
@Test
fun invokeNonSuspendingFunctionWithContext() {
val method = KotlinCoroutinesUtilsTests::class.java.getDeclaredMethod("nonSuspendingFunction", String::class.java)
val method = CoroutinesUtilsTests::class.java.getDeclaredMethod("nonSuspendingFunction", String::class.java)
val context = CoroutineName("name")
Assertions.assertThatIllegalArgumentException().isThrownBy { CoroutinesUtils.invokeSuspendingFunction(context, method, this, "foo") }
}

4
spring-core/src/test/kotlin/org/springframework/core/KotlinDefaultParameterNameDiscovererTests.kt → spring-core/src/test/kotlin/org/springframework/core/DefaultParameterNameDiscovererKotlinTests.kt
View File

@@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test
*
* @author Sebastien Deleuze
*/
class KotlinDefaultParameterNameDiscovererTests :
AbstractKotlinReflectionParameterNameDiscovererTests(DefaultParameterNameDiscoverer()){
class DefaultParameterNameDiscovererKotlinTests :
AbstractReflectionParameterNameDiscovererKotlinTests(DefaultParameterNameDiscoverer()){
enum class MyEnum {
ONE, TWO

4
spring-core/src/test/kotlin/org/springframework/core/KotlinGenericTypeResolverTests.kt → spring-core/src/test/kotlin/org/springframework/core/GenericTypeResolverKotlinTests.kt
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 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.
@@ -27,7 +27,7 @@ import java.lang.reflect.Method
* @author Konrad Kaminski
* @author Sebastien Deleuze
*/
class KotlinGenericTypeResolverTests {
class GenericTypeResolverKotlinTests {
@Test
fun methodReturnTypes() {

2
spring-core/src/test/kotlin/org/springframework/core/KotlinReflectionParameterNameDiscovererTests.kt
View File

@@ -22,4 +22,4 @@ package org.springframework.core
* @author Sebastien Deleuze
*/
class KotlinReflectionParameterNameDiscovererTests :
AbstractKotlinReflectionParameterNameDiscovererTests(KotlinReflectionParameterNameDiscoverer())
AbstractReflectionParameterNameDiscovererKotlinTests(KotlinReflectionParameterNameDiscoverer())

6
spring-core/src/test/kotlin/org/springframework/core/KotlinMethodParameterTests.kt → spring-core/src/test/kotlin/org/springframework/core/MethodParameterKotlinTests.kt
View File

@@ -32,7 +32,7 @@ import kotlin.reflect.jvm.javaMethod
* @author Juergen Hoeller
* @author Konrad Kaminski
*/
class KotlinMethodParameterTests {
class MethodParameterKotlinTests {
private val nullableMethod: Method = javaClass.getMethod("nullable", String::class.java)
@@ -40,10 +40,10 @@ class KotlinMethodParameterTests {
private val withDefaultValueMethod: Method = javaClass.getMethod("withDefaultValue", String::class.java)
private val innerClassConstructor = InnerClass::class.java.getConstructor(KotlinMethodParameterTests::class.java)
private val innerClassConstructor = InnerClass::class.java.getConstructor(MethodParameterKotlinTests::class.java)
private val innerClassWithParametersConstructor = InnerClassWithParameter::class.java
.getConstructor(KotlinMethodParameterTests::class.java, String::class.java, String::class.java)
.getConstructor(MethodParameterKotlinTests::class.java, String::class.java, String::class.java)
private val regularClassConstructor = RegularClass::class.java.getConstructor(String::class.java, String::class.java)

9
spring-core/src/test/kotlin/org/springframework/core/KotlinReactiveAdapterRegistryTests.kt → spring-core/src/test/kotlin/org/springframework/core/ReactiveAdapterRegistryKotlinTests.kt
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 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.
@@ -33,8 +33,13 @@ import reactor.test.StepVerifier
import java.time.Duration
import kotlin.reflect.KClass
/**
* Kotlin tests for [ReactiveAdapterRegistry].
*
* @author Sebastien Deleuze
*/
@OptIn(DelicateCoroutinesApi::class)
class KotlinReactiveAdapterRegistryTests {
class ReactiveAdapterRegistryKotlinTests {
private val registry = ReactiveAdapterRegistry.getSharedInstance()

4
spring-core/src/test/kotlin/org/springframework/core/env/KotlinPropertyResolverExtensionsTests.kt → spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsKotlinTests.kt vendored
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.
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test
* @author Sebastien Deleuze
*/
@Disabled
class KotlinPropertyResolverExtensionsTests {
class PropertyResolverExtensionsKotlinTests {
val propertyResolver = mockk<PropertyResolver>()

8
spring-core/src/test/kotlin/org/springframework/core/io/support/KotlinSpringFactoriesLoaderTests.kt → spring-core/src/test/kotlin/org/springframework/core/io/support/SpringFactoriesLoaderKotlinTests.kt
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 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.
@@ -22,12 +22,12 @@ import org.junit.jupiter.api.Test
import org.springframework.core.io.support.SpringFactoriesLoader.ArgumentResolver
/**
* Kotlin tests for {@link SpringFactoriesLoader}.
* Kotlin tests for [SpringFactoriesLoader].
*
* @author Phillip Webb
*/
@Suppress("unused", "UNUSED_PARAMETER", "PLATFORM_CLASS_MAPPED_TO_KOTLIN")
class KotlinSpringFactoriesLoaderTests {
@Suppress("unused", "PLATFORM_CLASS_MAPPED_TO_KOTLIN")
class SpringFactoriesLoaderKotlinTests {
@Test
fun `Instantiate immutable data class`() {