From fcc3b3d5f70eb44787a70dd17b5a843729b1f0d8 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 12 Jan 2015 19:33:00 +0100
Subject: [PATCH] Fix searchCommon to properly match path name
The internal path was matched without the last "/" which caused
"files_trashbin" to also match when the internal path was "files".
This adds the missing slash for the comparison.
---
lib/private/files/node/folder.php | 1 +
tests/lib/files/node/folder.php | 39 +++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php
index bdfb234671..5fd73cc5d3 100644
--- a/lib/private/files/node/folder.php
+++ b/lib/private/files/node/folder.php
@@ -259,6 +259,7 @@ class Folder extends Node implements \OCP\Files\Folder {
* @var \OC\Files\Storage\Storage $storage
*/
list($storage, $internalPath) = $this->view->resolvePath($this->path);
+ $internalPath = rtrim($internalPath, '/') . '/';
$internalRootLength = strlen($internalPath);
$cache = $storage->getCache('');
diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php
index bcd9cc93b5..54b26ebdfe 100644
--- a/tests/lib/files/node/folder.php
+++ b/tests/lib/files/node/folder.php
@@ -405,6 +405,45 @@ class Folder extends \Test\TestCase {
$this->assertEquals('/bar/foo/qwerty', $result[0]->getPath());
}
+ public function testSearchInRoot() {
+ $manager = $this->getMock('\OC\Files\Mount\Manager');
+ /**
+ * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+ */
+ $view = $this->getMock('\OC\Files\View');
+ $root = $this->getMock('\OC\Files\Node\Root', array('getUser', 'getMountsIn'), array($manager, $view, $this->user));
+ $root->expects($this->any())
+ ->method('getUser')
+ ->will($this->returnValue($this->user));
+ $storage = $this->getMock('\OC\Files\Storage\Storage');
+ $cache = $this->getMock('\OC\Files\Cache\Cache', array(), array(''));
+
+ $storage->expects($this->once())
+ ->method('getCache')
+ ->will($this->returnValue($cache));
+
+ $cache->expects($this->once())
+ ->method('search')
+ ->with('%qw%')
+ ->will($this->returnValue(array(
+ array('fileid' => 3, 'path' => 'files/foo', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain'),
+ array('fileid' => 3, 'path' => 'files_trashbin/foo2.d12345', 'name' => 'foo2.d12345', 'size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain'),
+ )));
+
+ $root->expects($this->once())
+ ->method('getMountsIn')
+ ->with('')
+ ->will($this->returnValue(array()));
+
+ $view->expects($this->once())
+ ->method('resolvePath')
+ ->will($this->returnValue(array($storage, 'files')));
+
+ $result = $root->search('qw');
+ $this->assertEquals(1, count($result));
+ $this->assertEquals('/foo', $result[0]->getPath());
+ }
+
public function testSearchByTag() {
$manager = $this->getMock('\OC\Files\Mount\Manager');
/**
--
GitLab