makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 13:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12099] Clean paths in tests

Browse source 
PHPBB3-12099
This commit is contained in:
Joas Schilling 2014-05-11 15:36:26 +02:00
parent 58cfdfe143
commit b8f3972afa
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tests/path_helper/path_helper_test.php
View file

@ -21,7 +21,8 @@ class phpbb_path_helper_test extends phpbb_test_case
{ {
parent::setUp(); parent::setUp();
$this->set_phpbb_root_path(); $filesystem = new \phpbb\filesystem();
$this->set_phpbb_root_path($filesystem);
$this->path_helper = new \phpbb\path_helper( $this->path_helper = new \phpbb\path_helper(
new \phpbb\symfony_request( new \phpbb\symfony_request(
@ -41,9 +42,9 @@ class phpbb_path_helper_test extends phpbb_test_case
* any time we wish to use it in one of these functions (and * any time we wish to use it in one of these functions (and
* also in general for everything else) * also in general for everything else)
*/ */
public function set_phpbb_root_path() public function set_phpbb_root_path($filesystem)
{ {
$this->phpbb_root_path = dirname(__FILE__) . '/../../phpBB/'; $this->phpbb_root_path = $filesystem->clean_path(dirname(__FILE__) . '/../../phpBB/');
} }
public function test_get_web_root_path() public function test_get_web_root_path()
@ -54,7 +55,8 @@ class phpbb_path_helper_test extends phpbb_test_case
public function basic_update_web_root_path_data() public function basic_update_web_root_path_data()
{ {
$this->set_phpbb_root_path(); $filesystem = new \phpbb\filesystem();
$this->set_phpbb_root_path($filesystem);
return array( return array(
array( array(
@ -72,7 +74,7 @@ class phpbb_path_helper_test extends phpbb_test_case
), ),
array( array(
$this->phpbb_root_path . $this->phpbb_root_path . 'test.php', $this->phpbb_root_path . $this->phpbb_root_path . 'test.php',
$this->phpbb_root_path . $this->phpbb_root_path . 'test.php', $filesystem->clean_path($this->phpbb_root_path . $this->phpbb_root_path . 'test.php'),
), ),
); );
} }
@ -87,43 +89,43 @@ class phpbb_path_helper_test extends phpbb_test_case
public function update_web_root_path_data() public function update_web_root_path_data()
{ {
$this->set_phpbb_root_path(); $this->set_phpbb_root_path(new \phpbb\filesystem());
return array( return array(
array( array(
$this->phpbb_root_path . 'test.php', $this->phpbb_root_path . 'test.php',
$this->phpbb_root_path . 'test.php', '',
'/', '/',
), ),
array( array(
$this->phpbb_root_path . 'test.php', $this->phpbb_root_path . 'test.php',
$this->phpbb_root_path . '../test.php', '../',
'//', '//',
), ),
array( array(
$this->phpbb_root_path . 'test.php', $this->phpbb_root_path . 'test.php',
$this->phpbb_root_path . '../test.php', '../',
'//', '//',
'foo/bar.php', 'foo/bar.php',
'bar.php', 'bar.php',
), ),
array( array(
$this->phpbb_root_path . 'test.php', $this->phpbb_root_path . 'test.php',
$this->phpbb_root_path . '../../test.php', '../../',
'/foo/template', '/foo/template',
'/phpbb3-fork/phpBB/app.php/foo/template', '/phpbb3-fork/phpBB/app.php/foo/template',
'/phpbb3-fork/phpBB/app.php', '/phpbb3-fork/phpBB/app.php',
), ),
array( array(
$this->phpbb_root_path . 'test.php', $this->phpbb_root_path . 'test.php',
$this->phpbb_root_path . '../test.php', '../',
'/foo/template', '/foo/template',
'/phpbb3-fork/phpBB/foo/template', '/phpbb3-fork/phpBB/foo/template',
'/phpbb3-fork/phpBB/app.php', '/phpbb3-fork/phpBB/app.php',
), ),
array( array(
$this->phpbb_root_path . 'test.php', $this->phpbb_root_path . 'test.php',
$this->phpbb_root_path . '../test.php', '../',
'/', '/',
'/phpbb3-fork/phpBB/app.php/', '/phpbb3-fork/phpBB/app.php/',
'/phpbb3-fork/phpBB/app.php', '/phpbb3-fork/phpBB/app.php',
@ -134,7 +136,7 @@ class phpbb_path_helper_test extends phpbb_test_case
/** /**
* @dataProvider update_web_root_path_data * @dataProvider update_web_root_path_data
*/ */
public function test_update_web_root_path($input, $expected, $getPathInfo, $getRequestUri = null, $getScriptName = null) public function test_update_web_root_path($input, $correction, $getPathInfo, $getRequestUri = null, $getScriptName = null)
{ {
$symfony_request = $this->getMock('\phpbb\symfony_request', array(), array( $symfony_request = $this->getMock('\phpbb\symfony_request', array(), array(
new phpbb_mock_request(), new phpbb_mock_request(),
@ -156,7 +158,7 @@ class phpbb_path_helper_test extends phpbb_test_case
'php' 'php'
); );
$this->assertEquals($expected, $path_helper->update_web_root_path($input, $symfony_request)); $this->assertEquals($correction . $input, $path_helper->update_web_root_path($input, $symfony_request));
} }
public function clean_url_data() public function clean_url_data()