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

some more test cases & fix on file name generation with index

This commit is contained in:
Thomas Mueller 2013-03-19 16:57:54 +01:00
parent 0fff3c9698
commit 268d4a525d
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/files/mapper.php
View File

@ -191,8 +191,8 @@ class Mapper
// apply index to file name
if ($index !== null) {
array_pop($sluggedElements);
array_push($sluggedElements, $filename.'-'.$index);
$last= array_pop($sluggedElements);
array_push($sluggedElements, $last.'-'.$index);
}
// add back the extension

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

@ -34,8 +34,19 @@ class Mapper extends \PHPUnit_Framework_TestCase {
}
public function testSlugifyPath() {
// with extension
$this->assertEquals('D:/text.txt', $this->mapper->slugifyPath('D:/text.txt'));
$this->assertEquals('D:/text-2.txt', $this->mapper->slugifyPath('D:/text.txt', 2));
$this->assertEquals('D:/a/b/text.txt', $this->mapper->slugifyPath('D:/a/b/text.txt'));
// without extension
$this->assertEquals('D:/text', $this->mapper->slugifyPath('D:/text'));
$this->assertEquals('D:/text-2', $this->mapper->slugifyPath('D:/text', 2));
$this->assertEquals('D:/a/b/text', $this->mapper->slugifyPath('D:/a/b/text'));
// with double dot
$this->assertEquals('D:/text-text.txt', $this->mapper->slugifyPath('D:/text.text.txt'));
$this->assertEquals('D:/text-text-2.txt', $this->mapper->slugifyPath('D:/text.text.txt', 2));
$this->assertEquals('D:/a/b/text-text.txt', $this->mapper->slugifyPath('D:/a/b/text.text.txt'));
}
}