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

Protect tests against unstable toString ordering 

See gh-34747
This commit is contained in:
Andy Wilkinson 2023-04-17 10:27:56 +01:00
parent 3657f73b9a
commit 3a01759a3b
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilderTests.java
View File

@ -20,6 +20,7 @@ import java.util.Collections;
import java.util.Map;
import io.r2dbc.spi.ConnectionFactoryOptions;
import io.r2dbc.spi.Option;
import org.junit.jupiter.api.Test;
import org.springframework.boot.docker.compose.core.ConnectionPorts;
@ -52,16 +53,29 @@ class ConnectionFactoryOptionsBuilderTests {
void buildBuildsOptions() {
RunningService service = mockService(456);
ConnectionFactoryOptions options = this.builder.build(service, "mydb", "user", "pass");
assertThat(options).hasToString(
"ConnectionFactoryOptions{options={database=mydb, host=myhost, driver=mydb, password=REDACTED, port=456, user=user}}");
assertThat(options).isEqualTo(ConnectionFactoryOptions.builder()
.option(ConnectionFactoryOptions.DATABASE, "mydb")
.option(ConnectionFactoryOptions.HOST, "myhost")
.option(ConnectionFactoryOptions.PORT, 456)
.option(ConnectionFactoryOptions.DRIVER, "mydb")
.option(ConnectionFactoryOptions.PASSWORD, "pass")
.option(ConnectionFactoryOptions.USER, "user")
.build());
}
@Test
void buildWhenHasParamsLabelBuildsOptions() {
RunningService service = mockService(456, Map.of("org.springframework.boot.r2dbc.parameters", "foo=bar"));
ConnectionFactoryOptions options = this.builder.build(service, "mydb", "user", "pass");
assertThat(options).hasToString(
"ConnectionFactoryOptions{options={foo=bar, database=mydb, host=myhost, driver=mydb, password=REDACTED, port=456, user=user}}");
assertThat(options).isEqualTo(ConnectionFactoryOptions.builder()
.option(ConnectionFactoryOptions.DATABASE, "mydb")
.option(ConnectionFactoryOptions.HOST, "myhost")
.option(ConnectionFactoryOptions.PORT, 456)
.option(ConnectionFactoryOptions.DRIVER, "mydb")
.option(ConnectionFactoryOptions.PASSWORD, "pass")
.option(ConnectionFactoryOptions.USER, "user")
.option(Option.valueOf("foo"), "bar")
.build());
}
@Test