summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-06-13 03:34:36 -0700
committerThomas Müller <thomas.mueller@tmit.eu>2013-06-13 03:34:36 -0700
commit54f3174665262a5d1b1e1135667342b17b5d05b0 (patch)
tree4d0c0069b7acba45b7a1ebcfa7f1f2840df14762 /tests
parent2b179ccff00913722a7ded8c58f18bacb62d0713 (diff)
parent199207253e2b02808809b79ef1aa27e050b0aff1 (diff)
downloadnextcloud-server-54f3174665262a5d1b1e1135667342b17b5d05b0.tar.gz
nextcloud-server-54f3174665262a5d1b1e1135667342b17b5d05b0.zip
Merge pull request #3640 from infoneo/master
Folders with multiple periods problem fix
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/files/mapper.php18
1 files changed, 15 insertions, 3 deletions
diff --git a/tests/lib/files/mapper.php b/tests/lib/files/mapper.php
index e3859bc0f23..48ae95b7e72 100644
--- a/tests/lib/files/mapper.php
+++ b/tests/lib/files/mapper.php
@@ -45,8 +45,20 @@ class Mapper extends \PHPUnit_Framework_TestCase {
$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'));
+ $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'));
+
+ // 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
+ $this->assertEquals('D:/folder.name.with.peri-ods', $this->mapper->slugifyPath('D:/folder.name.with.peri ods'));
+ $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));
+ $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'));
+
+
}
}