SPR-7239: fix CronTrigger

Author: David Syer

org.springframework.context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java

@@ -68,7 +68,6 @@ public class CronSequenceGenerator {
 
 	private final TimeZone timeZone;
 
-
 	/**
 	 * Construct a {@link CronSequenceGenerator} from the pattern provided.
 	 * @param expression a space-separated list of time fields
@@ -81,7 +80,6 @@ public CronSequenceGenerator(String expression, TimeZone timeZone) {
 		parse(expression);
 	}
 
-
 	/**
 	 * Get the next {@link Date} in the sequence matching the Cron pattern and
 	 * after the value provided. The return value will have a whole number of
@@ -156,13 +154,13 @@ private void doNext(Calendar calendar) {
 		if (dayOfMonth == updateDayOfMonth) {
 			resets.add(Calendar.DAY_OF_MONTH);
 		} else {
-			doNext(calendar);			
+			doNext(calendar);
 		}
 
 		int month = calendar.get(Calendar.MONTH);
 		int updateMonth = findNext(this.months, month, calendar, Calendar.MONTH, Calendar.YEAR, resets);
 		if (month != updateMonth) {
-			doNext(calendar);			
+			doNext(calendar);
 		}
 
 	}
@@ -314,6 +312,9 @@ private int[] getRange(String field, int max) {
 			result[0] = Integer.valueOf(split[0]);
 			result[1] = Integer.valueOf(split[1]);
 		}
+		if (result[0] >= max || result[1] >= max) {
+			throw new IllegalArgumentException("Range exceeds maximum (" + max + "): " + field);
+		}
 		return result;
 	}
 

org.springframework.context/src/main/java/org/springframework/scheduling/support/CronTrigger.java

@@ -74,5 +74,10 @@ public boolean equals(Object obj) {
 	public int hashCode() {
 		return this.sequenceGenerator.hashCode();
 	}
+	
+	@Override
+	public String toString() {
+		return sequenceGenerator.toString();
+	}
 
 }

org.springframework.context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java

@@ -49,12 +49,12 @@ public CronTriggerTests(Date date, TimeZone timeZone) {
 		this.timeZone = timeZone;
 		this.date = date;
 	}
-	
+
 	@Parameters
 	public static List<Object[]> getParameters() {
 		List<Object[]> list = new ArrayList<Object[]>();
-		list.add(new Object[] {new Date(), TimeZone.getDefault()});
-		list.add(new Object[] {new Date(), TimeZone.getTimeZone("CET")});
+		list.add(new Object[] { new Date(), TimeZone.getDefault() });
+		list.add(new Object[] { new Date(), TimeZone.getTimeZone("CET") });
 		return list;
 	}
 
@@ -66,7 +66,6 @@ private void roundup(Calendar calendar) {
 		calendar.set(Calendar.MILLISECOND, 0);
 	}
 
-
 	@Before
 	public void setUp() {
 		calendar.setTimeZone(timeZone);
@@ -561,6 +560,51 @@ public void testMonthNamesMixedCase() throws Exception {
 		assertEquals(trigger1, trigger2);
 	}
 
+	@Test(expected = IllegalArgumentException.class)
+	public void testSecondInvalid() throws Exception {
+		new CronTrigger("77 * * * * *", timeZone);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testSecondRangeInvalid() throws Exception {
+		new CronTrigger("44-77 * * * * *", timeZone);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testMinuteInvalid() throws Exception {
+		new CronTrigger("* 77 * * * *", timeZone);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testMinuteRangeInvalid() throws Exception {
+		new CronTrigger("* 44-77 * * * *", timeZone);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testHourInvalid() throws Exception {
+		new CronTrigger("* * 27 * * *", timeZone);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testHourRangeInvalid() throws Exception {
+		new CronTrigger("* * 23-28 * * *", timeZone);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testDayInvalid() throws Exception {
+		new CronTrigger("* * * 45 * *", timeZone);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testDayRangeInvalid() throws Exception {
+		new CronTrigger("* * * 28-45 * *", timeZone);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testMonthInvalid() throws Exception {
+		new CronTrigger("* * * * 11-13 *", timeZone);
+	}
+
 	@Test
 	public void testWhitespace() throws Exception {
 		CronTrigger trigger1 = new CronTrigger("*  *  * *  1 *", timeZone);
@@ -579,7 +623,6 @@ private void assertMatchesNextSecond(CronTrigger trigger, Calendar calendar) {
 		assertEquals(calendar.getTime(), trigger.nextExecutionTime(context));
 	}
 
-
 	private static TriggerContext getTriggerContext(Date lastCompletionTime) {
 		SimpleTriggerContext context = new SimpleTriggerContext();
 		context.update(null, null, lastCompletionTime);