danielc                                  Fri, 11 Feb 2011 01:33:45 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=308245

Log:
Add DateInterval format() tests.

Changed paths:
    A   php/php-src/branches/PHP_5_3/ext/date/tests/DateInterval_format.phpt
    A   php/php-src/branches/PHP_5_3/ext/date/tests/DateInterval_format_a.phpt
    A   php/php-src/trunk/ext/date/tests/DateInterval_format.phpt
    A   php/php-src/trunk/ext/date/tests/DateInterval_format_a.phpt

Added: php/php-src/branches/PHP_5_3/ext/date/tests/DateInterval_format.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/date/tests/DateInterval_format.phpt        
                        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/DateInterval_format.phpt        
2011-02-11 01:33:45 UTC (rev 308245)
@@ -0,0 +1,70 @@
+--TEST--
+DateInterval::format(), except %a
+--DESCRIPTION--
+%a is covered in a separate test.
+Don't want an XFAIL here to cause confusion if a real bug comes up.
+--CREDITS--
+Daniel Convissor <dani...@php.net>
+# TestFest 2010 BKTK
+--SKIPIF--
+<?php if (!method_exists('DateInterval', 'format')) die("skip: method doesn't 
exist"); ?>
+--FILE--
+<?php
+
+$date1 = new DateTime('2000-01-01 00:00:00');
+$date2 = new DateTime('2001-03-04 04:05:06');
+
+$interval = $date1->diff($date2);
+
+echo $interval->format('Y=%Y') . "\n";
+echo $interval->format('M=%M') . "\n";
+echo $interval->format('D=%D') . "\n";
+echo $interval->format('H=%H') . "\n";
+echo $interval->format('I=%I') . "\n";
+echo $interval->format('S=%S') . "\n";
+echo $interval->format('R=%R') . "\n";
+
+echo $interval->format('y=%y') . "\n";
+echo $interval->format('m=%m') . "\n";
+echo $interval->format('d=%d') . "\n";
+echo $interval->format('h=%h') . "\n";
+echo $interval->format('i=%i') . "\n";
+echo $interval->format('s=%s') . "\n";
+echo $interval->format('r=%r') . "\n";
+
+echo "\n";
+
+$interval = $date2->diff($date1);
+
+echo $interval->format('inverted R=%R') . "\n";
+echo $interval->format('inverted r=%r') . "\n";
+
+echo "\n";
+
+echo $interval->format('%=%%') . "\n";
+
+// Invalid valid format character does not raise warnings.
+echo $interval->format('x=%x') . "\n";
+
+?>
+--EXPECT--
+Y=01
+M=02
+D=03
+H=04
+I=05
+S=06
+R=+
+y=1
+m=2
+d=3
+h=4
+i=5
+s=6
+r=
+
+inverted R=-
+inverted r=-
+
+%=%
+x=%x

Added: php/php-src/branches/PHP_5_3/ext/date/tests/DateInterval_format_a.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/date/tests/DateInterval_format_a.phpt      
                        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/DateInterval_format_a.phpt      
2011-02-11 01:33:45 UTC (rev 308245)
@@ -0,0 +1,22 @@
+--TEST--
+DateInterval::format(), %a
+--CREDITS--
+Daniel Convissor <dani...@php.net>
+# TestFest 2010 BKTK
+--SKIPIF--
+<?php if (!method_exists('DateInterval', 'format')) die("skip: method doesn't 
exist"); ?>
+--XFAIL--
+Windows VC6 libs' floor()/ceil() choke on floats
+--FILE--
+<?php
+
+$date1 = new DateTime('2000-01-01 00:00:00');
+$date2 = new DateTime('2001-03-04 04:05:06');
+
+$interval = $date1->diff($date2);
+
+echo $interval->format('a=%a') . "\n";
+
+?>
+--EXPECT--
+a=428

Added: php/php-src/trunk/ext/date/tests/DateInterval_format.phpt
===================================================================
--- php/php-src/trunk/ext/date/tests/DateInterval_format.phpt                   
        (rev 0)
+++ php/php-src/trunk/ext/date/tests/DateInterval_format.phpt   2011-02-11 
01:33:45 UTC (rev 308245)
@@ -0,0 +1,70 @@
+--TEST--
+DateInterval::format(), except %a
+--DESCRIPTION--
+%a is covered in a separate test.
+Don't want an XFAIL here to cause confusion if a real bug comes up.
+--CREDITS--
+Daniel Convissor <dani...@php.net>
+# TestFest 2010 BKTK
+--SKIPIF--
+<?php if (!method_exists('DateInterval', 'format')) die("skip: method doesn't 
exist"); ?>
+--FILE--
+<?php
+
+$date1 = new DateTime('2000-01-01 00:00:00');
+$date2 = new DateTime('2001-03-04 04:05:06');
+
+$interval = $date1->diff($date2);
+
+echo $interval->format('Y=%Y') . "\n";
+echo $interval->format('M=%M') . "\n";
+echo $interval->format('D=%D') . "\n";
+echo $interval->format('H=%H') . "\n";
+echo $interval->format('I=%I') . "\n";
+echo $interval->format('S=%S') . "\n";
+echo $interval->format('R=%R') . "\n";
+
+echo $interval->format('y=%y') . "\n";
+echo $interval->format('m=%m') . "\n";
+echo $interval->format('d=%d') . "\n";
+echo $interval->format('h=%h') . "\n";
+echo $interval->format('i=%i') . "\n";
+echo $interval->format('s=%s') . "\n";
+echo $interval->format('r=%r') . "\n";
+
+echo "\n";
+
+$interval = $date2->diff($date1);
+
+echo $interval->format('inverted R=%R') . "\n";
+echo $interval->format('inverted r=%r') . "\n";
+
+echo "\n";
+
+echo $interval->format('%=%%') . "\n";
+
+// Invalid valid format character does not raise warnings.
+echo $interval->format('x=%x') . "\n";
+
+?>
+--EXPECT--
+Y=01
+M=02
+D=03
+H=04
+I=05
+S=06
+R=+
+y=1
+m=2
+d=3
+h=4
+i=5
+s=6
+r=
+
+inverted R=-
+inverted r=-
+
+%=%
+x=%x

Added: php/php-src/trunk/ext/date/tests/DateInterval_format_a.phpt
===================================================================
--- php/php-src/trunk/ext/date/tests/DateInterval_format_a.phpt                 
        (rev 0)
+++ php/php-src/trunk/ext/date/tests/DateInterval_format_a.phpt 2011-02-11 
01:33:45 UTC (rev 308245)
@@ -0,0 +1,22 @@
+--TEST--
+DateInterval::format(), %a
+--CREDITS--
+Daniel Convissor <dani...@php.net>
+# TestFest 2010 BKTK
+--SKIPIF--
+<?php if (!method_exists('DateInterval', 'format')) die("skip: method doesn't 
exist"); ?>
+--XFAIL--
+Windows VC6 libs' floor()/ceil() choke on floats
+--FILE--
+<?php
+
+$date1 = new DateTime('2000-01-01 00:00:00');
+$date2 = new DateTime('2001-03-04 04:05:06');
+
+$interval = $date1->diff($date2);
+
+echo $interval->format('a=%a') . "\n";
+
+?>
+--EXPECT--
+a=428

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to