2 files changed, 1 insertions, 149 deletions
diff --git a/tests/filesystem/clean_path_test.php b/tests/filesystem/clean_path_test.php
index 5b9857ef2c..fedadc103b 100644
--- a/tests/filesystem/clean_path_test.php
+++ b/tests/filesystem/clean_path_test.php
@@ -14,13 +14,7 @@ class phpbb_filesystem_clean_path_test extends phpbb_test_case
 	public function setUp()
 	{
 		parent::setUp();
-		$this->filesystem = new \phpbb\filesystem(
-			new \phpbb\symfony_request(
-				new phpbb_mock_request()
-			),
-			dirname(__FILE__) . './../../phpBB/',
-			'php'
-		);
+		$this->filesystem = new \phpbb\filesystem();
 	}
 
 	public function clean_path_data()
diff --git a/tests/filesystem/web_root_path_test.php b/tests/filesystem/web_root_path_test.php
deleted file mode 100644
index e0f716cdae..0000000000
--- a/tests/filesystem/web_root_path_test.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-class phpbb_filesystem_web_root_path_test extends phpbb_test_case
-{
-	protected $filesystem;
-	protected $phpbb_root_path = '';
-
-	public function setUp()
-	{
-		parent::setUp();
-
-		$this->set_phpbb_root_path();
-
-		$this->filesystem = new \phpbb\filesystem(
-			new \phpbb\symfony_request(
-				new phpbb_mock_request()
-			),
-			$this->phpbb_root_path,
-			'php'
-		);
-	}
-
-	/**
-	* Set the phpbb_root_path
-	*
-	* This is necessary because dataProvider functions are called
-	*	before setUp or setUpBeforeClass; so we must set the path
-	*	any time we wish to use it in one of these functions (and
-	*	also in general for everything else)
-	*/
-	public function set_phpbb_root_path()
-	{
-		$this->phpbb_root_path = dirname(__FILE__) . './../../phpBB/';
-	}
-
-	public function test_get_web_root_path()
-	{
-		// Symfony Request = null, so always should return phpbb_root_path
-		$this->assertEquals($this->phpbb_root_path, $this->filesystem->get_web_root_path());
-	}
-
-	public function basic_update_web_root_path_data()
-	{
-		$this->set_phpbb_root_path();
-
-		return array(
-			array(
-				$this->phpbb_root_path . 'test.php',
-				$this->phpbb_root_path . 'test.php',
-			),
-			array(
-				'test.php',
-				$this->phpbb_root_path . 'test.php',
-			),
-			array(
-				$this->phpbb_root_path . $this->phpbb_root_path . 'test.php',
-				$this->phpbb_root_path . $this->phpbb_root_path . 'test.php',
-			),
-		);
-	}
-
-	/**
-	* @dataProvider basic_update_web_root_path_data
-	*/
-	public function test_basic_update_web_root_path($input, $expected)
-	{
-		$this->assertEquals($expected, $this->filesystem->update_web_root_path($input, $symfony_request));
-	}
-
-	public function update_web_root_path_data()
-	{
-		$this->set_phpbb_root_path();
-
-		return array(
-			array(
-				$this->phpbb_root_path . 'test.php',
-				$this->phpbb_root_path . 'test.php',
-				'/',
-			),
-			array(
-				$this->phpbb_root_path . 'test.php',
-				$this->phpbb_root_path . '../test.php',
-				'//',
-			),
-			array(
-				$this->phpbb_root_path . 'test.php',
-				$this->phpbb_root_path . '../test.php',
-				'//',
-				'foo/bar.php',
-				'bar.php',
-			),
-			array(
-				$this->phpbb_root_path . 'test.php',
-				$this->phpbb_root_path . '../../test.php',
-				'/foo/template',
-				'/phpbb3-fork/phpBB/app.php/foo/template',
-				'/phpbb3-fork/phpBB/app.php',
-			),
-			array(
-				$this->phpbb_root_path . 'test.php',
-				$this->phpbb_root_path . '../test.php',
-				'/foo/template',
-				'/phpbb3-fork/phpBB/foo/template',
-				'/phpbb3-fork/phpBB/app.php',
-			),
-		);
-	}
-
-	/**
-	* @dataProvider update_web_root_path_data
-	*/
-	public function test_update_web_root_path($input, $expected, $getPathInfo, $getRequestUri = null, $getScriptName = null)
-	{
-		$symfony_request = $this->getMock("\phpbb\symfony_request", array(), array(
-			new phpbb_mock_request(),
-		));
-		$symfony_request->expects($this->any())
-			->method('getPathInfo')
-			->will($this->returnValue($getPathInfo));
-		$symfony_request->expects($this->any())
-			->method('getRequestUri')
-			->will($this->returnValue($getRequestUri));
-		$symfony_request->expects($this->any())
-			->method('getScriptName')
-			->will($this->returnValue($getScriptName));
-
-		$filesystem = new \phpbb\filesystem(
-			$symfony_request,
-			$this->phpbb_root_path,
-			'php'
-		);
-
-		$this->assertEquals($expected, $filesystem->update_web_root_path($input, $symfony_request));
-	}
-}