1 files changed, 40 insertions, 17 deletions

diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index 0e22f26ae83..4587a3b2d06 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -42,18 +42,21 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue($this->instance->isUpdatable('/'), 'Root folder is not writable');
 	}
 
-	public function testDirectories() {
-		$this->assertFalse($this->instance->file_exists('/folder'));
+	/**
+	 * @dataProvider directoryProvider
+	 */
+	public function testDirectories($directory) {
+		$this->assertFalse($this->instance->file_exists('/'.$directory));
 
-		$this->assertTrue($this->instance->mkdir('/folder'));
+		$this->assertTrue($this->instance->mkdir('/'.$directory));
 
-		$this->assertTrue($this->instance->file_exists('/folder'));
-		$this->assertTrue($this->instance->is_dir('/folder'));
-		$this->assertFalse($this->instance->is_file('/folder'));
-		$this->assertEquals('dir', $this->instance->filetype('/folder'));
-		$this->assertEquals(0, $this->instance->filesize('/folder'));
-		$this->assertTrue($this->instance->isReadable('/folder'));
-		$this->assertTrue($this->instance->isUpdatable('/folder'));
+		$this->assertTrue($this->instance->file_exists('/'.$directory));
+		$this->assertTrue($this->instance->is_dir('/'.$directory));
+		$this->assertFalse($this->instance->is_file('/'.$directory));
+		$this->assertEquals('dir', $this->instance->filetype('/'.$directory));
+		$this->assertEquals(0, $this->instance->filesize('/'.$directory));
+		$this->assertTrue($this->instance->isReadable('/'.$directory));
+		$this->assertTrue($this->instance->isUpdatable('/'.$directory));
 
 		$dh = $this->instance->opendir('/');
 		$content = array();
@@ -62,14 +65,14 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 				$content[] = $file;
 			}
 		}
-		$this->assertEquals(array('folder'), $content);
+		$this->assertEquals(array($directory), $content);
 
-		$this->assertFalse($this->instance->mkdir('/folder')); //cant create existing folders
-		$this->assertTrue($this->instance->rmdir('/folder'));
+		$this->assertFalse($this->instance->mkdir('/'.$directory)); //cant create existing folders
+		$this->assertTrue($this->instance->rmdir('/'.$directory));
 
-		$this->assertFalse($this->instance->file_exists('/folder'));
+		$this->assertFalse($this->instance->file_exists('/'.$directory));
 
-		$this->assertFalse($this->instance->rmdir('/folder')); //cant remove non existing folders
+		$this->assertFalse($this->instance->rmdir('/'.$directory)); //cant remove non existing folders
 
 		$dh = $this->instance->opendir('/');
 		$content = array();
@@ -81,6 +84,14 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(array(), $content);
 	}
 
+	public function directoryProvider()
+	{
+		return array(
+			array('folder'),
+			array(' folder'),
+			array('folder '),
+		);
+	}
 	/**
 	 * test the various uses of file_get_contents and file_put_contents
 	 */
@@ -171,8 +182,9 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue($this->instance->hasUpdated('/lorem.txt', $ctimeStart - 1));
 		$this->assertTrue($this->instance->hasUpdated('/', $ctimeStart - 1));
 
-		$this->assertTrue(($ctimeStart - 1) <= $mTime);
-		$this->assertTrue($mTime <= ($ctimeEnd + 1));
+		// check that ($ctimeStart - 1) <= $mTime <= ($ctimeEnd + 1)
+		$this->assertGreaterThanOrEqual(($ctimeStart - 1), $mTime);
+		$this->assertLessThanOrEqual(($ctimeEnd + 1), $mTime);
 		$this->assertEquals(filesize($textFile), $this->instance->filesize('/lorem.txt'));
 
 		$stat = $this->instance->stat('/lorem.txt');
@@ -238,6 +250,17 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		$this->assertContains('/sub/logo-wide.png', $result);
 	}
 
+	public function testUnlink() {
+		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
+		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
+
+		$this->assertTrue($this->instance->file_exists('/lorem.txt'));
+
+		$this->assertTrue($this->instance->unlink('/lorem.txt'));
+
+		$this->assertFalse($this->instance->file_exists('/lorem.txt'));
+	}
+
 	public function testFOpen() {
 		$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';