Wrong expected nextTimeout value due to leap year

[chengfang]

When calculating a timer's expected next timeout, certain tests do not take into consideration leap years. So when running these tests on Feb 28, or Feb 29, the created test timer is configured to expire on Feb 29 of some year depening on the schedule's year and start attributes. The tests calculate the next timeout year to be the intersection of year and start attribute values, but some of these calculated years do not have Feb 29.

For example, all these failed tests have output as follows:

        [TEST FAILED] testName=startAfterActualValues 
Created a timer with expression year=2020 - 2032 month=2 dayOfMonth=29 dayOfWeek=* hour=5 minute=35 second=28 start=Sat Feb 28 05:35:29 EST 2026 end=null timezone=null
Compare expected nextTimeout Mon Mar 01 05:35:28 EST 2027, and actual nextTimeout Tue Feb 29 05:35:28 EST 2028

In the above test, the expected timeout (Mar 01, 2027) is actually wrong as the timer is set to expire on Feb 29. The actual timeout value is correct (Feb 29, 2028).

[TEST FAILED] testName=startAfterActualValues2 
Created a timer with expression year=2020 - 2032 month=2 dayOfMonth=29 dayOfWeek=* hour=4 minute=57 second=42 start=Sat Feb 28 04:47:42 EST 2026 end=null timezone=null
Compare expected nextTimeout Sun Mar 01 04:57:42 EST 2026, and actual nextTimeout Tue Feb 29 04:57:42 EST 2028

In the above test, the expected timeout (Mar 01, 2026) is actually wrong as the timer is set to expire on Feb 29. The actual timeout value (Feb 29, 2028) is correct.

The following are tests affected by this issue:

com/sun/ts/tests/ejb30/timer/schedule/expire/Client.java\#startAfterActualValues2_from_ejbliteservlet 
com/sun/ts/tests/ejb30/timer/schedule/expire/Client.java\#startAfterActualValues_from_ejbliteservlet
com/sun/ts/tests/ejb30/timer/schedule/expire/Client.java\#startBeforeActualValues_from_ejbliteservlet 

com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java\#startAfterActualValues2_from_ejblitejsf
com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java\#startAfterActualValues2_from_ejblitejsp
com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java\#startAfterActualValues2_from_ejbliteservlet
com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java\#startAfterActualValues2_from_ejbliteservlet2
com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java\#startAfterActualValues_from_ejblitejsf
com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java\#startAfterActualValues_from_ejblitejsp
com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java\#startAfterActualValues_from_ejbliteservlet
com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java\#startAfterActualValues_from_ejbliteservlet2
com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java\#startBeforeActualValues_from_ejblitejsf
com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java\#startBeforeActualValues_from_ejblitejsp
com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java\#startBeforeActualValues_from_ejbliteservlet
com/sun/ts/tests/ejb32/lite/timer/schedule/expire/Client.java\#startBeforeActualValues_from_ejbliteservlet2

See one of the test methods that surgically set the year field on the expected timeout time:

  /*
   * @testName: startAfterActualValues2
   *
   * @test_Strategy: the start attr of the expression represents a time after
   * the first expiration. Verify that the timer does not start at the current
   * year; it should start a little later after the start date. For example,
   *
   * year=2009 - 2021 month=1 dayOfMonth=20 dayOfWeek=* hour=10 minute=33
   * second=19 start Tue Jan 20 10:23:19 EST 2015 end null
   */

  public void startAfterActualValues2() {
    int plusMinutes = 10;
    Calendar cal = Calendar.getInstance();
    int currentYear = TimerUtil.getForSchedule(Calendar.YEAR, cal);
    Date currentDate = cal.getTime();
    cal.add(Calendar.MINUTE, plusMinutes);
    Date currentDatePlus = cal.getTime();
    ScheduleExpression exp = TimerUtil.getPreciseScheduleExpression(cal);

    // the start time (excluding year) is before the scheduled time
    Date start = DateUtils.addYears(currentDate, WAIT_YEARS);
    exp.start(start);
    exp.year((currentYear) + " - " + (currentYear + WAIT_YEARS * 2));

    Timer timer = createTimer(exp);
    int startYear = TimerUtil.getDateField(Calendar.YEAR, start);
    Date expectedNextTimeout = DateUtils.setYears(currentDatePlus, startYear);
    verifyNextTimeout(expectedNextTimeout, timer);
    passIfNoTimeout();
  }