cvs: pear /Date_Holidays/Holidays Driver.php /Date_Holidays/tests Date_Holidays_Driver_TestSuite.php

luckec Wed Oct 26 16:57:48 2005 EDT Modified files: /pear/Date_Holidays/Holidays Driver.php /pear/Date_Holidays/tests Date_Holidays_Driver_TestSuite.php Log: complemented unit-test for getHolidayForDate() http://cvs.php.net/diff.php/pear/Date_Holidays/Holidays/Driver.php?r1=1.16&r2=1.17&ty=u Index: pear/Date_Holidays/Holidays/Driver.php diff -u pear/Date_Holidays/Holidays/Driver.php:1.16 pear/Date_Holidays/Holidays/Driver.php:1.17 --- pear/Date_Holidays/Holidays/Driver.php:1.16 Tue Oct 18 12:24:28 2005 +++ pear/Date_Holidays/Holidays/Driver.php Wed Oct 26 16:57:46 2005 @@ -16,7 +16,7 @@ // | Authors: Carsten Lucke <luckec@tool-garage.de> | // +----------------------------------------------------------------------+ // -// $Id: Driver.php,v 1.16 2005/10/18 16:24:28 luckec Exp $s +// $Id: Driver.php,v 1.17 2005/10/26 20:57:46 luckec Exp $s /** * uses PEAR_Errorstack @@ -88,7 +88,7 @@ * @category Date * @package Date_Holidays * @subpackage Driver - * @version $Id: Driver.php,v 1.16 2005/10/18 16:24:28 luckec Exp $ + * @version $Id: Driver.php,v 1.17 2005/10/26 20:57:46 luckec Exp $ * @author Carsten Lucke <luckec@tool-garage.de> */ class Date_Holidays_Driver @@ -622,7 +622,7 @@ } if (is_int($date)) { - $date = &new Date($date); + $date = &new Date(date('Y-m-d', $date)); return $date; } http://cvs.php.net/diff.php/pear/Date_Holidays/tests/Date_Holidays_Driver_TestSuite.php?r1=1.2&r2=1.3&ty=u Index: pear/Date_Holidays/tests/Date_Holidays_Driver_TestSuite.php diff -u pear/Date_Holidays/tests/Date_Holidays_Driver_TestSuite.php:1.2 pear/Date_Holidays/tests/Date_Holidays_Driver_TestSuite.php:1.3 --- pear/Date_Holidays/tests/Date_Holidays_Driver_TestSuite.php:1.2 Sun Sep 11 17:44:55 2005 +++ pear/Date_Holidays/tests/Date_Holidays_Driver_TestSuite.php Wed Oct 26 16:57:48 2005 @@ -129,6 +129,19 @@ $this->assertTrue(is_a($holiday, 'Date_Holidays_Holiday')); } + $germany =& Date_Holidays::factory('Germany', 2005, 'de_DE'); +// $holidays = $germany->getHolidayForDate('2005-10-30', null, true); + $holidays = $germany->getHolidayForDate(1130623200, null, true); + +// print_r(date('Y-m-d', 1130623200)); +// print_r(new Date(1130623200)); + + $this->assertEquals(2, count($holidays)); + for ($i = 0; $i < count($holidays); ++$i) { + $this->assertContains( + $holidays[$i]->getInternalName(), + array('savingsDay', 'stampsDay')); + } } function testGetHolidayProperties()