diff --git a/spring-beans/src/test/kotlin/org/springframework/beans/KotlinBeanUtilsTests.kt b/spring-beans/src/test/kotlin/org/springframework/beans/BeanUtilsKotlinTests.kt similarity index 99% rename from spring-beans/src/test/kotlin/org/springframework/beans/KotlinBeanUtilsTests.kt rename to spring-beans/src/test/kotlin/org/springframework/beans/BeanUtilsKotlinTests.kt index a9dc7c5158..40ba3cdbf5 100644 --- a/spring-beans/src/test/kotlin/org/springframework/beans/KotlinBeanUtilsTests.kt +++ b/spring-beans/src/test/kotlin/org/springframework/beans/BeanUtilsKotlinTests.kt @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test * @author Sebastien Deleuze */ @Suppress("unused", "UNUSED_PARAMETER") -class KotlinBeanUtilsTests { +class BeanUtilsKotlinTests { @Test fun `Instantiate immutable class`() { diff --git a/spring-beans/src/test/kotlin/org/springframework/beans/factory/annotation/KotlinAutowiredTests.kt b/spring-beans/src/test/kotlin/org/springframework/beans/factory/annotation/AutowiredKotlinTests.kt similarity index 99% rename from spring-beans/src/test/kotlin/org/springframework/beans/factory/annotation/KotlinAutowiredTests.kt rename to spring-beans/src/test/kotlin/org/springframework/beans/factory/annotation/AutowiredKotlinTests.kt index 37d6793cad..3058ecea02 100644 --- a/spring-beans/src/test/kotlin/org/springframework/beans/factory/annotation/KotlinAutowiredTests.kt +++ b/spring-beans/src/test/kotlin/org/springframework/beans/factory/annotation/AutowiredKotlinTests.kt @@ -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. @@ -31,7 +31,7 @@ import org.springframework.beans.testfixture.beans.TestBean * @author Juergen Hoeller * @author Sebastien Deleuze */ -class KotlinAutowiredTests { +class AutowiredKotlinTests { @Test fun `Autowiring with target`() { diff --git a/spring-context/src/test/kotlin/org/springframework/context/annotation/KotlinConfigurationClassTests.kt b/spring-context/src/test/kotlin/org/springframework/context/annotation/ConfigurationClassKotlinTests.kt similarity index 90% rename from spring-context/src/test/kotlin/org/springframework/context/annotation/KotlinConfigurationClassTests.kt rename to spring-context/src/test/kotlin/org/springframework/context/annotation/ConfigurationClassKotlinTests.kt index 72d411e06b..a12e9d7479 100644 --- a/spring-context/src/test/kotlin/org/springframework/context/annotation/KotlinConfigurationClassTests.kt +++ b/spring-context/src/test/kotlin/org/springframework/context/annotation/ConfigurationClassKotlinTests.kt @@ -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. @@ -16,14 +16,18 @@ package org.springframework.context.annotation - import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatExceptionOfType import org.junit.jupiter.api.Test import org.springframework.beans.factory.getBean import org.springframework.beans.factory.parsing.BeanDefinitionParsingException -class KotlinConfigurationClassTests { +/** + * Integration tests for Kotlin configuration classes. + * + * @author Sebastien Deleuze + */ +class ConfigurationClassKotlinTests { @Test fun `Final configuration with default proxyBeanMethods value`() { diff --git a/spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/KotlinBeanValidationBeanRegistrationAotProcessorTests.kt b/spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessorKotlinTests.kt similarity index 98% rename from spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/KotlinBeanValidationBeanRegistrationAotProcessorTests.kt rename to spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessorKotlinTests.kt index 8659a30dcd..c0f063ec3c 100644 --- a/spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/KotlinBeanValidationBeanRegistrationAotProcessorTests.kt +++ b/spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessorKotlinTests.kt @@ -34,7 +34,7 @@ import org.springframework.validation.beanvalidation.BeanValidationBeanRegistrat * * @author Sebastien Deleuze */ -class KotlinBeanValidationBeanRegistrationAotProcessorTests { +class BeanValidationBeanRegistrationAotProcessorKotlinTests { private val processor = BeanValidationBeanRegistrationAotProcessor() diff --git a/spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/KotlinMethodValidationTests.kt b/spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/MethodValidationKotlinTests.kt similarity index 98% rename from spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/KotlinMethodValidationTests.kt rename to spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/MethodValidationKotlinTests.kt index 17991c97f2..b32199e71e 100644 --- a/spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/KotlinMethodValidationTests.kt +++ b/spring-context/src/test/kotlin/org/springframework/validation/beanvalidation/MethodValidationKotlinTests.kt @@ -32,7 +32,7 @@ import org.springframework.validation.annotation.Validated * @author Sebastien Deleuze */ @Suppress("UsePropertyAccessSyntax") -class KotlinMethodValidationTests { +class MethodValidationKotlinTests { @Test fun parameterValidation() { diff --git a/spring-core/src/test/kotlin/org/springframework/aot/hint/KotlinBindingReflectionHintsRegistrarTests.kt b/spring-core/src/test/kotlin/org/springframework/aot/hint/BindingReflectionHintsRegistrarKotlinTests.kt similarity index 97% rename from spring-core/src/test/kotlin/org/springframework/aot/hint/KotlinBindingReflectionHintsRegistrarTests.kt rename to spring-core/src/test/kotlin/org/springframework/aot/hint/BindingReflectionHintsRegistrarKotlinTests.kt index f4d0ff8256..b8e9381867 100644 --- a/spring-core/src/test/kotlin/org/springframework/aot/hint/KotlinBindingReflectionHintsRegistrarTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/aot/hint/BindingReflectionHintsRegistrarKotlinTests.kt @@ -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() diff --git a/spring-core/src/test/kotlin/org/springframework/core/KotlinBridgeMethodResolverTests.kt b/spring-core/src/test/kotlin/org/springframework/core/BridgeMethodResolverKotlinTests.kt similarity index 92% rename from spring-core/src/test/kotlin/org/springframework/core/KotlinBridgeMethodResolverTests.kt rename to spring-core/src/test/kotlin/org/springframework/core/BridgeMethodResolverKotlinTests.kt index 5d4303ab78..bb94dd3867 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/KotlinBridgeMethodResolverTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/BridgeMethodResolverKotlinTests.kt @@ -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() { diff --git a/spring-core/src/test/kotlin/org/springframework/core/KotlinCoroutinesUtilsTests.kt b/spring-core/src/test/kotlin/org/springframework/core/CoroutinesUtilsTests.kt similarity index 79% rename from spring-core/src/test/kotlin/org/springframework/core/KotlinCoroutinesUtilsTests.kt rename to spring-core/src/test/kotlin/org/springframework/core/CoroutinesUtilsTests.kt index e43285f9b1..ad7e4ac5d8 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/KotlinCoroutinesUtilsTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/CoroutinesUtilsTests.kt @@ -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") } } diff --git a/spring-core/src/test/kotlin/org/springframework/core/KotlinDefaultParameterNameDiscovererTests.kt b/spring-core/src/test/kotlin/org/springframework/core/DefaultParameterNameDiscovererKotlinTests.kt similarity index 90% rename from spring-core/src/test/kotlin/org/springframework/core/KotlinDefaultParameterNameDiscovererTests.kt rename to spring-core/src/test/kotlin/org/springframework/core/DefaultParameterNameDiscovererKotlinTests.kt index 7fe1992484..f5fda6eb74 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/KotlinDefaultParameterNameDiscovererTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/DefaultParameterNameDiscovererKotlinTests.kt @@ -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. @@ -19,7 +19,7 @@ package org.springframework.core import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -class KotlinDefaultParameterNameDiscovererTests { +class DefaultParameterNameDiscovererKotlinTests { private val parameterNameDiscoverer = DefaultParameterNameDiscoverer() diff --git a/spring-core/src/test/kotlin/org/springframework/core/KotlinGenericTypeResolverTests.kt b/spring-core/src/test/kotlin/org/springframework/core/GenericTypeResolverKotlinTests.kt similarity index 95% rename from spring-core/src/test/kotlin/org/springframework/core/KotlinGenericTypeResolverTests.kt rename to spring-core/src/test/kotlin/org/springframework/core/GenericTypeResolverKotlinTests.kt index 9780a4f757..99ccec1672 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/KotlinGenericTypeResolverTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/GenericTypeResolverKotlinTests.kt @@ -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() { diff --git a/spring-core/src/test/kotlin/org/springframework/core/KotlinReflectionParameterNameDiscovererTests.kt b/spring-core/src/test/kotlin/org/springframework/core/KotlinReflectionParameterNameDiscovererTests.kt index 55b5ed4772..4c01bbdb91 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/KotlinReflectionParameterNameDiscovererTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/KotlinReflectionParameterNameDiscovererTests.kt @@ -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. @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test import org.springframework.util.ReflectionUtils /** - * Tests for KotlinReflectionParameterNameDiscoverer + * Tests for [KotlinReflectionParameterNameDiscoverer]. */ class KotlinReflectionParameterNameDiscovererTests { diff --git a/spring-core/src/test/kotlin/org/springframework/core/KotlinMethodParameterTests.kt b/spring-core/src/test/kotlin/org/springframework/core/MethodParameterKotlinTests.kt similarity index 97% rename from spring-core/src/test/kotlin/org/springframework/core/KotlinMethodParameterTests.kt rename to spring-core/src/test/kotlin/org/springframework/core/MethodParameterKotlinTests.kt index 419698d2ff..040b294d17 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/KotlinMethodParameterTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/MethodParameterKotlinTests.kt @@ -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. @@ -32,16 +32,16 @@ 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) private val nonNullableMethod = javaClass.getMethod("nonNullable", 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) diff --git a/spring-core/src/test/kotlin/org/springframework/core/KotlinReactiveAdapterRegistryTests.kt b/spring-core/src/test/kotlin/org/springframework/core/ReactiveAdapterRegistryKotlinTests.kt similarity index 93% rename from spring-core/src/test/kotlin/org/springframework/core/KotlinReactiveAdapterRegistryTests.kt rename to spring-core/src/test/kotlin/org/springframework/core/ReactiveAdapterRegistryKotlinTests.kt index d74b6e20e7..b8a6defc15 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/KotlinReactiveAdapterRegistryTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/ReactiveAdapterRegistryKotlinTests.kt @@ -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() diff --git a/spring-core/src/test/kotlin/org/springframework/core/env/KotlinPropertyResolverExtensionsTests.kt b/spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsKotlinTests.kt similarity index 94% rename from spring-core/src/test/kotlin/org/springframework/core/env/KotlinPropertyResolverExtensionsTests.kt rename to spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsKotlinTests.kt index 81534cab4c..776a3d6cf0 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/env/KotlinPropertyResolverExtensionsTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsKotlinTests.kt @@ -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() diff --git a/spring-core/src/test/kotlin/org/springframework/core/io/support/KotlinSpringFactoriesLoaderTests.kt b/spring-core/src/test/kotlin/org/springframework/core/io/support/SpringFactoriesLoaderKotlinTests.kt similarity index 97% rename from spring-core/src/test/kotlin/org/springframework/core/io/support/KotlinSpringFactoriesLoaderTests.kt rename to spring-core/src/test/kotlin/org/springframework/core/io/support/SpringFactoriesLoaderKotlinTests.kt index c06bff9fb3..0638070761 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/io/support/KotlinSpringFactoriesLoaderTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/io/support/SpringFactoriesLoaderKotlinTests.kt @@ -26,8 +26,8 @@ import org.springframework.core.io.support.SpringFactoriesLoader.ArgumentResolve * * @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`() { diff --git a/spring-expression/src/test/kotlin/org/springframework/expression/spel/KotlinSpelReproTests.kt b/spring-expression/src/test/kotlin/org/springframework/expression/spel/SpelReproKotlinTests.kt similarity index 96% rename from spring-expression/src/test/kotlin/org/springframework/expression/spel/KotlinSpelReproTests.kt rename to spring-expression/src/test/kotlin/org/springframework/expression/spel/SpelReproKotlinTests.kt index a15128816d..65260a1ef4 100644 --- a/spring-expression/src/test/kotlin/org/springframework/expression/spel/KotlinSpelReproTests.kt +++ b/spring-expression/src/test/kotlin/org/springframework/expression/spel/SpelReproKotlinTests.kt @@ -22,7 +22,7 @@ import org.springframework.expression.ExpressionParser import org.springframework.expression.spel.standard.SpelExpressionParser import kotlin.coroutines.Continuation -class KotlinSpelReproTests { +class SpelReproKotlinTests { private val parser: ExpressionParser = SpelExpressionParser() @@ -31,7 +31,7 @@ class KotlinSpelReproTests { @Test fun `gh-23812 SpEL cannot invoke Kotlin synthetic classes`() { - val expr = parser.parseExpression("new org.springframework.expression.spel.KotlinSpelReproTests\$Config().kotlinSupplier().invoke()") + val expr = parser.parseExpression("new org.springframework.expression.spel.SpelReproKotlinTests\$Config().kotlinSupplier().invoke()") assertThat(expr.getValue(context)).isEqualTo("test") } diff --git a/spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/KotlinDataClassRowMapperTests.kt b/spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/DataClassRowMapperKotlinTests.kt similarity index 93% rename from spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/KotlinDataClassRowMapperTests.kt rename to spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/DataClassRowMapperKotlinTests.kt index 81b7ae3a50..d15622ca9f 100644 --- a/spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/KotlinDataClassRowMapperTests.kt +++ b/spring-jdbc/src/test/kotlin/org/springframework/jdbc/core/DataClassRowMapperKotlinTests.kt @@ -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,7 +22,7 @@ import org.springframework.jdbc.core.test.ConstructorPerson import java.math.BigDecimal import java.util.* -class KotlinDataClassRowMapperTests : AbstractRowMapperTests() { +class DataClassRowMapperKotlinTests : AbstractRowMapperTests() { @Test fun testStaticQueryWithDataClass() { diff --git a/spring-messaging/src/test/kotlin/org/springframework/messaging/converter/KotlinSerializationJsonMessageConverterTests.kt b/spring-messaging/src/test/kotlin/org/springframework/messaging/converter/KotlinSerializationJsonMessageConverterTests.kt index 875a50529c..458e7a7949 100644 --- a/spring-messaging/src/test/kotlin/org/springframework/messaging/converter/KotlinSerializationJsonMessageConverterTests.kt +++ b/spring-messaging/src/test/kotlin/org/springframework/messaging/converter/KotlinSerializationJsonMessageConverterTests.kt @@ -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. @@ -25,7 +25,6 @@ import org.springframework.messaging.support.MessageBuilder import java.nio.charset.StandardCharsets import kotlin.reflect.typeOf -@Suppress("UsePropertyAccessSyntax") class KotlinSerializationJsonMessageConverterTests { private val converter = KotlinSerializationJsonMessageConverter() diff --git a/spring-test/src/test/kotlin/org/springframework/test/context/KotlinDynamicPropertySourceIntegrationTests.kt b/spring-test/src/test/kotlin/org/springframework/test/context/DynamicPropertySourceKotlinIntegrationTests.kt similarity index 94% rename from spring-test/src/test/kotlin/org/springframework/test/context/KotlinDynamicPropertySourceIntegrationTests.kt rename to spring-test/src/test/kotlin/org/springframework/test/context/DynamicPropertySourceKotlinIntegrationTests.kt index 0e972da175..ee04a0f07e 100644 --- a/spring-test/src/test/kotlin/org/springframework/test/context/KotlinDynamicPropertySourceIntegrationTests.kt +++ b/spring-test/src/test/kotlin/org/springframework/test/context/DynamicPropertySourceKotlinIntegrationTests.kt @@ -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. @@ -32,7 +32,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig * @author Sam Brannen */ @SpringJUnitConfig -class KotlinDynamicPropertySourceIntegrationTests { +class DynamicPropertySourceKotlinIntegrationTests { @Test fun hasInjectedValues(@Autowired service: Service) { diff --git a/spring-web/src/test/kotlin/org/springframework/http/KotlinResponseEntityTests.kt b/spring-web/src/test/kotlin/org/springframework/http/ResponseEntityKotlinTests.kt similarity index 97% rename from spring-web/src/test/kotlin/org/springframework/http/KotlinResponseEntityTests.kt rename to spring-web/src/test/kotlin/org/springframework/http/ResponseEntityKotlinTests.kt index 0658ba2468..dfda75650d 100644 --- a/spring-web/src/test/kotlin/org/springframework/http/KotlinResponseEntityTests.kt +++ b/spring-web/src/test/kotlin/org/springframework/http/ResponseEntityKotlinTests.kt @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test * * @author Sebastien Deleuze */ -class KotlinResponseEntityTests { +class ResponseEntityKotlinTests { @Test fun ofNullable() { diff --git a/spring-web/src/test/kotlin/org/springframework/http/codec/cbor/KotlinSerializationCborEncoderTests.kt b/spring-web/src/test/kotlin/org/springframework/http/codec/cbor/KotlinSerializationCborEncoderTests.kt index e5e27ce1ad..b16dc60ba5 100644 --- a/spring-web/src/test/kotlin/org/springframework/http/codec/cbor/KotlinSerializationCborEncoderTests.kt +++ b/spring-web/src/test/kotlin/org/springframework/http/codec/cbor/KotlinSerializationCborEncoderTests.kt @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 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. @@ -40,7 +40,6 @@ import org.springframework.http.codec.ServerSentEvent * @author Sebastien Deleuze * @author Iain Henderson */ -@Suppress("UsePropertyAccessSyntax") @ExperimentalSerializationApi class KotlinSerializationCborEncoderTests : AbstractEncoderTests(KotlinSerializationCborEncoder()) { diff --git a/spring-web/src/test/kotlin/org/springframework/http/codec/protobuf/KotlinSerializationProtobufDecoderTests.kt b/spring-web/src/test/kotlin/org/springframework/http/codec/protobuf/KotlinSerializationProtobufDecoderTests.kt index 7f15d7c000..146e9752d2 100644 --- a/spring-web/src/test/kotlin/org/springframework/http/codec/protobuf/KotlinSerializationProtobufDecoderTests.kt +++ b/spring-web/src/test/kotlin/org/springframework/http/codec/protobuf/KotlinSerializationProtobufDecoderTests.kt @@ -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. @@ -39,8 +39,8 @@ import reactor.test.StepVerifier.FirstStep * @author Iain Henderson */ @ExperimentalSerializationApi -class KotlinSerializationCborDecoderTests : AbstractDecoderTests(KotlinSerializationProtobufDecoder()) { - @Suppress("UsePropertyAccessSyntax") +class KotlinSerializationProtobufDecoderTests : AbstractDecoderTests(KotlinSerializationProtobufDecoder()) { + @Test override fun canDecode() { for (mimeType in listOf(MediaType.APPLICATION_PROTOBUF, MediaType.APPLICATION_OCTET_STREAM, MediaType("application", "vnd.google.protobuf"))) { diff --git a/spring-web/src/test/kotlin/org/springframework/web/service/invoker/KotlinHttpServiceMethodTests.kt b/spring-web/src/test/kotlin/org/springframework/web/service/invoker/HttpServiceMethodKotlinTests.kt similarity index 98% rename from spring-web/src/test/kotlin/org/springframework/web/service/invoker/KotlinHttpServiceMethodTests.kt rename to spring-web/src/test/kotlin/org/springframework/web/service/invoker/HttpServiceMethodKotlinTests.kt index 3ba9220edf..1fdb1a092e 100644 --- a/spring-web/src/test/kotlin/org/springframework/web/service/invoker/KotlinHttpServiceMethodTests.kt +++ b/spring-web/src/test/kotlin/org/springframework/web/service/invoker/HttpServiceMethodKotlinTests.kt @@ -31,7 +31,7 @@ import org.springframework.web.service.annotation.GetExchange * * @author Sebastien Deleuze */ -class KotlinHttpServiceMethodTests { +class HttpServiceMethodKotlinTests { private val client = TestHttpClientAdapter() private val proxyFactory = HttpServiceProxyFactory.builder(client).build() diff --git a/spring-webflux/src/test/kotlin/org/springframework/web/reactive/function/client/support/KotlinWebClientHttpServiceProxyTests.kt b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/function/client/support/WebClientHttpServiceProxyKotlinTests.kt similarity index 98% rename from spring-webflux/src/test/kotlin/org/springframework/web/reactive/function/client/support/KotlinWebClientHttpServiceProxyTests.kt rename to spring-webflux/src/test/kotlin/org/springframework/web/reactive/function/client/support/WebClientHttpServiceProxyKotlinTests.kt index 6be4d626f3..ac9354cc27 100644 --- a/spring-webflux/src/test/kotlin/org/springframework/web/reactive/function/client/support/KotlinWebClientHttpServiceProxyTests.kt +++ b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/function/client/support/WebClientHttpServiceProxyKotlinTests.kt @@ -40,9 +40,8 @@ import java.util.function.Consumer * * @author DongHyeon Kim * @author Sebastien Deleuze - * */ -class KotlinWebClientHttpServiceProxyTests { +class WebClientHttpServiceProxyKotlinTests { private lateinit var server: MockWebServer diff --git a/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/KotlinInvocableHandlerMethodTests.kt b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/InvocableHandlerMethodKotlinTests.kt similarity index 97% rename from spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/KotlinInvocableHandlerMethodTests.kt rename to spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/InvocableHandlerMethodKotlinTests.kt index 1608a90895..430831b63a 100644 --- a/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/KotlinInvocableHandlerMethodTests.kt +++ b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/InvocableHandlerMethodKotlinTests.kt @@ -37,7 +37,12 @@ import java.lang.reflect.Method import java.time.Duration import kotlin.reflect.jvm.javaMethod -class KotlinInvocableHandlerMethodTests { +/** + * Kotlin unit tests for [InvocableHandlerMethod]. + * + * @author Sebastien Deleuze + */ +class InvocableHandlerMethodKotlinTests { private val exchange = MockServerWebExchange.from(get("http://localhost:8080/path")) diff --git a/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/KotlinMessageWriterResultHandlerTests.kt b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerKotlinTests.kt similarity index 99% rename from spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/KotlinMessageWriterResultHandlerTests.kt rename to spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerKotlinTests.kt index 7744dda14a..20fc9b112c 100644 --- a/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/KotlinMessageWriterResultHandlerTests.kt +++ b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerKotlinTests.kt @@ -44,7 +44,7 @@ import java.util.* * * @author Sebastien Deleuze */ -class KotlinMessageWriterResultHandlerTests { +class MessageWriterResultHandlerKotlinTests { private val resultHandler = initResultHandler()