mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use a data provider instead of calling the function manually everytime

This commit is contained in:
Joas Schilling 2014-08-25 14:44:51 +02:00
parent 51c9b3c62d
commit 6a7be8a36a
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
tests/lib/files/mapper.php
View File

@ -33,45 +33,47 @@ class Mapper extends \PHPUnit_Framework_TestCase {
$this->mapper = new \OC\Files\Mapper('D:/'); $this->mapper = new \OC\Files\Mapper('D:/');
} }
public function testSlugifyPath() { public function slugifyPathData() {
// with extension return array(
$this->assertEquals('D:/text.txt', $this->mapper->slugifyPath('D:/text.txt')); // with extension
$this->assertEquals('D:/text-2.txt', $this->mapper->slugifyPath('D:/text.txt', 2)); array('D:/text.txt', 'D:/text.txt'),
$this->assertEquals('D:/a/b/text.txt', $this->mapper->slugifyPath('D:/a/b/text.txt')); array('D:/text-2.txt', 'D:/text.txt', 2),
array('D:/a/b/text.txt', 'D:/a/b/text.txt'),
// without extension // without extension
$this->assertEquals('D:/text', $this->mapper->slugifyPath('D:/text')); array('D:/text', 'D:/text'),
$this->assertEquals('D:/text-2', $this->mapper->slugifyPath('D:/text', 2)); array('D:/text-2', 'D:/text', 2),
$this->assertEquals('D:/a/b/text', $this->mapper->slugifyPath('D:/a/b/text')); array('D:/a/b/text', 'D:/a/b/text'),
// with double dot // with double dot
$this->assertEquals('D:/text.text.txt', $this->mapper->slugifyPath('D:/text.text.txt')); array('D:/text.text.txt', 'D:/text.text.txt'),
$this->assertEquals('D:/text.text-2.txt', $this->mapper->slugifyPath('D:/text.text.txt', 2)); array('D:/text.text-2.txt', 'D:/text.text.txt', 2),
$this->assertEquals('D:/a/b/text.text.txt', $this->mapper->slugifyPath('D:/a/b/text.text.txt')); array('D:/a/b/text.text.txt', 'D:/a/b/text.text.txt'),
// foldername and filename with periods
$this->assertEquals('D:/folder.name.with.periods', $this->mapper->slugifyPath('D:/folder.name.with.periods'));
$this->assertEquals('D:/folder.name.with.periods/test-2.txt', $this->mapper->slugifyPath('D:/folder.name.with.periods/test.txt', 2));
$this->assertEquals('D:/folder.name.with.periods/test.txt', $this->mapper->slugifyPath('D:/folder.name.with.periods/test.txt'));
// foldername and filename with periods and spaces // foldername and filename with periods
$this->assertEquals('D:/folder.name.with.peri-ods', $this->mapper->slugifyPath('D:/folder.name.with.peri ods')); array('D:/folder.name.with.periods', 'D:/folder.name.with.periods'),
$this->assertEquals('D:/folder.name.with.peri-ods/te-st-2.t-x-t', $this->mapper->slugifyPath('D:/folder.name.with.peri ods/te st.t x t', 2)); array('D:/folder.name.with.periods/test-2.txt', 'D:/folder.name.with.periods/test.txt', 2),
$this->assertEquals('D:/folder.name.with.peri-ods/te-st.t-x-t', $this->mapper->slugifyPath('D:/folder.name.with.peri ods/te st.t x t')); 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'),
);
} }
/** /**
* If a foldername is empty, after we stripped out some unicode and other characters, * @dataProvider slugifyPathData
* the resulting name must be reproducable otherwise uploading a file into that folder
* will not write the file into the same folder.
*/ */
public function slugifyEmptyUnicodeFoldername() { public function testSlugifyPath($slug, $path, $index = null) {
// Slugify the folder $this->assertEquals($slug, $this->mapper->slugifyPath($path, $index));
$slugifiedFolder = $this->mapper->slugifyPath('D:/ありがとう');
$this->assertEquals('D:/' . md5('ありがとう'), $slugifiedFolder);
// Slugify a file in the folder
$slugifiedFileInUtf8Folder = $this->mapper->slugifyPath('D:/ありがとう/issue6722.txt');
$this->assertEquals('D:/' . md5('ありがとう') . '/issue6722.txt', $slugifiedFileInUtf8Folder);
} }
} }