From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 6 Jun 2014 08:24:28 +0000 (+0200)
Subject: Don't rely on the sorting the database gives us for tests
X-Git-Tag: v8.0.0alpha1~957^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8d0e162dafb9ab19e726d2d4fa9c5cdb621f806d;p=nextcloud-server.git

Don't rely on the sorting the database gives us for tests
---

diff --git a/tests/lib/preferences-singleton.php b/tests/lib/preferences-singleton.php
index 17fe54ad1f5..2fde089263c 100644
--- a/tests/lib/preferences-singleton.php
+++ b/tests/lib/preferences-singleton.php
@@ -44,7 +44,10 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
 			$expected[] = $row['userid'];
 		}
 
-		$this->assertEquals($expected, \OC_Preferences::getUsers());
+		sort($expected);
+		$users = \OC_Preferences::getUsers();
+		sort($users);
+		$this->assertEquals($expected, $users);
 	}
 
 	public function testGetApps() {
@@ -55,8 +58,10 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
 			$expected[] = $row['appid'];
 		}
 
-		$this->assertEquals($expected, \OC_Preferences::getApps('Someuser'));
-	}
+		sort($expected);
+		$apps = \OC_Preferences::getApps('Someuser');
+		sort($apps);
+		$this->assertEquals($expected, $apps);	}
 
 	public function testGetKeys() {
 		$query = \OC_DB::prepare('SELECT DISTINCT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?');
@@ -66,7 +71,10 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
 			$expected[] = $row['configkey'];
 		}
 
-		$this->assertEquals($expected, \OC_Preferences::getKeys('Someuser', 'getkeysapp'));
+		sort($expected);
+		$keys = \OC_Preferences::getKeys('Someuser', 'getkeysapp');
+		sort($keys);
+		$this->assertEquals($expected, $keys);
 	}
 
 	public function testGetValue() {
diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php
index fe8e3e8b48c..f2117ecb716 100644
--- a/tests/lib/preferences.php
+++ b/tests/lib/preferences.php
@@ -6,7 +6,6 @@
  * later.
  * See the COPYING-README file.
  */
-
 class Test_Preferences_Object extends PHPUnit_Framework_TestCase {
 	public function testGetUsers()
 	{