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

Fix use of deprecated Cassandra properties in integration tests 

Closes gh-25148
This commit is contained in:
Stephane Nicoll 2021-02-10 15:10:33 +01:00
parent b2258b8d62
commit 1524793a92
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -59,8 +59,8 @@ class CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests {
.withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class)).withPropertyValues( .withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class)).withPropertyValues(
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":" "spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
+ cassandra.getFirstMappedPort(), + cassandra.getFirstMappedPort(),
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.read-timeout=20s", "spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s",
"spring.data.cassandra.connect-timeout=10s"); "spring.data.cassandra.connection.init-query-timeout=10s");
@Test @Test
void authenticationWithValidUsernameAndPassword() { void authenticationWithValidUsernameAndPassword() {

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -58,8 +58,8 @@ class CassandraDataAutoConfigurationIntegrationTests {
.withPropertyValues( .withPropertyValues(
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":" "spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
+ cassandra.getFirstMappedPort(), + cassandra.getFirstMappedPort(),
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.read-timeout=20s", "spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s",
"spring.data.cassandra.connect-timeout=10s") "spring.data.cassandra.connection.init-query-timeout=10s")
.withInitializer((context) -> AutoConfigurationPackages.register((BeanDefinitionRegistry) context, .withInitializer((context) -> AutoConfigurationPackages.register((BeanDefinitionRegistry) context,
City.class.getPackage().getName())); City.class.getPackage().getName()));