mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '2.5.x' into 2.6.x
Closes gh-30164
This commit is contained in:
commit
6bbf3aff0e
@ -49,9 +49,10 @@ class CassandraAutoConfigurationIntegrationTests {
|
||||
.withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class)).withPropertyValues(
|
||||
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
|
||||
+ cassandra.getFirstMappedPort(),
|
||||
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s",
|
||||
"spring.data.cassandra.connection.init-query-timeout=20s",
|
||||
"spring.data.cassandra.request.timeout=20s");
|
||||
"spring.data.cassandra.local-datacenter=datacenter1",
|
||||
"spring.data.cassandra.connection.connect-timeout=60s",
|
||||
"spring.data.cassandra.connection.init-query-timeout=60s",
|
||||
"spring.data.cassandra.request.timeout=60s");
|
||||
|
||||
@Test
|
||||
void whenTheContextIsClosedThenTheDriverConfigLoaderIsClosed() {
|
||||
|
@ -58,8 +58,10 @@ class CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests {
|
||||
.withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class)).withPropertyValues(
|
||||
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
|
||||
+ cassandra.getFirstMappedPort(),
|
||||
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s",
|
||||
"spring.data.cassandra.connection.init-query-timeout=10s");
|
||||
"spring.data.cassandra.local-datacenter=datacenter1",
|
||||
"spring.data.cassandra.connection.connect-timeout=60s",
|
||||
"spring.data.cassandra.connection.init-query-timeout=60s",
|
||||
"spring.data.cassandra.request.timeout=60s");
|
||||
|
||||
@Test
|
||||
void authenticationWithValidUsernameAndPassword() {
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2021 the original author or authors.
|
||||
* Copyright 2012-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.
|
||||
@ -54,9 +54,10 @@ class CassandraDataAutoConfigurationIntegrationTests {
|
||||
.withPropertyValues(
|
||||
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
|
||||
+ cassandra.getFirstMappedPort(),
|
||||
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s",
|
||||
"spring.data.cassandra.connection.init-query-timeout=20s",
|
||||
"spring.data.cassandra.request.timeout=20s")
|
||||
"spring.data.cassandra.local-datacenter=datacenter1",
|
||||
"spring.data.cassandra.connection.connect-timeout=60s",
|
||||
"spring.data.cassandra.connection.init-query-timeout=60s",
|
||||
"spring.data.cassandra.request.timeout=60s")
|
||||
.withInitializer((context) -> AutoConfigurationPackages.register((BeanDefinitionRegistry) context,
|
||||
City.class.getPackage().getName()));
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2021 the original author or authors.
|
||||
* Copyright 2012-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.
|
||||
@ -45,8 +45,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
|
||||
*/
|
||||
@DataCassandraTest(properties = { "spring.data.cassandra.local-datacenter=datacenter1",
|
||||
"spring.data.cassandra.schema-action=create-if-not-exists",
|
||||
"spring.data.cassandra.connection.connect-timeout=20s",
|
||||
"spring.data.cassandra.connection.init-query-timeout=20s", "spring.data.cassandra.request.timeout=20s" })
|
||||
"spring.data.cassandra.connection.connect-timeout=60s",
|
||||
"spring.data.cassandra.connection.init-query-timeout=60s", "spring.data.cassandra.request.timeout=60s" })
|
||||
@Testcontainers(disabledWithoutDocker = true)
|
||||
class DataCassandraTestIntegrationTests {
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2021 the original author or authors.
|
||||
* Copyright 2012-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.
|
||||
@ -44,9 +44,9 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
@DataCassandraTest(includeFilters = @Filter(Service.class),
|
||||
properties = { "spring.data.cassandra.local-datacenter=datacenter1",
|
||||
"spring.data.cassandra.schema-action=create-if-not-exists",
|
||||
"spring.data.cassandra.connection.connect-timeout=20s",
|
||||
"spring.data.cassandra.connection.init-query-timeout=20s",
|
||||
"spring.data.cassandra.request.timeout=20s" })
|
||||
"spring.data.cassandra.connection.connect-timeout=60s",
|
||||
"spring.data.cassandra.connection.init-query-timeout=60s",
|
||||
"spring.data.cassandra.request.timeout=60s" })
|
||||
@Testcontainers(disabledWithoutDocker = true)
|
||||
class DataCassandraTestWithIncludeFilterIntegrationTests {
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user