From 0cfef83ed98951f852b07ce61dc10ee2e8266445 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 25 Nov 2012 16:08:35 +0100
Subject: [PATCH] sort output of getFolderContent by name
---
lib/files/cache/cache.php | 2 +-
tests/lib/files/view.php | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index 6b93673097..bc52f21d91 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -87,7 +87,7 @@ class Cache {
if ($fileId > -1) {
$query = \OC_DB::prepare(
'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`
- FROM `*PREFIX*filecache` WHERE parent = ? ORDER BY `fileid` ASC');
+ FROM `*PREFIX*filecache` WHERE parent = ? ORDER BY `name` ASC');
$result = $query->execute(array($fileId));
return $result->fetchAll();
} else {
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 6f8d29c25b..ed08dcc114 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -55,33 +55,33 @@ class View extends \PHPUnit_Framework_TestCase {
$folderData = $rootView->getDirectoryContent('/');
/**
* expected entries:
+ * folder
* foo.png
* foo.txt
- * folder
* substorage
*/
$this->assertEquals(4, count($folderData));
- $this->assertEquals('foo.png', $folderData[0]['name']);
- $this->assertEquals('foo.txt', $folderData[1]['name']);
- $this->assertEquals('folder', $folderData[2]['name']);
+ $this->assertEquals('folder', $folderData[0]['name']);
+ $this->assertEquals('foo.png', $folderData[1]['name']);
+ $this->assertEquals('foo.txt', $folderData[2]['name']);
$this->assertEquals('substorage', $folderData[3]['name']);
- $this->assertEquals($imageSize, $folderData[0]['size']);
- $this->assertEquals($textSize, $folderData[1]['size']);
- $this->assertEquals($storageSize + $textSize, $folderData[2]['size']);
+ $this->assertEquals($storageSize + $textSize, $folderData[0]['size']);
+ $this->assertEquals($imageSize, $folderData[1]['size']);
+ $this->assertEquals($textSize, $folderData[2]['size']);
$this->assertEquals($storageSize, $folderData[3]['size']);
$folderData = $rootView->getDirectoryContent('/substorage');
/**
* expected entries:
+ * folder
* foo.png
* foo.txt
- * folder
*/
$this->assertEquals(3, count($folderData));
- $this->assertEquals('foo.png', $folderData[0]['name']);
- $this->assertEquals('foo.txt', $folderData[1]['name']);
- $this->assertEquals('folder', $folderData[2]['name']);
+ $this->assertEquals('folder', $folderData[0]['name']);
+ $this->assertEquals('foo.png', $folderData[1]['name']);
+ $this->assertEquals('foo.txt', $folderData[2]['name']);
$folderView = new \OC\Files\View('/folder');
$this->assertEquals($rootView->getFileInfo('/folder'), $folderView->getFileInfo('/'));
--
GitLab