From 79208f410f773c9a0b70b6ad3ffdc36e93e183b8 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Wed, 20 Oct 2021 16:16:25 -0700 Subject: [PATCH] Fix tests that depend on previous Spring Boot config issue fixes gh-2042 --- spring-cloud-sleuth-autoconfigure/pom.xml | 6 +++++- .../brave/baggage/CustomPropagationFactoryTests.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/spring-cloud-sleuth-autoconfigure/pom.xml b/spring-cloud-sleuth-autoconfigure/pom.xml index ba19af7b3..f3d00141b 100644 --- a/spring-cloud-sleuth-autoconfigure/pom.xml +++ b/spring-cloud-sleuth-autoconfigure/pom.xml @@ -496,7 +496,11 @@ h2 test - + + io.r2dbc + r2dbc-h2 + test + diff --git a/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/brave/baggage/CustomPropagationFactoryTests.java b/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/brave/baggage/CustomPropagationFactoryTests.java index a408caf8e..5ba137735 100644 --- a/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/brave/baggage/CustomPropagationFactoryTests.java +++ b/spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/brave/baggage/CustomPropagationFactoryTests.java @@ -52,8 +52,8 @@ public class CustomPropagationFactoryTests { new ApplicationContextRunner().withUserConfiguration(CustomConfig.class) .withPropertyValues("spring.sleuth.propagation.type=custom") .withPropertyValues("spring.cloud.gateway.redis.enabled=false") - .withPropertyValues("spring.r2dbc.pool.enabled=true").run(context -> BDDAssertions.then(context) - .hasNotFailed().getBean(CustomConfig.CustomPropagation.class)); + .withPropertyValues("spring.r2dbc.url=r2dbc:proxy:h2:mem:///test").run(context -> BDDAssertions + .then(context).hasNotFailed().getBean(CustomConfig.CustomPropagation.class)); } @Configuration(proxyBeanMethods = false)