Merge "TablePager: put parent construct call back at end"

[lhc/web/wiklou.git] / tests / phpunit / includes / search / SearchResultSetTest.php

diff --git a/tests/phpunit/includes/search/SearchResultSetTest.php b/tests/phpunit/includes/search/SearchResultSetTest.php
index 26a0672..e9efb22 100644 (file)
--- a/tests/phpunit/includes/search/SearchResultSetTest.php
+++ b/tests/phpunit/includes/search/SearchResultSetTest.php
@@ -3,8 +3,8 @@
 class SearchResultSetTest extends MediaWikiTestCase {
        /**
         * @covers SearchResultSet::getIterator
-        * @covers SearchResultSet::next
-        * @covers SearchResultSet::rewind
+        * @covers BaseSearchResultSet::next
+        * @covers BaseSearchResultSet::rewind
         */
        public function testIterate() {
                $result = SearchResult::newFromTitle( Title::newMainPage() );
@@ -17,11 +17,11 @@ class SearchResultSetTest extends MediaWikiTestCase {
                }
                $this->assertEquals( 1, $count );
 
-               $this->hideDeprecated( 'SearchResultSet::rewind' );
-               $this->hideDeprecated( 'SearchResultSet::next' );
+               $this->hideDeprecated( 'BaseSearchResultSet::rewind' );
+               $this->hideDeprecated( 'BaseSearchResultSet::next' );
                $resultSet->rewind();
                $count = 0;
-               while ( false !== ( $iterResult = $resultSet->next() ) ) {
+               while ( ( $iterResult = $resultSet->next() ) !== false ) {
                        $this->assertEquals( $result, $iterResult );
                        $count++;
                }
@@ -29,8 +29,8 @@ class SearchResultSetTest extends MediaWikiTestCase {
        }
 
        /**
-        * @covers SearchResultSet::augmentResult
-        * @covers SearchResultSet::setAugmentedData
+        * @covers SearchResultSetTrait::augmentResult
+        * @covers SearchResultSetTrait::setAugmentedData
         */
        public function testDelayedResultAugment() {
                $result = SearchResult::newFromTitle( Title::newMainPage() );