From f55aa856ad74d1bbad61980aee3c00b971c8669c Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 3 Jul 2015 15:41:29 +0200 Subject: Remove file mapper - was only use in Windows and never worked properly --- tests/lib/files/mapper.php | 89 ---------------------- tests/lib/files/storage/mappedlocal.php | 43 ----------- .../files/storage/mappedlocalwithdotteddatadir.php | 45 ----------- tests/lib/testcase.php | 13 ---- 4 files changed, 190 deletions(-) delete mode 100644 tests/lib/files/mapper.php delete mode 100644 tests/lib/files/storage/mappedlocal.php delete mode 100644 tests/lib/files/storage/mappedlocalwithdotteddatadir.php (limited to 'tests') diff --git a/tests/lib/files/mapper.php b/tests/lib/files/mapper.php deleted file mode 100644 index cd35d4f8fc3..00000000000 --- a/tests/lib/files/mapper.php +++ /dev/null @@ -1,89 +0,0 @@ -. - * - */ - -namespace Test\Files; - -class Mapper extends \Test\TestCase { - - /** - * @var \OC\Files\Mapper - */ - private $mapper = null; - - protected function setUp() { - parent::setUp(); - $this->mapper = new \OC\Files\Mapper('D:/'); - } - - public function slugifyPathData() { - return array( - // with extension - array('D:/text.txt', 'D:/text.txt'), - array('D:/text-2.txt', 'D:/text.txt', 2), - array('D:/a/b/text.txt', 'D:/a/b/text.txt'), - - // without extension - array('D:/text', 'D:/text'), - array('D:/text-2', 'D:/text', 2), - array('D:/a/b/text', 'D:/a/b/text'), - - // with double dot - array('D:/text.text.txt', 'D:/text.text.txt'), - array('D:/text.text-2.txt', 'D:/text.text.txt', 2), - array('D:/a/b/text.text.txt', 'D:/a/b/text.text.txt'), - - // foldername and filename with periods - array('D:/folder.name.with.periods', 'D:/folder.name.with.periods'), - array('D:/folder.name.with.periods/test-2.txt', 'D:/folder.name.with.periods/test.txt', 2), - array('D:/folder.name.with.periods/test.txt', 'D:/folder.name.with.periods/test.txt'), - - // foldername and filename with periods and spaces - array('D:/folder.name.with.peri-ods', 'D:/folder.name.with.peri ods'), - array('D:/folder.name.with.peri-ods/te-st-2.t-x-t', 'D:/folder.name.with.peri ods/te st.t x t', 2), - array('D:/folder.name.with.peri-ods/te-st.t-x-t', 'D:/folder.name.with.peri ods/te st.t x t'), - - /** - * If a foldername is empty, after we stripped out some unicode and other characters, - * the resulting name must be reproducable otherwise uploading a file into that folder - * will not write the file into the same folder. - */ - array('D:/' . md5('ありがとう'), 'D:/ありがとう'), - array('D:/' . md5('ありがとう') . '/issue6722.txt', 'D:/ありがとう/issue6722.txt'), - array('D:/' . md5('.htaccess'), 'D:/.htaccess'), - array('D:/' . md5('.htaccess.'), 'D:/.htaccess.'), - array('D:/' . md5('.htAccess'), 'D:/.htAccess'), - array('D:/' . md5('.htAccess\\…\\') . '/a', 'D:/.htAccess\…\/とa'), - array('D:/' . md5('.htaccess-'), 'D:/.htaccess-'), - array('D:/' . md5('.htaあccess'), 'D:/.htaあccess'), - array('D:/' . md5(' .htaccess'), 'D:/ .htaccess'), - array('D:/' . md5('.htaccess '), 'D:/.htaccess '), - array('D:/' . md5(' .htaccess '), 'D:/ .htaccess '), - ); - } - - /** - * @dataProvider slugifyPathData - */ - public function testSlugifyPath($slug, $path, $index = null) { - $this->assertEquals($slug, $this->mapper->slugifyPath($path, $index)); - } -} diff --git a/tests/lib/files/storage/mappedlocal.php b/tests/lib/files/storage/mappedlocal.php deleted file mode 100644 index 1e87b53d00a..00000000000 --- a/tests/lib/files/storage/mappedlocal.php +++ /dev/null @@ -1,43 +0,0 @@ -. -* -*/ - -namespace Test\Files\Storage; - -class MappedLocal extends Storage { - /** - * @var string tmpDir - */ - private $tmpDir; - protected function setUp() { - parent::setUp(); - - $this->tmpDir=\OC_Helper::tmpFolder(); - $this->instance=new \OC\Files\Storage\MappedLocal(array('datadir'=>$this->tmpDir)); - } - - protected function tearDown() { - \OC_Helper::rmdirr($this->tmpDir); - unset($this->instance); - parent::tearDown(); - } -} - diff --git a/tests/lib/files/storage/mappedlocalwithdotteddatadir.php b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php deleted file mode 100644 index 3a733b7b469..00000000000 --- a/tests/lib/files/storage/mappedlocalwithdotteddatadir.php +++ /dev/null @@ -1,45 +0,0 @@ -. -* -*/ - -namespace Test\Files\Storage; - -class MappedLocalWithDottedDataDir extends Storage { - /** - * @var string tmpDir - */ - private $tmpDir; - - protected function setUp() { - parent::setUp(); - - $this->tmpDir = \OC_Helper::tmpFolder().'dir.123'.DIRECTORY_SEPARATOR; - mkdir($this->tmpDir); - $this->instance=new \OC\Files\Storage\MappedLocal(array('datadir'=>$this->tmpDir)); - } - - protected function tearDown() { - \OC_Helper::rmdirr($this->tmpDir); - unset($this->instance); - parent::tearDown(); - } -} - diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php index 407c5165140..fd0b8d5f2de 100644 --- a/tests/lib/testcase.php +++ b/tests/lib/testcase.php @@ -99,7 +99,6 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { public static function tearDownAfterClass() { $dataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data-autotest'); - self::tearDownAfterClassCleanFileMapper($dataDir); self::tearDownAfterClassCleanStorages(); self::tearDownAfterClassCleanFileCache(); self::tearDownAfterClassCleanStrayDataFiles($dataDir); @@ -109,18 +108,6 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase { parent::tearDownAfterClass(); } - /** - * Remove all entries from the files map table - * - * @param string $dataDir - */ - static protected function tearDownAfterClassCleanFileMapper($dataDir) { - if (\OC_Util::runningOnWindows()) { - $mapper = new \OC\Files\Mapper($dataDir); - $mapper->removePath($dataDir, true, true); - } - } - /** * Remove all entries from the storages table * -- cgit v1.2.3