From 8d0e162dafb9ab19e726d2d4fa9c5cdb621f806d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 6 Jun 2014 10:24:28 +0200
Subject: [PATCH] Don't rely on the sorting the database gives us for tests
---
tests/lib/preferences-singleton.php | 16 ++++++++++++----
tests/lib/preferences.php | 1 -
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/tests/lib/preferences-singleton.php b/tests/lib/preferences-singleton.php
index 17fe54ad1f..2fde089263 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 fe8e3e8b48..f2117ecb71 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()
{
--
GitLab