diff options
Diffstat (limited to 'tests/Unit/Db')
| -rw-r--r-- | tests/Unit/Db/FeedMapperTest.php | 23 | ||||
| -rw-r--r-- | tests/Unit/Db/FolderMapperTest.php | 20 |
2 files changed, 22 insertions, 21 deletions
diff --git a/tests/Unit/Db/FeedMapperTest.php b/tests/Unit/Db/FeedMapperTest.php index 499989062..7830d266c 100644 --- a/tests/Unit/Db/FeedMapperTest.php +++ b/tests/Unit/Db/FeedMapperTest.php @@ -49,6 +49,7 @@ class FeedMapperTest extends MapperTestUtility $feed2->resetUpdatedFields(); $this->feeds = [$feed1, $feed2]; + } /** @@ -519,13 +520,13 @@ class FeedMapperTest extends MapperTestUtility ->with('news_items') ->will($this->returnSelf()); - $this->builder->expects($this->once()) + $this->builder->expects($this->exactly(2)) ->method('createParameter') ->will($this->returnArgument(0)); - $this->builder->expects($this->once()) + $this->builder->expects($this->exactly(2)) ->method('set') - ->with('unread', 'unread') + ->withConsecutive(['unread', 'unread'], ['last_modified', 'last_modified']) ->will($this->returnSelf()); $this->builder->expects($this->exactly(2)) @@ -533,11 +534,11 @@ class FeedMapperTest extends MapperTestUtility ->withConsecutive(['id IN (:idList)'], ['unread != :unread']) ->will($this->returnSelf()); - $this->builder->expects($this->exactly(2)) + $this->builder->expects($this->exactly(3)) ->method('setParameter') - ->withConsecutive(['unread', false], ['idList', [1, 2]]) + ->withConsecutive(['unread', false], ['idList', [1, 2]], ['last_modified']) ->will($this->returnSelf()); - + $this->builder->expects($this->exactly(1)) ->method('getSQL') ->will($this->returnValue('QUERY')); @@ -616,7 +617,7 @@ class FeedMapperTest extends MapperTestUtility ->with('SQL QUERY') ->willReturn($result); - $this->builder->expects($this->once()) + $this->builder->expects($this->exactly(2)) ->method('createParameter') ->will($this->returnArgument(0)); @@ -625,9 +626,9 @@ class FeedMapperTest extends MapperTestUtility ->with('news_items') ->will($this->returnSelf()); - $this->builder->expects($this->once()) + $this->builder->expects($this->exactly(2)) ->method('set') - ->with('unread', 'unread') + ->withConsecutive(['unread', 'unread'], ['last_modified', 'last_modified']) ->will($this->returnSelf()); $this->builder->expects($this->exactly(2)) @@ -635,9 +636,9 @@ class FeedMapperTest extends MapperTestUtility ->withConsecutive(['id IN (:idList)'], ['unread != :unread']) ->will($this->returnSelf()); - $this->builder->expects($this->exactly(2)) + $this->builder->expects($this->exactly(3)) ->method('setParameter') - ->withConsecutive(['unread', false], ['idList', [1, 2]]) + ->withConsecutive(['unread', false], ['idList', [1, 2]], ['last_modified']) ->will($this->returnSelf()); $this->builder->expects($this->exactly(1)) diff --git a/tests/Unit/Db/FolderMapperTest.php b/tests/Unit/Db/FolderMapperTest.php index a7f9f0c9d..db43f64e1 100644 --- a/tests/Unit/Db/FolderMapperTest.php +++ b/tests/Unit/Db/FolderMapperTest.php @@ -342,7 +342,7 @@ class FolderMapperTest extends MapperTestUtility ->with('SQL QUERY') ->willReturn($result); - $this->builder->expects($this->once()) + $this->builder->expects($this->exactly(2)) ->method('createParameter') ->will($this->returnArgument(0)); @@ -351,9 +351,9 @@ class FolderMapperTest extends MapperTestUtility ->with('news_items') ->will($this->returnSelf()); - $this->builder->expects($this->once()) + $this->builder->expects($this->exactly(2)) ->method('set') - ->with('unread', 'unread') + ->withConsecutive(['unread', 'unread'], ['last_modified', 'last_modified']) ->will($this->returnSelf()); $this->builder->expects($this->exactly(2)) @@ -361,9 +361,9 @@ class FolderMapperTest extends MapperTestUtility ->withConsecutive(['id IN (:idList)'], ['unread != :unread']) ->will($this->returnSelf()); - $this->builder->expects($this->exactly(2)) + $this->builder->expects($this->exactly(3)) ->method('setParameter') - ->withConsecutive(['unread', false], ['idList', [1, 2]]) + ->withConsecutive(['unread', false], ['idList', [1, 2]], ['last_modified']) ->will($this->returnSelf()); $this->builder->expects($this->exactly(1)) @@ -445,7 +445,7 @@ class FolderMapperTest extends MapperTestUtility ->with('SQL QUERY') ->willReturn($result); - $this->builder->expects($this->once()) + $this->builder->expects($this->exactly(2)) ->method('createParameter') ->will($this->returnArgument(0)); @@ -454,9 +454,9 @@ class FolderMapperTest extends MapperTestUtility ->with('news_items') ->will($this->returnSelf()); - $this->builder->expects($this->once()) + $this->builder->expects($this->exactly(2)) ->method('set') - ->with('unread', 'unread') + ->withConsecutive(['unread', 'unread'], ['last_modified', 'last_modified']) ->will($this->returnSelf()); $this->builder->expects($this->exactly(2)) @@ -464,9 +464,9 @@ class FolderMapperTest extends MapperTestUtility ->withConsecutive(['id IN (:idList)'], ['unread != :unread']) ->will($this->returnSelf()); - $this->builder->expects($this->exactly(2)) + $this->builder->expects($this->exactly(3)) ->method('setParameter') - ->withConsecutive(['unread', false], ['idList', [1, 2]]) + ->withConsecutive(['unread', false], ['idList', [1, 2]], ['last_modified']) ->will($this->returnSelf()); $this->builder->expects($this->exactly(1)) |