From 75bf8ed4b22a8bc8d43d38144025e4641a651cc3 Mon Sep 17 00:00:00 2001
From: "s17t.net" <mail+github@s17t.net>
Date: Sat, 18 May 2013 18:53:03 +0200
Subject: Fix #174

---
 tests/unit/db/FeedMapperTest.php | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/tests/unit/db/FeedMapperTest.php b/tests/unit/db/FeedMapperTest.php
index 8f7d139e1..6894e16d0 100644
--- a/tests/unit/db/FeedMapperTest.php
+++ b/tests/unit/db/FeedMapperTest.php
@@ -64,7 +64,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 				StatusFlag::UNREAD . ' ' .
 			'WHERE `feeds`.`id` = ? ' .
 				'AND `feeds`.`user_id` = ? ' .
-			'GROUP BY `feeds`.`id`';
+		      	'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+		        	'`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+		        	'`feeds`.`favicon_link`, `feeds`.`added`,'.
+		        	'`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
 		$params = array($id, $userId);
 		$this->setMapperResult($sql, $params, $rows);
 		
@@ -85,7 +88,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 				StatusFlag::UNREAD . ' ' .
 			'WHERE `feeds`.`id` = ? ' .
 				'AND `feeds`.`user_id` = ? ' .
-			'GROUP BY `feeds`.`id`';
+		      	'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+		        	'`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+		        	'`feeds`.`favicon_link`, `feeds`.`added`,'.
+		        	'`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
 		$params = array($id, $userId);
 		$this->setMapperResult($sql, $params);
 		
@@ -109,7 +115,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 				StatusFlag::UNREAD . ' ' .
 			'WHERE `feeds`.`id` = ? ' .
 				'AND `feeds`.`user_id` = ? ' .
-			'GROUP BY `feeds`.`id`';
+		      	'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+		        	'`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+		        	'`feeds`.`favicon_link`, `feeds`.`added`,'.
+		        	'`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
 		$params = array($id, $userId);
 		$this->setMapperResult($sql, $params, $rows);
 				
@@ -147,8 +156,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 				StatusFlag::UNREAD . ' ' .
 			'WHERE `feeds`.`user_id` = ? ' .
 			'AND `feeds`.`deleted_at` = 0 ' .
-			'GROUP BY `feeds`.`id`';
-		
+		      	'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+		        	'`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+		        	'`feeds`.`favicon_link`, `feeds`.`added`,'.
+		        	'`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
 		$this->setMapperResult($sql, 
 			array($userId), $rows);
 		
@@ -170,7 +181,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 				StatusFlag::UNREAD . ' ' .
 			'WHERE `feeds`.`url_hash` = ? ' .
 				'AND `feeds`.`user_id` = ? ' .
-			'GROUP BY `feeds`.`id`';
+		      	'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+		        	'`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+		        	'`feeds`.`favicon_link`, `feeds`.`added`,'.
+		        	'`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
 		$this->setMapperResult($sql, 
 			array($urlHash, $this->user), $row);
 		
@@ -189,7 +203,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 				StatusFlag::UNREAD . ' ' .
 			'WHERE `feeds`.`url_hash` = ? ' .
 				'AND `feeds`.`user_id` = ? ' .
-			'GROUP BY `feeds`.`id`';
+		      	'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+		        	'`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+		        	'`feeds`.`favicon_link`, `feeds`.`added`,'.
+		        	'`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
 		$this->setMapperResult($sql, 
 			array($urlHash, $this->user));
 			
@@ -212,7 +229,10 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 				StatusFlag::UNREAD . ' ' .
 			'WHERE `feeds`.`url_hash` = ? ' .
 				'AND `feeds`.`user_id` = ? ' .
-			'GROUP BY `feeds`.`id`';
+		      	'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'.
+		        	'`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
+		        	'`feeds`.`favicon_link`, `feeds`.`added`,'.
+		        	'`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
 		$this->setMapperResult($sql, 
 			array($urlHash, $this->user), $rows);
 		
@@ -294,4 +314,4 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 	}
 
 	
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3