From b560bb21f092c9d93172e53559db7df7bbfd8f1d Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Tue, 6 Aug 2013 17:01:01 +0200
Subject: [PATCH 1/3] Clean up DB, after we're done with testing

---
 tests/lib/preferences.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php
index d39555aa01d..a1719c92b29 100644
--- a/tests/lib/preferences.php
+++ b/tests/lib/preferences.php
@@ -28,6 +28,13 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
 		$query->execute(array("Deleteuser", "someapp", "somekey", "somevalue"));
 	}
 
+	private function cleanDb() {
+		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*preferences` WHERE `user` = ?');
+		$query->execute(array('Someuser'));
+		$query->execute(array('Anotheruser'));
+		$query->execute(array('Anuser'));
+	}
+
 	public function testGetUsers() {
 		$this->fillDb();
 
@@ -117,5 +124,7 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
 		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `appid` = ?');
 		$result = $query->execute(array('someapp'));
 		$this->assertEquals(0, $result->numRows());
+
+		$this->cleanDb();
 	}
 }

From b8bfebe51e6d4c007a6dcd3fcb56e4684704af24 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Tue, 6 Aug 2013 17:26:12 +0200
Subject: [PATCH 2/3] Use setUpBeforeClass() and tearDownAfterClass()

---
 tests/lib/preferences.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php
index a1719c92b29..18e1cde8488 100644
--- a/tests/lib/preferences.php
+++ b/tests/lib/preferences.php
@@ -7,7 +7,7 @@
  */
 
 class Test_Preferences extends PHPUnit_Framework_TestCase {
-	private function fillDb() {
+	public static function setUpBeforeClass() {
 		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*preferences` VALUES(?, ?, ?, ?)');
 		$query->execute(array("Someuser", "someapp", "somekey", "somevalue"));
 
@@ -28,7 +28,7 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
 		$query->execute(array("Deleteuser", "someapp", "somekey", "somevalue"));
 	}
 
-	private function cleanDb() {
+	public static function tearDownAfterClass() {
 		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*preferences` WHERE `user` = ?');
 		$query->execute(array('Someuser'));
 		$query->execute(array('Anotheruser'));
@@ -36,8 +36,6 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
 	}
 
 	public function testGetUsers() {
-		$this->fillDb();
-
 		$query = \OC_DB::prepare('SELECT DISTINCT `userid` FROM `*PREFIX*preferences`');
 		$result = $query->execute();
 		$expected = array();
@@ -124,7 +122,5 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
 		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `appid` = ?');
 		$result = $query->execute(array('someapp'));
 		$this->assertEquals(0, $result->numRows());
-
-		$this->cleanDb();
 	}
 }

From 6c78152564b8d7a5512072867e80a50a55856714 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Tue, 6 Aug 2013 17:31:50 +0200
Subject: [PATCH 3/3] =?UTF-8?q?Proper=20WHERE=20=E2=80=93=20the=20table=20?=
 =?UTF-8?q?is=20called=20userid=20not=20user?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/lib/preferences.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php
index 18e1cde8488..612cc81926b 100644
--- a/tests/lib/preferences.php
+++ b/tests/lib/preferences.php
@@ -29,7 +29,7 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
 	}
 
 	public static function tearDownAfterClass() {
-		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*preferences` WHERE `user` = ?');
+		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*preferences` WHERE `userid` = ?');
 		$query->execute(array('Someuser'));
 		$query->execute(array('Anotheruser'));
 		$query->execute(array('Anuser'));