From fcd60b269e43172f7a88a0ba0a7ced4fefd0a17a Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 27 Feb 2015 19:26:17 +0100 Subject: [PATCH] Polish ScheduledTaskRegistrar(Tests) --- .../scheduling/config/ScheduledTaskRegistrar.java | 14 +++++++------- .../config/ScheduledTaskRegistrarTests.java | 7 +++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java index 671a79bd9ff..e3dde1e3d6a 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java @@ -126,7 +126,7 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean } /** - * Return the trigger tasks as a list of {@link TriggerTask} + * Get the trigger tasks as an unmodifiable list of {@link TriggerTask} objects. * @since 4.2 */ public List getTriggerTaskList() { @@ -155,7 +155,7 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean } /** - * Return the cron tasks as a list of {@link CronTask} + * Get the cron tasks as an unmodifiable list of {@link CronTask} objects. * @since 4.2 */ public List getCronTaskList() { @@ -184,7 +184,7 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean } /** - * Return the fixed-rate tasks as a list of {@link IntervalTask}. + * Get the fixed-rate tasks as an unmodifiable list of {@link IntervalTask} objects. * @since 4.2 */ public List getFixedRateTaskList() { @@ -213,7 +213,7 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean } /** - * Return the fixed-delay tasks as a list of {@link IntervalTask} + * Get the fixed-delay tasks as an unmodifiable list of {@link IntervalTask} objects. * @since 4.2 */ public List getFixedDelayTaskList() { @@ -259,11 +259,11 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean } /** - * Add a Runnable task to be triggered at the given fixed-rate period. + * Add a {@code Runnable} task to be triggered at the given fixed-rate interval. * @see TaskScheduler#scheduleAtFixedRate(Runnable, long) */ - public void addFixedRateTask(Runnable task, long period) { - this.addFixedRateTask(new IntervalTask(task, period, 0)); + public void addFixedRateTask(Runnable task, long interval) { + this.addFixedRateTask(new IntervalTask(task, interval, 0)); } /** diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTests.java index 48145f6dc2b..160a6283f6c 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTests.java @@ -25,7 +25,10 @@ import static org.junit.Assert.*; import static org.mockito.Mockito.*; /** + * Unit tests for {@link ScheduledTaskRegistrar}. + * * @author Tobias Montagna-Hay + * @since 4.2 */ public class ScheduledTaskRegistrarTests { @@ -52,7 +55,7 @@ public class ScheduledTaskRegistrarTests { } @Test - public void testGetFixedRateTasks() { + public void getFixedRateTasks() { IntervalTask mockFixedRateTask = mock(IntervalTask.class); List fixedRateTaskList = Collections.singletonList(mockFixedRateTask); this.taskRegistrar.setFixedRateTasksList(fixedRateTaskList); @@ -62,7 +65,7 @@ public class ScheduledTaskRegistrarTests { } @Test - public void testGetFixedDelayTasks() { + public void getFixedDelayTasks() { IntervalTask mockFixedDelayTask = mock(IntervalTask.class); List fixedDelayTaskList = Collections.singletonList(mockFixedDelayTask); this.taskRegistrar.setFixedDelayTasksList(fixedDelayTaskList);