From 6d1be361fe2b61a36eccec25f15124a63191255a Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Thu, 16 Jun 2022 22:06:31 -0500 Subject: [PATCH] Simplify SerdeResolverUtilsTests setting of ineligible-definitions --- .../kafka/streams/SerdeResolverUtilsTests.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/SerdeResolverUtilsTests.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/SerdeResolverUtilsTests.java index 5810c8cb6..49eda7809 100644 --- a/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/SerdeResolverUtilsTests.java +++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/SerdeResolverUtilsTests.java @@ -55,7 +55,8 @@ class SerdeResolverUtilsTests { @Nested class ResolveForType { - private ApplicationContextRunner contextRunner = new ApplicationContextRunner(); + private ApplicationContextRunner contextRunner = new ApplicationContextRunner() + .withPropertyValues("spring.cloud.function.ineligible-definitions: sendToDlqAndContinue"); private Serde fallback = mock(Serde.class); @@ -73,7 +74,6 @@ class SerdeResolverUtilsTests { void returnsSerdeBeanForMatchingType() { this.contextRunner .withConfiguration(AutoConfigurations.of(SerdeResolverSimpleTestApp.class)) - .withPropertyValues("spring.cloud.function.ineligible-definitions: sendToDlqAndContinue") .run((context) -> { ResolvableType fooType = ResolvableType.forClass(Foo.class); assertThat(SerdeResolverUtils.resolveForType(context, fooType, fallback)).isInstanceOf(FooSerde.class); @@ -162,9 +162,12 @@ class SerdeResolverUtilsTests { @Nested class BeanNamesForMatchingSerdes { + private ApplicationContextRunner contextRunner = new ApplicationContextRunner() + .withPropertyValues("spring.cloud.function.ineligible-definitions: sendToDlqAndContinue"); + @Test void returnsNoSerdesForWildcardType() { - new ApplicationContextRunner().withUserConfiguration(SerdeResolverSimpleTestApp.class) + this.contextRunner.withUserConfiguration(SerdeResolverSimpleTestApp.class) .run((context) -> { ResolvableType wildcardType = ResolvableType.forClass(Serde.class).getGeneric(0); assertThat(SerdeResolverUtils.beanNamesForMatchingSerdes(context, wildcardType)).isEmpty(); @@ -203,8 +206,7 @@ class SerdeResolverUtilsTests { ResolvableType geWildcard = ResolvableType.forType(new ParameterizedTypeReference>() { }); ResolvableType geRaw = ResolvableType.forRawClass(GenericEvent.class); - new ApplicationContextRunner().withUserConfiguration(SerdeResolverSimpleTestApp.class) - .withPropertyValues("spring.cloud.function.ineligible-definitions: sendToDlqAndContinue") + this.contextRunner.withUserConfiguration(SerdeResolverSimpleTestApp.class) .run((context) -> { assertThat(SerdeResolverUtils.beanNamesForMatchingSerdes(context, geDate)) @@ -275,8 +277,7 @@ class SerdeResolverUtilsTests { ResolvableType geWildcard = ResolvableType.forType(new ParameterizedTypeReference>() { }); ResolvableType geRaw = ResolvableType.forRawClass(GenericEvent.class); - new ApplicationContextRunner().withUserConfiguration(SerdeResolverComplexTestApp.class) - .withPropertyValues("spring.cloud.function.ineligible-definitions: sendToDlqAndContinue") + this.contextRunner.withUserConfiguration(SerdeResolverComplexTestApp.class) .run((context) -> { assertThat(SerdeResolverUtils.beanNamesForMatchingSerdes(context, geFooDate))