geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-14 19:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix two failed unit tests on Windows:

Browse Source 
1. fopen() cannot handle directory, replaced by opendir() for getting a testing resource. (also double check a resource is opened)
2. comparing paths by assertEquals() which has mixed '\' and '/' on Windows.
This commit is contained in:
Johnny
2015-05-07 13:01:06 +08:00
parent 7d5fe0fbd4
commit 9d7163e47d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Twig/Tests/Fixtures/tests/in.test
+3 -1
View File
@@ -50,6 +50,7 @@ TRUE
{{ [] in [true, ''] ? 'TRUE' : 'FALSE' }}
{{ [] in [true, []] ? 'TRUE' : 'FALSE' }}
{{ resource ? 'TRUE' : 'FALSE' }}
{{ resource in 'foo'~resource ? 'TRUE' : 'FALSE' }}
{{ object in 'stdClass' ? 'TRUE' : 'FALSE' }}
{{ [] in 'Array' ? 'TRUE' : 'FALSE' }}
@@ -73,7 +74,7 @@ TRUE
{{ 5.5 in '125.5' ? 'TRUE' : 'FALSE' }}
{{ '5.5' in 125.5 ? 'TRUE' : 'FALSE' }}
--DATA--
return array('bar' => 'bar', 'foo' => array('bar' => 'bar'), 'dir_object' => new SplFileInfo(dirname(__FILE__)), 'object' => new stdClass(), 'resource' => fopen(dirname(__FILE__), 'r'))
return array('bar' => 'bar', 'foo' => array('bar' => 'bar'), 'dir_object' => new SplFileInfo(dirname(__FILE__)), 'object' => new stdClass(), 'resource' => opendir(dirname(__FILE__)))
--EXPECT--
TRUE
TRUE
@@ -102,6 +103,7 @@ TRUE
FALSE
TRUE
TRUE
FALSE
FALSE
FALSE
test/Twig/Tests/Loader/FilesystemTest.php
+2 -2
View File
@@ -78,8 +78,8 @@ class Twig_Tests_Loader_FilesystemTest extends PHPUnit_Framework_TestCase
), $loader->getPaths('named'));
$this->assertEquals(
$basePath.'/named_quater/named_absolute.html',
$loader->getCacheKey('@named/named_absolute.html')
realpath($basePath.'/named_quater/named_absolute.html'),
realpath($loader->getCacheKey('@named/named_absolute.html'))
);
$this->assertEquals("path (final)\n", $loader->getSource('index.html'));
$this->assertEquals("path (final)\n", $loader->getSource('@__main__/index.html'));