From: Thomas Jarosch Date: Wed, 24 Feb 2010 19:54:02 +0000 (+0100) Subject: Merge branch 'boost-test' into glibc-upgrade X-Git-Tag: v2.6~112^2~16 X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=0bd1e98c45380c137db994e106778c944151226b;p=libi2ncommon Merge branch 'boost-test' into glibc-upgrade Conflicts: connd/configure.in libi2ncommon/test/test_cron_interval.cpp libi2ncommon/test/test_cron_point.cpp packages/cppunit/cppunit.spec packages/libt2n/libt2n-0.5.tar.gz packages/libt2n/libt2n.spec proxylizer/config.h.in --- 0bd1e98c45380c137db994e106778c944151226b diff --cc test/test_cron_interval.cpp index 02b6cb7,28c7802..2fb7450 --- a/test/test_cron_interval.cpp +++ b/test/test_cron_interval.cpp @@@ -87,371 -27,371 +27,368 @@@ public // our check-values are set for Germany setenv("TZ",":Europe/Berlin",1); } + }; - void tearDown() - { } - - - void IntervalBeginToday() - { - WeekCron cron("2345",3600,7200,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233100800), cron.get_next_run(1233099657)); - } + BOOST_FIXTURE_TEST_SUITE(TestCronIntervalFunc, TestCronIntervalFuncFixture) - void IntervalDoneToday() - { - WeekCron cron("2345",3600); - CPPUNIT_ASSERT_EQUAL( static_cast(1233187200), cron.get_next_run(1233150000)); - } + BOOST_AUTO_TEST_CASE(IntervalBeginToday) + { + WeekCron cron("2345",3600,7200,10); + BOOST_CHECK_EQUAL( static_cast(1233100800), cron.get_next_run(1233099657)); + } - void IntervalBeginNow() - { - WeekCron cron("2345",3600,7200,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233100810), cron.get_next_run(1233100800)); - } + BOOST_AUTO_TEST_CASE(IntervalDoneToday) + { + WeekCron cron("2345",3600); + BOOST_CHECK_EQUAL( static_cast(1233187200), cron.get_next_run(1233150000)); + } - void IntervalBeginStep() - { - WeekCron cron("2345",3600,7200,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233100820), cron.get_next_run(1233100810)); - } + BOOST_AUTO_TEST_CASE(IntervalBeginNow) + { + WeekCron cron("2345",3600,7200,10); + BOOST_CHECK_EQUAL( static_cast(1233100810), cron.get_next_run(1233100800)); + } - void IntervalWithin() - { - WeekCron cron("2345",3600,7200,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233100830), cron.get_next_run(1233100822)); - } + BOOST_AUTO_TEST_CASE(IntervalBeginStep) + { + WeekCron cron("2345",3600,7200,10); + BOOST_CHECK_EQUAL( static_cast(1233100820), cron.get_next_run(1233100810)); + } - void IntervalLaststep1() - { - WeekCron cron("2345",3600,7200,11); - CPPUNIT_ASSERT_EQUAL( static_cast(1233187200), cron.get_next_run(1233104399)); - } + BOOST_AUTO_TEST_CASE(IntervalWithin) + { + WeekCron cron("2345",3600,7200,10); + BOOST_CHECK_EQUAL( static_cast(1233100830), cron.get_next_run(1233100822)); + } - void IntervalLaststep2() - { - WeekCron cron("2345",3600,7200,11); - CPPUNIT_ASSERT_EQUAL( static_cast(1233187200), cron.get_next_run(1233104398)); - } + BOOST_AUTO_TEST_CASE(IntervalLaststep1) + { + WeekCron cron("2345",3600,7200,11); + BOOST_CHECK_EQUAL( static_cast(1233187200), cron.get_next_run(1233104399)); + } - void IntervalLaststep3() - { - WeekCron cron("2345",3600,7199,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233187200), cron.get_next_run(1233104397)); - } + BOOST_AUTO_TEST_CASE(IntervalLaststep2) + { + WeekCron cron("2345",3600,7200,11); + BOOST_CHECK_EQUAL( static_cast(1233187200), cron.get_next_run(1233104398)); + } - void IntervalLaststep4() - { - WeekCron cron("2345",3600,7200,3599); - CPPUNIT_ASSERT_EQUAL( static_cast(1233104399), cron.get_next_run(1233104398)); - } + BOOST_AUTO_TEST_CASE(IntervalLaststep3) + { + WeekCron cron("2345",3600,7199,10); + BOOST_CHECK_EQUAL( static_cast(1233187200), cron.get_next_run(1233104397)); + } - void IntervalLaststep5() - { - WeekCron cron("2345",3600,7200,3598); - CPPUNIT_ASSERT_EQUAL( static_cast(1233187200), cron.get_next_run(1233104398)); - } + BOOST_AUTO_TEST_CASE(IntervalLaststep4) + { + WeekCron cron("2345",3600,7200,3599); + BOOST_CHECK_EQUAL( static_cast(1233104399), cron.get_next_run(1233104398)); + } - void IntervalLaststepMatch() - { - WeekCron cron("2345",3600,7200,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233187200), cron.get_next_run(1233104399)); - } + BOOST_AUTO_TEST_CASE(IntervalLaststep5) + { + WeekCron cron("2345",3600,7200,3598); + BOOST_CHECK_EQUAL( static_cast(1233187200), cron.get_next_run(1233104398)); + } - void IntervalEnd() - { - WeekCron cron("2345",3600,7200,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233187200), cron.get_next_run(1233104400)); - } + BOOST_AUTO_TEST_CASE(IntervalLaststepMatch) + { + WeekCron cron("2345",3600,7200,10); + BOOST_CHECK_EQUAL( static_cast(1233187200), cron.get_next_run(1233104399)); + } - void IntervalBigstep() - { - WeekCron cron("2345",3600,7200,10000); - CPPUNIT_ASSERT_EQUAL( static_cast(1233187200), cron.get_next_run(1233100800)); - } + BOOST_AUTO_TEST_CASE(IntervalEnd) + { + WeekCron cron("2345",3600,7200,10); + BOOST_CHECK_EQUAL( static_cast(1233187200), cron.get_next_run(1233104400)); + } - void IntervalWholeDayStart() - { - WeekCron cron("345",0,86400,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233097200), cron.get_next_run(1233097199)); - } + BOOST_AUTO_TEST_CASE(IntervalBigstep) + { + WeekCron cron("2345",3600,7200,10000); + BOOST_CHECK_EQUAL( static_cast(1233187200), cron.get_next_run(1233100800)); + } - void IntervalWholeDayStartNow() - { - WeekCron cron("345",0,86400,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233097210), cron.get_next_run(1233097200)); - } + BOOST_AUTO_TEST_CASE(IntervalWholeDayStart) + { + WeekCron cron("345",0,86400,10); + BOOST_CHECK_EQUAL( static_cast(1233097200), cron.get_next_run(1233097199)); + } - void IntervalWholeDayEnd() - { - WeekCron cron("2",0,86400,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233615600), cron.get_next_run(1233097199)); - } + BOOST_AUTO_TEST_CASE(IntervalWholeDayStartNow) + { + WeekCron cron("345",0,86400,10); + BOOST_CHECK_EQUAL( static_cast(1233097210), cron.get_next_run(1233097200)); + } - void IntervalWholeDayWithin1() - { - WeekCron cron("2345",0,86400,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233097230), cron.get_next_run(1233097220)); - } + BOOST_AUTO_TEST_CASE(IntervalWholeDayEnd) + { + WeekCron cron("2",0,86400,10); + BOOST_CHECK_EQUAL( static_cast(1233615600), cron.get_next_run(1233097199)); + } - void IntervalWholeDayWithin2() - { - WeekCron cron("2345",0,86400,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233097230), cron.get_next_run(1233097229)); - } + BOOST_AUTO_TEST_CASE(IntervalWholeDayWithin1) + { + WeekCron cron("2345",0,86400,10); + BOOST_CHECK_EQUAL( static_cast(1233097230), cron.get_next_run(1233097220)); + } - void IntervalWholeDayWithinBoundary() - { - WeekCron cron("2345",0,86400,10); - CPPUNIT_ASSERT_EQUAL( static_cast(1233097200), cron.get_next_run(1233097199)); - } + BOOST_AUTO_TEST_CASE(IntervalWholeDayWithin2) + { + WeekCron cron("2345",0,86400,10); + BOOST_CHECK_EQUAL( static_cast(1233097230), cron.get_next_run(1233097229)); + } - void IntervalBeforeOnce() - { - WeekCron cron("2345",0,3600,3600); - CPPUNIT_ASSERT_EQUAL( static_cast(1233183600), cron.get_next_run(1233100799)); - } + BOOST_AUTO_TEST_CASE(IntervalWholeDayWithinBoundary) + { + WeekCron cron("2345",0,86400,10); + BOOST_CHECK_EQUAL( static_cast(1233097200), cron.get_next_run(1233097199)); + } - void IntervalBeforeOnceBig() - { - WeekCron cron("2345",0,3600,86400); - CPPUNIT_ASSERT_EQUAL( static_cast(1233183600), cron.get_next_run(1233100799)); - } + BOOST_AUTO_TEST_CASE(IntervalBeforeOnce) + { + WeekCron cron("2345",0,3600,3600); + BOOST_CHECK_EQUAL( static_cast(1233183600), cron.get_next_run(1233100799)); + } - void IntervalAfterOnce() - { - WeekCron cron("2345",0,3600,86400); - CPPUNIT_ASSERT_EQUAL( static_cast(1233183600), cron.get_next_run(1233097200)); - } + BOOST_AUTO_TEST_CASE(IntervalBeforeOnceBig) + { + WeekCron cron("2345",0,3600,86400); + BOOST_CHECK_EQUAL( static_cast(1233183600), cron.get_next_run(1233100799)); + } - void IntervalOnceShort() - { - WeekCron cron("2345",0,1,86400); - CPPUNIT_ASSERT_EQUAL( static_cast(1233097200), cron.get_next_run(1233097199)); - } + BOOST_AUTO_TEST_CASE(IntervalAfterOnce) + { + WeekCron cron("2345",0,3600,86400); + BOOST_CHECK_EQUAL( static_cast(1233183600), cron.get_next_run(1233097200)); + } - void IntervalTooShort() - { - WeekCron cron("2345",0,0,86400); - CPPUNIT_ASSERT_EQUAL( static_cast(1233183600), cron.get_next_run(1233097200)); - } + BOOST_AUTO_TEST_CASE(IntervalOnceShort) + { + WeekCron cron("2345",0,1,86400); + BOOST_CHECK_EQUAL( static_cast(1233097200), cron.get_next_run(1233097199)); + } - void IntervalOverDSTBackwards1() - { - WeekCron cron("0123456",0,14400,60); - // calc at: Sun Oct 26 01:59:59 CEST 2008 - // expected next run: Sun Oct 26 02:00:00 CEST 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224979200), cron.get_next_run(1224979199)); - } + BOOST_AUTO_TEST_CASE(IntervalTooShort) + { + WeekCron cron("2345",0,0,86400); + BOOST_CHECK_EQUAL( static_cast(1233183600), cron.get_next_run(1233097200)); + } - void IntervalOverDSTBackwards2() - { - WeekCron cron("0123456",0,14400,60); - // calc at: Sun Oct 26 02:29:59 CEST 2008 - // expected next run: Sun Oct 26 02:30:00 CEST 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224981000), cron.get_next_run(1224980999)); - } + BOOST_AUTO_TEST_CASE(IntervalOverDSTBackwards1) + { + WeekCron cron("0123456",0,14400,60); + // calc at: Sun Oct 26 01:59:59 CEST 2008 + // expected next run: Sun Oct 26 02:00:00 CEST 2008 + BOOST_CHECK_EQUAL( static_cast(1224979200), cron.get_next_run(1224979199)); + } - void IntervalOverDSTBackwards3() - { - WeekCron cron("0123456",0,14400,60); - // calc at: Sun Oct 26 02:59:59 CEST 2008 - // expected next run: Sun Oct 26 02:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224982800), cron.get_next_run(1224982799)); - } + BOOST_AUTO_TEST_CASE(IntervalOverDSTBackwards2) + { + WeekCron cron("0123456",0,14400,60); + // calc at: Sun Oct 26 02:29:59 CEST 2008 + // expected next run: Sun Oct 26 02:30:00 CEST 2008 + BOOST_CHECK_EQUAL( static_cast(1224981000), cron.get_next_run(1224980999)); + } - void IntervalOverDSTBackwards4() - { - WeekCron cron("0123456",0,14400,60); - // calc at: Sun Oct 26 02:59:59 CET 2008 - // expected next run: Sun Oct 26 03:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224986400), cron.get_next_run(1224986399)); - } + BOOST_AUTO_TEST_CASE(IntervalOverDSTBackwards3) + { + WeekCron cron("0123456",0,14400,60); + // calc at: Sun Oct 26 02:59:59 CEST 2008 + // expected next run: Sun Oct 26 02:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224982800), cron.get_next_run(1224982799)); + } - void IntervalInFirstDSTBackwards1() - { - WeekCron cron("0123456",0,9000,60); - // calc at: Sun Oct 26 02:28:59 CEST 2008 - // expected next run: Sun Oct 26 02:29:00 CEST 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224980940), cron.get_next_run(1224980939)); - } + BOOST_AUTO_TEST_CASE(IntervalOverDSTBackwards4) + { + WeekCron cron("0123456",0,14400,60); + // calc at: Sun Oct 26 02:59:59 CET 2008 + // expected next run: Sun Oct 26 03:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224986400), cron.get_next_run(1224986399)); + } - void IntervalInFirstDSTBackwards2() - { - WeekCron cron("0123456",0,9000,60); - // calc at: Sun Oct 26 02:29:01 CEST 2008 - // expected next run: Mon Oct 27 00:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1225062000), cron.get_next_run(1224980941)); - } + BOOST_AUTO_TEST_CASE(IntervalInFirstDSTBackwards1) + { + WeekCron cron("0123456",0,9000,60); + // calc at: Sun Oct 26 02:28:59 CEST 2008 + // expected next run: Sun Oct 26 02:29:00 CEST 2008 + BOOST_CHECK_EQUAL( static_cast(1224980940), cron.get_next_run(1224980939)); + } - void IntervalInSecondDSTBackwards1() - { - WeekCron cron("0123456",0,12600,60); - // calc at: Sun Oct 26 02:28:59 CET 2008 - // expected next run: Sun Oct 26 02:29:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224984540), cron.get_next_run(1224984539)); - } + BOOST_AUTO_TEST_CASE(IntervalInFirstDSTBackwards2) + { + WeekCron cron("0123456",0,9000,60); + // calc at: Sun Oct 26 02:29:01 CEST 2008 + // expected next run: Mon Oct 27 00:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1225062000), cron.get_next_run(1224980941)); + } - void IntervalInSecondDSTBackwards2() - { - WeekCron cron("0123456",0,12600,60); - // calc at: Sun Oct 26 02:29:01 CET 2008 - // expected next run: Sun Oct 26 02:30:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224984600), cron.get_next_run(1224984541)); - } + BOOST_AUTO_TEST_CASE(IntervalInSecondDSTBackwards1) + { + WeekCron cron("0123456",0,12600,60); + // calc at: Sun Oct 26 02:28:59 CET 2008 + // expected next run: Sun Oct 26 02:29:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224984540), cron.get_next_run(1224984539)); + } - void IntervalOutFirstDSTBackwards1() - { - WeekCron cron("0123456",9000,18000,60); - // calc at: Sun Oct 26 02:29:00 CEST 2008 - // expected next run: Sun Oct 26 02:30:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224984600), cron.get_next_run(1224980940)); - } + BOOST_AUTO_TEST_CASE(IntervalInSecondDSTBackwards2) + { + WeekCron cron("0123456",0,12600,60); + // calc at: Sun Oct 26 02:29:01 CET 2008 + // expected next run: Sun Oct 26 02:30:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224984600), cron.get_next_run(1224984541)); + } - void IntervalOutFirstDSTBackwards2() - { - WeekCron cron("0123456",9000,18000,60); - // calc at: Sun Oct 26 02:29:00 CET 2008 - // expected next run: Sun Oct 26 02:30:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224984600), cron.get_next_run(1224984540)); - } + BOOST_AUTO_TEST_CASE(IntervalOutFirstDSTBackwards1) + { + WeekCron cron("0123456",9000,18000,60); + // calc at: Sun Oct 26 02:29:00 CEST 2008 + // expected next run: Sun Oct 26 02:30:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224984600), cron.get_next_run(1224980940)); + } - void IntervalOutSecondDSTBackwards1() - { - WeekCron cron("0123456",12600,18000,60); - // calc at: Sun Oct 26 02:29:59 CET 2008 - // expected next run: Sun Oct 26 03:30:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224988200), cron.get_next_run(1224984599)); - } + BOOST_AUTO_TEST_CASE(IntervalOutFirstDSTBackwards2) + { + WeekCron cron("0123456",9000,18000,60); + // calc at: Sun Oct 26 02:29:00 CET 2008 + // expected next run: Sun Oct 26 02:30:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224984600), cron.get_next_run(1224984540)); + } - void IntervalDSTBackwardsWholeday1() - { - WeekCron cron("0123456",0,86400,60); - // calc at: Sun Oct 26 22:58:59 CET 2008 - // expected next run: Sun Oct 26 22:59:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1225058340), cron.get_next_run(1225058339)); - } + BOOST_AUTO_TEST_CASE(IntervalOutSecondDSTBackwards1) + { + WeekCron cron("0123456",12600,18000,60); + // calc at: Sun Oct 26 02:29:59 CET 2008 + // expected next run: Sun Oct 26 03:30:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224988200), cron.get_next_run(1224984599)); + } - void IntervalDSTBackwardsWholeday2() - { - WeekCron cron("0123456",0,86400,60); - // calc at: Sun Oct 26 22:59:59 CET 2008 - // expected next run: Sun Oct 26 23:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1225058400), cron.get_next_run(1225058399)); - } + BOOST_AUTO_TEST_CASE(IntervalDSTBackwardsWholeday1) + { + WeekCron cron("0123456",0,86400,60); + // calc at: Sun Oct 26 22:58:59 CET 2008 + // expected next run: Sun Oct 26 22:59:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1225058340), cron.get_next_run(1225058339)); + } - void IntervalDSTBackwardsWholeday3() - { - WeekCron cron("0123456",0,86400,60); - // calc at: Sun Oct 26 23:30:00 CET 2008 - // expected next run: Sun Oct 26 23:31:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1225060260), cron.get_next_run(1225060200)); - } + BOOST_AUTO_TEST_CASE(IntervalDSTBackwardsWholeday2) + { + WeekCron cron("0123456",0,86400,60); + // calc at: Sun Oct 26 22:59:59 CET 2008 + // expected next run: Sun Oct 26 23:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1225058400), cron.get_next_run(1225058399)); + } - void IntervalOverDSTForward1() - { - WeekCron cron("0123456",0,14400,60); - // calc at: Sun Mar 29 01:59:59 CET 2009 - // expected next run: Sun Mar 29 03:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); - } + BOOST_AUTO_TEST_CASE(IntervalDSTBackwardsWholeday3) + { + WeekCron cron("0123456",0,86400,60); + // calc at: Sun Oct 26 23:30:00 CET 2008 + // expected next run: Sun Oct 26 23:31:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1225060260), cron.get_next_run(1225060200)); + } - void IntervalOverDSTForward2() - { - WeekCron cron("0123456",0,14400,60); - // calc at: Sun Mar 29 03:58:59 CEST 2009 - // expected next run: Sun Mar 29 03:59:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238291940), cron.get_next_run(1238291939)); - } + BOOST_AUTO_TEST_CASE(IntervalOverDSTForward1) + { + WeekCron cron("0123456",0,14400,60); + // calc at: Sun Mar 29 01:59:59 CET 2009 + // expected next run: Sun Mar 29 03:00:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); + } - void IntervalOverDSTForward3() - { - WeekCron cron("0123456",0,14400,60); - // calc at: Sun Mar 29 03:59:59 CEST 2009 - // expected next run: Mon Mar 30 00:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238364000), cron.get_next_run(1238291999)); - } + BOOST_AUTO_TEST_CASE(IntervalOverDSTForward2) + { + WeekCron cron("0123456",0,14400,60); + // calc at: Sun Mar 29 03:58:59 CEST 2009 + // expected next run: Sun Mar 29 03:59:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238291940), cron.get_next_run(1238291939)); + } - void IntervalInDSTForward1() - { - WeekCron cron("0123456",3600,9000,60); - // calc at: Sun Mar 29 01:59:59 CET 2009 - // expected next run: Sun Mar 29 03:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); - } + BOOST_AUTO_TEST_CASE(IntervalOverDSTForward3) + { + WeekCron cron("0123456",0,14400,60); + // calc at: Sun Mar 29 03:59:59 CEST 2009 + // expected next run: Mon Mar 30 00:00:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238364000), cron.get_next_run(1238291999)); + } - void IntervalInDSTForward2() - { - WeekCron cron("0123456",3600,9000,60); - // calc at: Sun Mar 29 03:29:59 CEST 2009 - // expected next run: Mon Mar 30 01:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238367600), cron.get_next_run(1238290199)); - } + BOOST_AUTO_TEST_CASE(IntervalInDSTForward1) + { + WeekCron cron("0123456",3600,9000,60); + // calc at: Sun Mar 29 01:59:59 CET 2009 + // expected next run: Sun Mar 29 03:00:00 CEST 2009 - // glibc update: BOOST_CHECK_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); - BOOST_CHECK_EQUAL( static_cast(1238367600), cron.get_next_run(1238288399)); ++ BOOST_CHECK_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); + } - void IntervalInDSTForward3() - { - WeekCron cron("0123456",7200,9000,60); - // calc at: Sun Mar 29 01:59:59 CET 2009 - // expected next run: Sun Mar 29 03:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); - } + BOOST_AUTO_TEST_CASE(IntervalInDSTForward2) + { + WeekCron cron("0123456",3600,9000,60); + // calc at: Sun Mar 29 03:29:59 CEST 2009 + // expected next run: Mon Mar 30 01:00:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238367600), cron.get_next_run(1238290199)); + } - void IntervalOutDSTForward() - { - WeekCron cron("0123456",9000,14400,60); - // calc at: Sun Mar 29 03:29:59 CEST 2009 - // expected next run: Sun Mar 29 03:30:30 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238290200), cron.get_next_run(1238290199)); - } + BOOST_AUTO_TEST_CASE(IntervalInDSTForward3) + { + WeekCron cron("0123456",7200,9000,60); + // calc at: Sun Mar 29 01:59:59 CET 2009 + // expected next run: Sun Mar 29 03:00:00 CEST 2009 - // glibc update: BOOST_CHECK_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); - BOOST_CHECK_EQUAL( static_cast(1238371200), cron.get_next_run(1238288399)); ++ BOOST_CHECK_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); + } - void IntervalDuringDSTForward() - { - WeekCron cron("0123456",7200,10800,60); - // calc at: Sun Mar 29 01:59:59 CET 2009 - // expected next run: Sun Mar 29 03:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); - } + BOOST_AUTO_TEST_CASE(IntervalOutDSTForward) + { + WeekCron cron("0123456",9000,14400,60); + // calc at: Sun Mar 29 03:29:59 CEST 2009 + // expected next run: Sun Mar 29 03:30:30 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238290200), cron.get_next_run(1238290199)); + } - void IntervalDSTForwardWholeday1() - { - WeekCron cron("03",0,86400,60); - // calc at: Sun Mar 29 23:59:59 CEST 2009 - // expected next run: Wed Apr 1 00:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238536800), cron.get_next_run(1238363999)); - } + BOOST_AUTO_TEST_CASE(IntervalDuringDSTForward) + { + WeekCron cron("0123456",7200,10800,60); + // calc at: Sun Mar 29 01:59:59 CET 2009 + // expected next run: Sun Mar 29 03:00:00 CEST 2009 - // glibc update: BOOST_CHECK_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); - BOOST_CHECK_EQUAL( static_cast(1238371200), cron.get_next_run(1238288399)); ++ BOOST_CHECK_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); + } - void IntervalDSTForwardWholeday2() - { - WeekCron cron("03",0,86400,60); - // calc at: Mon Mar 30 00:59:59 CEST 2009 - // expected next run: Wed Apr 1 00:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238536800), cron.get_next_run(1238367599)); - } + BOOST_AUTO_TEST_CASE(IntervalDSTForwardWholeday1) + { + WeekCron cron("03",0,86400,60); + // calc at: Sun Mar 29 23:59:59 CEST 2009 + // expected next run: Wed Apr 1 00:00:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238536800), cron.get_next_run(1238363999)); + } - void IntervalDSTForwardWholeday3() - { - WeekCron cron("0123456",0,86340,60); - // calc at: Sun Mar 29 11:42:06 CEST 2009 - // expected next run: Sun Mar 29 11:43:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238319780), cron.get_next_run(1238319726)); - } + BOOST_AUTO_TEST_CASE(IntervalDSTForwardWholeday2) + { + WeekCron cron("03",0,86400,60); + // calc at: Mon Mar 30 00:59:59 CEST 2009 + // expected next run: Wed Apr 1 00:00:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238536800), cron.get_next_run(1238367599)); + } - void IntervalDSTForwardWholeday4() - { - WeekCron cron("0123456",3599,86340,60); - // calc at: Sun Mar 29 11:42:06 CEST 2009 - // expected next run: Sun Mar 29 11:42:59 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238319779), cron.get_next_run(1238319726)); - } + BOOST_AUTO_TEST_CASE(IntervalDSTForwardWholeday3) + { + WeekCron cron("0123456",0,86340,60); + // calc at: Sun Mar 29 11:42:06 CEST 2009 + // expected next run: Sun Mar 29 11:43:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238319780), cron.get_next_run(1238319726)); + } - void IntervalDSTForwardWholeday5() - { - WeekCron cron("0123456",3600,86340,60); - // calc at: Sun Mar 29 11:42:06 CEST 2009 - // expected next run: Sun Mar 29 11:43:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238319780), cron.get_next_run(1238319726)); - } + BOOST_AUTO_TEST_CASE(IntervalDSTForwardWholeday4) + { + WeekCron cron("0123456",3599,86340,60); + // calc at: Sun Mar 29 11:42:06 CEST 2009 + // expected next run: Sun Mar 29 11:42:59 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238319779), cron.get_next_run(1238319726)); + } - }; + BOOST_AUTO_TEST_CASE(IntervalDSTForwardWholeday5) + { + WeekCron cron("0123456",3600,86340,60); + // calc at: Sun Mar 29 11:42:06 CEST 2009 + // expected next run: Sun Mar 29 11:43:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238319780), cron.get_next_run(1238319726)); + } - CPPUNIT_TEST_SUITE_REGISTRATION(TestCronIntervalFunc); + BOOST_AUTO_TEST_SUITE_END() diff --cc test/test_cron_point.cpp index 047ce13,5344d9e..687ca12 --- a/test/test_cron_point.cpp +++ b/test/test_cron_point.cpp @@@ -70,287 -27,288 +27,284 @@@ public // our check-values are set for Germany setenv("TZ",":Europe/Berlin",1); } + }; - void tearDown() - { } - - ///////////////////////////////////////////////////// - // Points in time - ///////////////////////////////////////////////////// - - void NotYetToday() - { - WeekCron cron("2345",3600); - CPPUNIT_ASSERT_EQUAL( static_cast(1233100800), cron.get_next_run(1233099657)); - } - - void Now() - { - WeekCron cron("2345",3600); - CPPUNIT_ASSERT_EQUAL( static_cast(1233187200), cron.get_next_run(1233100800)); - } + BOOST_FIXTURE_TEST_SUITE(TestCronPointFunc, TestCronPointFuncFixture) - void LaterToday() - { - WeekCron cron("2345",3600); - CPPUNIT_ASSERT_EQUAL( static_cast(1233187200), cron.get_next_run(1233100801)); - } + ///////////////////////////////////////////////////// + // Points in time + ///////////////////////////////////////////////////// - void Tomorrow() - { - WeekCron cron("45",3600); - CPPUNIT_ASSERT_EQUAL( static_cast(1233187200), cron.get_next_run(1233099657)); - } + BOOST_AUTO_TEST_CASE(NotYetToday) + { + WeekCron cron("2345",3600); + BOOST_CHECK_EQUAL( static_cast(1233100800), cron.get_next_run(1233099657)); + } - void NextWeek() - { - WeekCron cron("1",3600); - CPPUNIT_ASSERT_EQUAL( static_cast(1233532800), cron.get_next_run(1233099657)); - } + BOOST_AUTO_TEST_CASE(Now) + { + WeekCron cron("2345",3600); + BOOST_CHECK_EQUAL( static_cast(1233187200), cron.get_next_run(1233100800)); + } - void NextWeekFromToday() - { - WeekCron cron("13",3600); - CPPUNIT_ASSERT_EQUAL( static_cast(1233532800), cron.get_next_run(1233100801)); - } + BOOST_AUTO_TEST_CASE(LaterToday) + { + WeekCron cron("2345",3600); + BOOST_CHECK_EQUAL( static_cast(1233187200), cron.get_next_run(1233100801)); + } - void StartMidnight() - { - WeekCron cron("2345",0); - CPPUNIT_ASSERT_EQUAL( static_cast(1233097200), cron.get_next_run(1233097199)); - } + BOOST_AUTO_TEST_CASE(Tomorrow) + { + WeekCron cron("45",3600); + BOOST_CHECK_EQUAL( static_cast(1233187200), cron.get_next_run(1233099657)); + } - void StartMidnightTomorrow() - { - WeekCron cron("2345",0); - CPPUNIT_ASSERT_EQUAL( static_cast(1233183600), cron.get_next_run(1233097200)); - } + BOOST_AUTO_TEST_CASE(NextWeek) + { + WeekCron cron("1",3600); + BOOST_CHECK_EQUAL( static_cast(1233532800), cron.get_next_run(1233099657)); + } - void StartLastDaysec() - { - WeekCron cron("2345",86399); - CPPUNIT_ASSERT_EQUAL( static_cast(1233183599), cron.get_next_run(1233097200)); - } + BOOST_AUTO_TEST_CASE(NextWeekFromToday) + { + WeekCron cron("13",3600); + BOOST_CHECK_EQUAL( static_cast(1233532800), cron.get_next_run(1233100801)); + } - void HalfOpenInterval() - { - WeekCron cron("2345",86400); - CPPUNIT_ASSERT_THROW(cron.get_next_run(1233097200),std::runtime_error); - } + BOOST_AUTO_TEST_CASE(StartMidnight) + { + WeekCron cron("2345",0); + BOOST_CHECK_EQUAL( static_cast(1233097200), cron.get_next_run(1233097199)); + } - void LongBeforeDSTBackwards() - { - WeekCron cron("0123456",75600); - // calc at: Sun Oct 26 00:00:00 CEST 2008 - // expected next run: Sun Oct 26 21:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1225051200), cron.get_next_run(1224972000)); - } + BOOST_AUTO_TEST_CASE(StartMidnightTomorrow) + { + WeekCron cron("2345",0); + BOOST_CHECK_EQUAL( static_cast(1233183600), cron.get_next_run(1233097200)); + } - void BeforeDSTBackwards1() - { - WeekCron cron("0123456",7200); - // calc at: Sun Oct 26 01:59:59 CEST 2008 - // expected next run: Sun Oct 26 02:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224982800), cron.get_next_run(1224979199)); - } + BOOST_AUTO_TEST_CASE(StartLastDaysec) + { + WeekCron cron("2345",86399); + BOOST_CHECK_EQUAL( static_cast(1233183599), cron.get_next_run(1233097200)); + } - void BeforeDSTBackwards2() - { - WeekCron cron("0123456",7200); - // calc at: Sun Oct 26 02:59:59 CEST 2008 - // expected next run: Sun Oct 26 02:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224982800), cron.get_next_run(1224982799)); - } + BOOST_AUTO_TEST_CASE(HalfOpenInterval) + { + WeekCron cron("2345",86400); + BOOST_REQUIRE_THROW(cron.get_next_run(1233097200),std::runtime_error); + } - void AtDSTBackwards() - { - WeekCron cron("0123456",7200); - // calc at: Sun Oct 26 02:00:00 CET 2008 - // expected next run: Mon Oct 27 02:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1225069200), cron.get_next_run(1224982800)); - } + BOOST_AUTO_TEST_CASE(LongBeforeDSTBackwards) + { + WeekCron cron("0123456",75600); + // calc at: Sun Oct 26 00:00:00 CEST 2008 + // expected next run: Sun Oct 26 21:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1225051200), cron.get_next_run(1224972000)); + } - void DuringDSTBackwards() - { - WeekCron cron("0123456",7200); - // calc at: Sun Oct 26 02:00:01 CET 2008 - // expected next run: Mon Oct 27 02:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1225069200), cron.get_next_run(1224982801)); - } + BOOST_AUTO_TEST_CASE(BeforeDSTBackwards1) + { + WeekCron cron("0123456",7200); + // calc at: Sun Oct 26 01:59:59 CEST 2008 + // expected next run: Sun Oct 26 02:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224982800), cron.get_next_run(1224979199)); + } - void EndDSTBackwards1() - { - WeekCron cron("0123456",10800); - // calc at: Sun Oct 26 02:00:00 CEST 2008 - // expected next run: Sun Oct 26 03:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224986400), cron.get_next_run(1224979200)); - } + BOOST_AUTO_TEST_CASE(BeforeDSTBackwards2) + { + WeekCron cron("0123456",7200); + // calc at: Sun Oct 26 02:59:59 CEST 2008 + // expected next run: Sun Oct 26 02:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224982800), cron.get_next_run(1224982799)); + } - void EndDSTBackwards2() - { - WeekCron cron("0123456",10800); - // calc at: Sun Oct 26 02:00:01 CEST 2008 - // expected next run: Sun Oct 26 03:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224986400), cron.get_next_run(1224979201)); - } + BOOST_AUTO_TEST_CASE(AtDSTBackwards) + { + WeekCron cron("0123456",7200); + // calc at: Sun Oct 26 02:00:00 CET 2008 + // expected next run: Mon Oct 27 02:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1225069200), cron.get_next_run(1224982800)); + } - void EndDSTBackwards3() - { - WeekCron cron("0123456",10799); - // calc at: Sun Oct 26 02:00:01 CEST 2008 - // expected next run: Sun Oct 26 02:59:59 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224986399), cron.get_next_run(1224979201)); - } + BOOST_AUTO_TEST_CASE(DuringDSTBackwards) + { + WeekCron cron("0123456",7200); + // calc at: Sun Oct 26 02:00:01 CET 2008 + // expected next run: Mon Oct 27 02:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1225069200), cron.get_next_run(1224982801)); + } - void EndDSTBackwards4() - { - WeekCron cron("0123456",10799); - // calc at: Sun Oct 26 02:03:20 CET 2008 - // expected next run: Sun Oct 26 02:59:59 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1224986399), cron.get_next_run(1224983000)); - } + BOOST_AUTO_TEST_CASE(EndDSTBackwards1) + { + WeekCron cron("0123456",10800); + // calc at: Sun Oct 26 02:00:00 CEST 2008 + // expected next run: Sun Oct 26 03:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224986400), cron.get_next_run(1224979200)); + } - void OverDSTBackwards() - { - WeekCron cron("234",10800); - // calc at: Sat Oct 25 05:00:00 CEST 2008 - // expected next run: Tue Oct 28 03:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1225159200), cron.get_next_run(1224903600)); - } + BOOST_AUTO_TEST_CASE(EndDSTBackwards2) + { + WeekCron cron("0123456",10800); + // calc at: Sun Oct 26 02:00:01 CEST 2008 + // expected next run: Sun Oct 26 03:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224986400), cron.get_next_run(1224979201)); + } - void OverDSTBackwardsDaychange() - { - WeekCron cron("234",0); - // calc at: Sat Oct 25 00:00:00 CEST 2008 - // expected next run: Tue Oct 28 00:00:00 CET 2008 - CPPUNIT_ASSERT_EQUAL( static_cast(1225148400), cron.get_next_run(1224885600)); - } + BOOST_AUTO_TEST_CASE(EndDSTBackwards3) + { + WeekCron cron("0123456",10799); + // calc at: Sun Oct 26 02:00:01 CEST 2008 + // expected next run: Sun Oct 26 02:59:59 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224986399), cron.get_next_run(1224979201)); + } - void LongBeforeDSTForward() - { - WeekCron cron("0123456",75600); - // calc at: Sat Mar 28 22:00:00 CET 2009 - // expected next run: Sun Mar 29 21:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238353200), cron.get_next_run(1238274000)); - } + BOOST_AUTO_TEST_CASE(EndDSTBackwards4) + { + WeekCron cron("0123456",10799); + // calc at: Sun Oct 26 02:03:20 CET 2008 + // expected next run: Sun Oct 26 02:59:59 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1224986399), cron.get_next_run(1224983000)); + } - void BeforeDSTForward1() - { - // TODO: resultat Mon Mar 30 02:00:00 CEST 2009 + BOOST_AUTO_TEST_CASE(OverDSTBackwards) + { + WeekCron cron("234",10800); + // calc at: Sat Oct 25 05:00:00 CEST 2008 + // expected next run: Tue Oct 28 03:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1225159200), cron.get_next_run(1224903600)); + } - WeekCron cron("0123456",7200); - // calc at: Sun Mar 29 01:59:59 CET 2009 - // expected next run: Sun Mar 29 03:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); - } + BOOST_AUTO_TEST_CASE(OverDSTBackwardsDaychange) + { + WeekCron cron("234",0); + // calc at: Sat Oct 25 00:00:00 CEST 2008 + // expected next run: Tue Oct 28 00:00:00 CET 2008 + BOOST_CHECK_EQUAL( static_cast(1225148400), cron.get_next_run(1224885600)); + } - void BeforeDSTForward2() - { - WeekCron cron("0123456",0); - // calc at: Sun Mar 29 01:59:59 CET 2009 - // expected next run: Mon Mar 30 00:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238364000), cron.get_next_run(1238288399)); - } + BOOST_AUTO_TEST_CASE(LongBeforeDSTForward) + { + WeekCron cron("0123456",75600); + // calc at: Sat Mar 28 22:00:00 CET 2009 + // expected next run: Sun Mar 29 21:00:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238353200), cron.get_next_run(1238274000)); + } - void AtDSTForward() - { - WeekCron cron("0123456",7200); - // calc at: Sun Mar 29 03:00:00 CEST 2009 - // expected next run: Mon Mar 30 02:00:00 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238371200), cron.get_next_run(1238288400)); - } + BOOST_AUTO_TEST_CASE(BeforeDSTForward1) + { - // TODO: resultat Mon Mar 30 02:00:00 CEST 2009 - + WeekCron cron("0123456",7200); + // calc at: Sun Mar 29 01:59:59 CET 2009 + // expected next run: Sun Mar 29 03:00:00 CEST 2009 + // glibc update: BOOST_CHECK_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); - BOOST_CHECK_EQUAL( static_cast(1238371200), cron.get_next_run(1238288399)); ++ BOOST_CHECK_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); + } + + BOOST_AUTO_TEST_CASE(BeforeDSTForward2) + { + WeekCron cron("0123456",0); + // calc at: Sun Mar 29 01:59:59 CET 2009 + // expected next run: Mon Mar 30 00:00:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238364000), cron.get_next_run(1238288399)); + } - void DuringDSTForward() - { - // TODO: resultat Mon Mar 30 02:30:00 CEST 2009 + BOOST_AUTO_TEST_CASE(AtDSTForward) + { + WeekCron cron("0123456",7200); + // calc at: Sun Mar 29 03:00:00 CEST 2009 + // expected next run: Mon Mar 30 02:00:00 2009 + BOOST_CHECK_EQUAL( static_cast(1238371200), cron.get_next_run(1238288400)); + } - WeekCron cron("0123456",9000); - // calc at: Sun Mar 29 01:59:59 CET 2009 - // expected next run: Sun Mar 29 03:30:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238290200), cron.get_next_run(1238288399)); - } + BOOST_AUTO_TEST_CASE(DuringDSTForward) + { - // TODO: resultat Mon Mar 30 02:30:00 CEST 2009 - + WeekCron cron("0123456",9000); + // calc at: Sun Mar 29 01:59:59 CET 2009 + // expected next run: Sun Mar 29 03:30:00 CEST 2009 + // glibc update: BOOST_CHECK_EQUAL( static_cast(1238290200), cron.get_next_run(1238288399)); - BOOST_CHECK_EQUAL( static_cast(1238373000), cron.get_next_run(1238288399)); ++ BOOST_CHECK_EQUAL( static_cast(1238290200), cron.get_next_run(1238288399)); + } + + BOOST_AUTO_TEST_CASE(EndDSTForward1) + { + WeekCron cron("0123456",10800); + // calc at: Sun Mar 29 01:59:59 CET 2009 + // expected next run: Sun Mar 29 03:00:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); + } - void EndDSTForward1() - { - WeekCron cron("0123456",10800); - // calc at: Sun Mar 29 01:59:59 CET 2009 - // expected next run: Sun Mar 29 03:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238288400), cron.get_next_run(1238288399)); - } + BOOST_AUTO_TEST_CASE(EndDSTForward2) + { + WeekCron cron("0123456",10800); + // calc at: Sun Mar 29 03:00:00 CEST 2009 + // expected next run: Mon Mar 30 03:00:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238374800), cron.get_next_run(1238288400)); + } - void EndDSTForward2() - { - WeekCron cron("0123456",10800); - // calc at: Sun Mar 29 03:00:00 CEST 2009 - // expected next run: Mon Mar 30 03:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238374800), cron.get_next_run(1238288400)); - } + BOOST_AUTO_TEST_CASE(EndDSTForward3) + { + WeekCron cron("0123456",10800); + // calc at: Sun Mar 29 04:00:00 CEST 2009 + // expected next run: Mon Mar 30 03:00:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238374800), cron.get_next_run(1238292000)); + } - void EndDSTForward3() - { - WeekCron cron("0123456",10800); - // calc at: Sun Mar 29 04:00:00 CEST 2009 - // expected next run: Mon Mar 30 03:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238374800), cron.get_next_run(1238292000)); - } + BOOST_AUTO_TEST_CASE(EndDSTForward4) + { + WeekCron cron("0123456",86339); + // calc at: Sun Mar 29 11:42:06 CEST 2009 + // expected next run: Sun Mar 29 23:58:59 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238363939), cron.get_next_run(1238319726)); + } - void EndDSTForward4() - { - WeekCron cron("0123456",86339); - // calc at: Sun Mar 29 11:42:06 CEST 2009 - // expected next run: Sun Mar 29 23:58:59 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238363939), cron.get_next_run(1238319726)); - } + BOOST_AUTO_TEST_CASE(OverDSTForward) + { + WeekCron cron("234",10800); + // calc at: Sat Mar 28 23:00:00 CET 2009 + // expected next run: Tue Mar 31 03:00:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238461200), cron.get_next_run(1238277600)); + } - void OverDSTForward() - { - WeekCron cron("234",10800); - // calc at: Sat Mar 28 23:00:00 CET 2009 - // expected next run: Tue Mar 31 03:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238461200), cron.get_next_run(1238277600)); - } + BOOST_AUTO_TEST_CASE(OverDSTForwardDaychange) + { + WeekCron cron("1234",0); + // calc at: Sun Mar 29 00:00:00 CET 2009 + // expected next run: Mon Mar 30 00:00:00 CEST 2009 + BOOST_CHECK_EQUAL( static_cast(1238364000), cron.get_next_run(1238281200)); + } - void OverDSTForwardDaychange() - { - WeekCron cron("1234",0); - // calc at: Sun Mar 29 00:00:00 CET 2009 - // expected next run: Mon Mar 30 00:00:00 CEST 2009 - CPPUNIT_ASSERT_EQUAL( static_cast(1238364000), cron.get_next_run(1238281200)); - } + BOOST_AUTO_TEST_CASE(StartHourStaysTheSameTill2038) + { + int daysec = 79200; - void StartHourStaysTheSameTill2038() + // Schedule daily at 22h from 1970 till 01.01.2038. Check every 90 minutes. + WeekCron cron("0123456", daysec); + for (time_t now = 86400*15; now < 2145916800; now += 90*60) { - int daysec = 79200; - - // Schedule daily at 22h from 1970 till 01.01.2038. Check every 90 minutes. - WeekCron cron("0123456", daysec); - for (time_t now = 86400*15; now < 2145916800; now += 90*60) - { - time_t result = cron.get_next_run(now); + time_t result = cron.get_next_run(now); - // Calculate unix time for the begin of the day - struct tm calc_daybegin; - bool conversion_ok = (localtime_r(&result, &calc_daybegin) != NULL); - CPPUNIT_ASSERT_EQUAL(true, conversion_ok); + // Calculate unix time for the begin of the day + struct tm calc_daybegin; + bool conversion_ok = (localtime_r(&result, &calc_daybegin) != NULL); + BOOST_CHECK_EQUAL(true, conversion_ok); - int remain=daysec; + int remain=daysec; - calc_daybegin.tm_hour=remain/3600; - remain-=calc_daybegin.tm_hour*3600; + calc_daybegin.tm_hour=remain/3600; + remain-=calc_daybegin.tm_hour*3600; - calc_daybegin.tm_min=remain/60; - remain-=calc_daybegin.tm_min*60; + calc_daybegin.tm_min=remain/60; + remain-=calc_daybegin.tm_min*60; - calc_daybegin.tm_sec=remain; + calc_daybegin.tm_sec=remain; - // tm_isdst=-1 means to use the dst in use at the given time - calc_daybegin.tm_isdst=-1; + // tm_isdst=-1 means to use the dst in use at the given time + calc_daybegin.tm_isdst=-1; - time_t daytime = mktime(&calc_daybegin); + time_t daytime = mktime(&calc_daybegin); - CPPUNIT_ASSERT_EQUAL(daytime, result); - } + BOOST_CHECK_EQUAL(daytime, result); } - }; + } - CPPUNIT_TEST_SUITE_REGISTRATION(TestCronPointFunc); + BOOST_AUTO_TEST_SUITE_END()