diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BinderChildContextInitializerTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BinderChildContextInitializerTests.java index 59b709905..8048979ca 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BinderChildContextInitializerTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BinderChildContextInitializerTests.java @@ -76,6 +76,7 @@ class BinderChildContextInitializerTests { ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of(BinderFactoryAutoConfiguration.class, BindingServiceConfiguration.class, FunctionConfiguration.class)) + .withPropertyValues("logging.level.org.springframework", "DEBUG") .withInitializer(new ConfigDataApplicationContextInitializer()) .withConfiguration(UserConfigurations.of(TestFooBinderAppConfiguration.class)); contextRunner.prepare(context -> { diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BindingTargetTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BindingTargetTests.java index e4108f482..6c269eaed 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BindingTargetTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BindingTargetTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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. @@ -19,7 +19,6 @@ package org.springframework.cloud.stream.binder; import java.util.function.Function; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; @@ -28,7 +27,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.PropertySource; import org.springframework.messaging.MessageChannel; -import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; @@ -40,7 +38,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; * @author Janne Valkealahti * @author Soby Chacko */ -@ExtendWith(SpringExtension.class) @SpringBootTest(classes = BindingTargetTests.TestFooChannels.class, properties = {"spring.cloud.stream.default-binder=mock", "spring.cloud.function.definition=process1;process2"}) public class BindingTargetTests { diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SinkBindingWithDefaultsTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SinkBindingWithDefaultsTests.java index c547c1f08..8ce5669c3 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SinkBindingWithDefaultsTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SinkBindingWithDefaultsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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. @@ -19,7 +19,6 @@ package org.springframework.cloud.stream.binder; import java.util.function.Consumer; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +26,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.messaging.MessageChannel; -import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; @@ -39,7 +37,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; * @author Janne Valkealahti * @author Soby Chacko */ -@ExtendWith(SpringExtension.class) @SpringBootTest(classes = SinkBindingWithDefaultsTests.TestSink.class, properties = "spring.cloud.stream.defaultBinder=mock") public class SinkBindingWithDefaultsTests { diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfigurationTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfigurationTests.java index 73fa2a5db..8688b99c1 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfigurationTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfigurationTests.java @@ -20,7 +20,6 @@ import java.util.List; import jakarta.annotation.PostConstruct; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; @@ -38,7 +37,6 @@ import org.springframework.expression.PropertyAccessor; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.json.JsonPropertyAccessor; import org.springframework.integration.test.util.TestUtils; -import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.assertj.core.api.Assertions.assertThat; @@ -49,7 +47,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Artem Bilan * @author Soby Chacko */ -@ExtendWith(SpringExtension.class) @SpringBootTest(classes = SpelExpressionConverterConfigurationTests.Config.class, properties = { "expression: a.b" }) public class SpelExpressionConverterConfigurationTests { diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/partitioning/PartitionedConsumerTest.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/partitioning/PartitionedConsumerTest.java index f38737f28..48f1a669b 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/partitioning/PartitionedConsumerTest.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/partitioning/PartitionedConsumerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2022 the original author or authors. + * Copyright 2015-2023 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. @@ -19,7 +19,6 @@ package org.springframework.cloud.stream.partitioning; import java.util.function.Consumer; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.springframework.beans.factory.annotation.Autowired; @@ -34,7 +33,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource; import org.springframework.messaging.MessageChannel; -import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -48,7 +46,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; * @author Janne Valkealahti * @author Soby Chacko */ -@ExtendWith(SpringExtension.class) @SpringBootTest(classes = PartitionedConsumerTest.TestSink.class, properties = "spring.cloud.stream.default-binder=mock") public class PartitionedConsumerTest {