aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-07-11 10:59:27 +0200
committerJoas Schilling <coding@schilljs.com>2016-07-11 10:59:27 +0200
commit6ea77abb38e4b85556ccde8801071f5f10a92ced (patch)
tree4d74cae6b12bd82352719082a2d19b69e734ec94 /tests
parentc2d88a08b796ca19c8b5ec63bfd34ac32ead4208 (diff)
downloadnextcloud-server-6ea77abb38e4b85556ccde8801071f5f10a92ced.tar.gz
nextcloud-server-6ea77abb38e4b85556ccde8801071f5f10a92ced.zip
Fix some more tests
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/Files/PathVerificationTest.php97
1 files changed, 1 insertions, 96 deletions
diff --git a/tests/lib/Files/PathVerificationTest.php b/tests/lib/Files/PathVerificationTest.php
index 9ce9416455f..992734bdece 100644
--- a/tests/lib/Files/PathVerificationTest.php
+++ b/tests/lib/Files/PathVerificationTest.php
@@ -98,63 +98,6 @@ class PathVerificationTest extends \Test\TestCase {
}
/**
- * @dataProvider providesInvalidCharsWindows
- * @expectedException \OCP\Files\InvalidCharacterInPathException
- */
- public function testPathVerificationInvalidCharsWindows($fileName) {
- $storage = new Local(['datadir' => '']);
-
- $fileName = " 123{$fileName}456 ";
- self::invokePrivate($storage, 'verifyWindowsPath', [$fileName]);
- }
-
- public function providesInvalidCharsWindows() {
- return [
- [\chr(0)],
- [\chr(1)],
- [\chr(2)],
- [\chr(3)],
- [\chr(4)],
- [\chr(5)],
- [\chr(6)],
- [\chr(7)],
- [\chr(8)],
- [\chr(9)],
- [\chr(10)],
- [\chr(11)],
- [\chr(12)],
- [\chr(13)],
- [\chr(14)],
- [\chr(15)],
- [\chr(16)],
- [\chr(17)],
- [\chr(18)],
- [\chr(19)],
- [\chr(20)],
- [\chr(21)],
- [\chr(22)],
- [\chr(23)],
- [\chr(24)],
- [\chr(25)],
- [\chr(26)],
- [\chr(27)],
- [\chr(28)],
- [\chr(29)],
- [\chr(30)],
- [\chr(31)],
- ['<'],
- ['>'],
- [':'],
- ['"'],
- ['/'],
- ['\\'],
- ['|'],
- ['?'],
- ['*'],
- ];
- }
-
- /**
* @dataProvider providesInvalidCharsPosix
* @expectedException \OCP\Files\InvalidCharacterInPathException
*/
@@ -162,7 +105,7 @@ class PathVerificationTest extends \Test\TestCase {
$storage = new Local(['datadir' => '']);
$fileName = " 123{$fileName}456 ";
- self::invokePrivate($storage, 'verifyWindowsPath', [$fileName]);
+ self::invokePrivate($storage, 'verifyPosixPath', [$fileName]);
}
public function providesInvalidCharsPosix() {
@@ -205,50 +148,12 @@ class PathVerificationTest extends \Test\TestCase {
}
/**
- * @dataProvider providesReservedNamesWindows
- * @expectedException \OCP\Files\ReservedWordException
- */
- public function testPathVerificationReservedNamesWindows($fileName) {
- $storage = new Local(['datadir' => '']);
-
- self::invokePrivate($storage, 'verifyWindowsPath', [$fileName]);
- }
-
- public function providesReservedNamesWindows() {
- return [
- [' CON '],
- ['prn '],
- ['AUX'],
- ['NUL'],
- ['COM1'],
- ['COM2'],
- ['COM3'],
- ['COM4'],
- ['COM5'],
- ['COM6'],
- ['COM7'],
- ['COM8'],
- ['COM9'],
- ['LPT1'],
- ['LPT2'],
- ['LPT3'],
- ['LPT4'],
- ['LPT5'],
- ['LPT6'],
- ['LPT7'],
- ['LPT8'],
- ['LPT9']
- ];
- }
-
- /**
* @dataProvider providesValidPosixPaths
*/
public function testPathVerificationValidPaths($fileName) {
$storage = new Local(['datadir' => '']);
self::invokePrivate($storage, 'verifyPosixPath', [$fileName]);
- self::invokePrivate($storage, 'verifyWindowsPath', [$fileName]);
// nothing thrown
$this->assertTrue(true);
}