1 files changed, 132 insertions, 14 deletions

diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php
index 2548066214b..d2702027b0d 100644
--- a/tests/lib/connector/sabre/objecttree.php
+++ b/tests/lib/connector/sabre/objecttree.php
@@ -10,8 +10,7 @@ namespace Test\OC\Connector\Sabre;
 
 
 use OC\Files\FileInfo;
-use OC_Connector_Sabre_Directory;
-use PHPUnit_Framework_TestCase;
+use OC\Connector\Sabre\Directory;
 
 class TestDoubleFileView extends \OC\Files\View {
 
@@ -48,29 +47,29 @@ class ObjectTree extends \Test\TestCase {
 	 * @dataProvider moveFailedProvider
 	 * @expectedException \Sabre\DAV\Exception\Forbidden
 	 */
-	public function testMoveFailed($source, $dest, $updatables, $deletables) {
-		$this->moveTest($source, $dest, $updatables, $deletables);
+	public function testMoveFailed($source, $destination, $updatables, $deletables) {
+		$this->moveTest($source, $destination, $updatables, $deletables);
 	}
 
 	/**
 	 * @dataProvider moveSuccessProvider
 	 */
-	public function testMoveSuccess($source, $dest, $updatables, $deletables) {
-		$this->moveTest($source, $dest, $updatables, $deletables);
+	public function testMoveSuccess($source, $destination, $updatables, $deletables) {
+		$this->moveTest($source, $destination, $updatables, $deletables);
 		$this->assertTrue(true);
 	}
 
 	/**
 	 * @dataProvider moveFailedInvalidCharsProvider
-	 * @expectedException \Sabre\DAV\Exception\BadRequest
+	 * @expectedException \OC\Connector\Sabre\Exception\InvalidPath
 	 */
-	public function testMoveFailedInvalidChars($source, $dest, $updatables, $deletables) {
-		$this->moveTest($source, $dest, $updatables, $deletables);
+	public function testMoveFailedInvalidChars($source, $destination, $updatables, $deletables) {
+		$this->moveTest($source, $destination, $updatables, $deletables);
 	}
 
 	function moveFailedInvalidCharsProvider() {
 		return array(
-			array('a/b', 'a/c*', array('a' => false, 'a/b' => true, 'a/c*' => false), array()),
+			array('a/b', 'a/*', array('a' => false, 'a/b' => true, 'a/c*' => false), array()),
 		);
 	}
 
@@ -95,15 +94,15 @@ class ObjectTree extends \Test\TestCase {
 
 	/**
 	 * @param $source
-	 * @param $dest
+	 * @param $destination
 	 * @param $updatables
 	 */
-	private function moveTest($source, $dest, $updatables, $deletables) {
+	private function moveTest($source, $destination, $updatables, $deletables) {
 		$view = new TestDoubleFileView($updatables, $deletables);
 
 		$info = new FileInfo('', null, null, array(), null);
 
-		$rootDir = new OC_Connector_Sabre_Directory($view, $info);
+		$rootDir = new Directory($view, $info);
 		$objectTree = $this->getMock('\OC\Connector\Sabre\ObjectTree',
 			array('nodeExists', 'getNodeForPath'),
 			array($rootDir, $view));
@@ -116,7 +115,126 @@ class ObjectTree extends \Test\TestCase {
 		/** @var $objectTree \OC\Connector\Sabre\ObjectTree */
 		$mountManager = \OC\Files\Filesystem::getMountManager();
 		$objectTree->init($rootDir, $view, $mountManager);
-		$objectTree->move($source, $dest);
+		$objectTree->move($source, $destination);
+	}
+
+	/**
+	 * @dataProvider nodeForPathProvider
+	 */
+	public function testGetNodeForPath(
+			$inputFileName,
+			$fileInfoQueryPath,
+			$outputFileName,
+			$type,
+			$enableChunkingHeader
+	) {
+
+		if ($enableChunkingHeader) {
+			$_SERVER['HTTP_OC_CHUNKED'] = true;
+		}
+
+		$rootNode = $this->getMockBuilder('\OC\Connector\Sabre\Directory')
+			->disableOriginalConstructor()
+			->getMock();
+		$mountManager = $this->getMock('\OC\Files\Mount\Manager');
+		$view = $this->getMock('\OC\Files\View');
+		$fileInfo = $this->getMock('\OCP\Files\FileInfo');
+		$fileInfo->expects($this->once())
+			->method('getType')
+			->will($this->returnValue($type));
+		$fileInfo->expects($this->once())
+			->method('getName')
+			->will($this->returnValue($outputFileName));
+
+		$view->expects($this->once())
+			->method('getFileInfo')
+			->with($fileInfoQueryPath)
+			->will($this->returnValue($fileInfo));
+
+		$tree = new \OC\Connector\Sabre\ObjectTree();
+		$tree->init($rootNode, $view, $mountManager);
+
+		$node = $tree->getNodeForPath($inputFileName);
+
+		$this->assertNotNull($node);
+		$this->assertEquals($outputFileName, $node->getName());
+
+		if ($type === 'file') {
+			$this->assertTrue($node instanceof \OC\Connector\Sabre\File);
+		} else {
+			$this->assertTrue($node instanceof \OC\Connector\Sabre\Directory);
+		}
+
+		unset($_SERVER['HTTP_OC_CHUNKED']);
+	}
+
+	function nodeForPathProvider() {
+		return array(
+			// regular file
+			array(
+				'regularfile.txt',
+				'regularfile.txt',
+				'regularfile.txt',
+				'file',
+				false
+			),
+			// regular directory
+			array(
+				'regulardir',
+				'regulardir',
+				'regulardir',
+				'dir',
+				false
+			),
+			// regular file with chunking
+			array(
+				'regularfile.txt',
+				'regularfile.txt',
+				'regularfile.txt',
+				'file',
+				true
+			),
+			// regular directory with chunking
+			array(
+				'regulardir',
+				'regulardir',
+				'regulardir',
+				'dir',
+				true
+			),
+			// file with chunky file name
+			array(
+				'regularfile.txt-chunking-123566789-10-1',
+				'regularfile.txt',
+				'regularfile.txt',
+				'file',
+				true
+			),
+			// regular file in subdir
+			array(
+				'subdir/regularfile.txt',
+				'subdir/regularfile.txt',
+				'regularfile.txt',
+				'file',
+				false
+			),
+			// regular directory in subdir
+			array(
+				'subdir/regulardir',
+				'subdir/regulardir',
+				'regulardir',
+				'dir',
+				false
+			),
+			// file with chunky file name in subdir
+			array(
+				'subdir/regularfile.txt-chunking-123566789-10-1',
+				'subdir/regularfile.txt',
+				'regularfile.txt',
+				'file',
+				true
+			),
+		);
 	}
 
 }