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

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonDecoderTests.kt
#	spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonEncoderTests.kt
This commit is contained in:
Sam Brannen
2022-10-08 14:06:41 +02:00
parent c98ed17728 1c1a0afbed
commit ae368a20b8
10 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-test/src/test/kotlin/org/springframework/test/context/KotlinDynamicPropertySourceIntegrationTests.kt
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2022 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.
@@ -15,7 +15,7 @@
*/
package org.springframework.test.context
import org.assertj.core.api.Assertions
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.beans.factory.annotation.Value
@@ -36,8 +36,8 @@ class KotlinDynamicPropertySourceIntegrationTests {
@Test
fun hasInjectedValues(@Autowired service: Service) {
Assertions.assertThat(service.ip).isEqualTo("127.0.0.1")
Assertions.assertThat(service.port).isEqualTo(4242)
assertThat(service.ip).isEqualTo("127.0.0.1")
assertThat(service.port).isEqualTo(4242)
}
@Configuration