geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-12 10:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

added the possibility to skip some tests depending on the PHP version

Browse Source
This commit is contained in:
Fabien Potencier
2012-01-24 13:03:09 +01:00
parent a57804d204
commit 0f9d7ffb4c
3 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Twig/Tests/Fixtures/filters/date_default_format_interval.test
+16
View File
@@ -0,0 +1,16 @@
--TEST--
"date" filter (interval support as of PHP 5.3)
--PHP--
5.3.0
--TEMPLATE--
{{ date2|date }}
{{ date2|date('%d days') }}
--DATA--
date_default_timezone_set('UTC');
$twig->getExtension('core')->setDateFormat('Y-m-d', '%d days %h hours');
return array(
'date2' => new DateInterval('P2D'),
)
--EXPECT--
2 days 0 hours
2 days
test/Twig/Tests/Fixtures/filters/date_interval.test
+16
View File
@@ -0,0 +1,16 @@
--TEST--
"date" filter (interval support as of PHP 5.3)
--PHP--
5.3.0
--TEMPLATE--
{{ date6|date }}
{{ date6|date('%d days %h hours') }}
--DATA--
date_default_timezone_set('UTC');
return array(
'date5' => -86410,
'date6' => new DateInterval('P2D'),
)
--EXPECT--
2 days
2 days 0 hours
test/Twig/Tests/integrationTest.php
+14 -7
View File
@@ -23,21 +23,24 @@ class Twig_Tests_IntegrationTest extends PHPUnit_Framework_TestCase
$test = file_get_contents($file->getRealpath());
if (preg_match('/--TEST--\s*(.*?)\s*((?:--TEMPLATE(?:\(.*?\))?--(?:.*))+)\s*--EXCEPTION--\s*(.*)/s', $test, $match)) {
if (preg_match('/
--TEST--\s*(.*?)\s*(?:--PHP--\s*(.*))?\s*((?:--TEMPLATE(?:\(.*?\))?--(?:.*))+)\s*--EXCEPTION--\s*(.*)/sx', $test, $match)) {
$message = $match[1];
$exception = $match[3];
$templates = $this->parseTemplates($match[2]);
$php = $match[2];
$templates = $this->parseTemplates($match[3]);
$exception = $match[4];
$outputs = array();
} elseif (preg_match('/--TEST--\s*(.*?)\s*((?:--TEMPLATE(?:\(.*?\))?--(?:.*?))+)--DATA--.*?--EXPECT--.*/s', $test, $match)) {
} elseif (preg_match('/--TEST--\s*(.*?)\s*(?:--PHP--\s*(.*))?\s*((?:--TEMPLATE(?:\(.*?\))?--(?:.*?))+)--DATA--.*?--EXPECT--.*/s', $test, $match)) {
$message = $match[1];
$php = $match[2];
$templates = $this->parseTemplates($match[3]);
$exception = false;
$templates = $this->parseTemplates($match[2]);
preg_match_all('/--DATA--(.*?)(?:--CONFIG--(.*?))?--EXPECT--(.*?)(?=\-\-DATA\-\-|$)/s', $test, $outputs, PREG_SET_ORDER);
} else {
throw new InvalidArgumentException(sprintf('Test "%s" is not valid.', str_replace($fixturesDir.'/', '', $file)));
}
$tests[] = array(str_replace($fixturesDir.'/', '', $file), $message, $templates, $exception, $outputs);
$tests[] = array(str_replace($fixturesDir.'/', '', $file), $message, $php, $templates, $exception, $outputs);
}
return $tests;
@@ -46,8 +49,12 @@ class Twig_Tests_IntegrationTest extends PHPUnit_Framework_TestCase
/**
* @dataProvider getTests
*/
public function testIntegration($file, $message, $templates, $exception, $outputs)
public function testIntegration($file, $message, $php, $templates, $exception, $outputs)
{
if ($php && version_compare(phpversion(), $php, "<")) {
$this->markTestSkipped('Need PHP >= '.$php);
}
$loader = new Twig_Loader_Array($templates);
foreach ($outputs as $match) {