Merge "rdbms: avoid LoadBalancer::getConnection waste when using $groups"

[lhc/web/wiklou.git] / tests / phpunit / includes / api / ApiBlockInfoTraitTest.php

diff --git a/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php b/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php
index 932495a..ba5c003 100644 (file)
--- a/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php
+++ b/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use Wikimedia\TestingAccessWrapper;
+use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Block\SystemBlock;
 
 /**
@@ -8,11 +9,11 @@ use MediaWiki\Block\SystemBlock;
  */
 class ApiBlockInfoTraitTest extends MediaWikiTestCase {
        /**
-        * @dataProvider provideGetBlockInfo
+        * @dataProvider provideGetBlockDetails
         */
-       public function testGetBlockInfo( $block, $expectedInfo ) {
+       public function testGetBlockDetails( $block, $expectedInfo ) {
                $mock = $this->getMockForTrait( ApiBlockInfoTrait::class );
-               $info = TestingAccessWrapper::newFromObject( $mock )->getBlockInfo( $block );
+               $info = TestingAccessWrapper::newFromObject( $mock )->getBlockDetails( $block );
                $subset = array_merge( [
                        'blockid' => null,
                        'blockedby' => '',
@@ -23,14 +24,14 @@ class ApiBlockInfoTraitTest extends MediaWikiTestCase {
                $this->assertArraySubset( $subset, $info );
        }
 
-       public static function provideGetBlockInfo() {
+       public static function provideGetBlockDetails() {
                return [
                        'Sitewide block' => [
-                               new Block(),
+                               new DatabaseBlock(),
                                [ 'blockpartial' => false ],
                        ],
                        'Partial block' => [
-                               new Block( [ 'sitewide' => false ] ),
+                               new DatabaseBlock( [ 'sitewide' => false ] ),
                                [ 'blockpartial' => true ],
                        ],
                        'System block' => [