diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java index 0a66101e87..5a509c449f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java @@ -21,10 +21,10 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.integration.scheduling.PollerMetadata; +import org.springframework.integration.test.util.TestUtils; import org.springframework.scheduling.Trigger; import org.springframework.scheduling.support.CronTrigger; import org.springframework.test.context.ContextConfiguration; @@ -47,10 +47,7 @@ public class CronTriggerParserTests { PollerMetadata metadata = (PollerMetadata) poller; Trigger trigger = metadata.getTrigger(); assertThat(trigger.getClass()).isEqualTo(CronTrigger.class); - DirectFieldAccessor accessor = new DirectFieldAccessor(trigger); - String expression = (String) new DirectFieldAccessor( - accessor.getPropertyValue("sequenceGenerator")) - .getPropertyValue("expression"); + String expression = TestUtils.getPropertyValue(trigger, "expression.expression", String.class); assertThat(expression).isEqualTo("*/10 * 9-17 * * MON-FRI"); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterExpressionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterExpressionTests.java index c3ce9c6a19..0b21a52c4f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterExpressionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterExpressionTests.java @@ -91,8 +91,7 @@ public class InboundChannelAdapterExpressionTests { DirectFieldAccessor adapterAccessor = new DirectFieldAccessor(adapter); Trigger trigger = TestUtils.getPropertyValue(adapter, "trigger", Trigger.class); assertThat(trigger.getClass()).isEqualTo(CronTrigger.class); - assertThat(new DirectFieldAccessor(new DirectFieldAccessor( - trigger).getPropertyValue("sequenceGenerator")).getPropertyValue("expression")) + assertThat(TestUtils.getPropertyValue(trigger, "expression.expression")) .isEqualTo("7 6 5 4 3 ?"); assertThat(adapterAccessor.getPropertyValue("outputChannel")).isEqualTo(this.context.getBean("cronChannel")); Expression expression = TestUtils.getPropertyValue(adapter, "source.expression", Expression.class); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java index e54a578223..f92b6848ef 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2020 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.