More Cron test fixes

Author: garyrussell

spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java

@@ -21,10 +21,10 @@
 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 void checkConfigWithAttribute() {
 		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");
 	}
 

spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterExpressionTests.java

@@ -91,8 +91,7 @@ public void cron() {
 		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);

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.