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 17fe54ad1f522317e38894b686edf416c6184202..2fde089263cc2db0c6f83efad8f7d8f9168073f8 100644 (file)
--- 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 fe8e3e8b48c3ddd33816c3369c52622d1516161e..f2117ecb71677601565035c80f05afaf9cf6aed2 100644 (file)
--- 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()
        {