X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FMediaWikiServicesTest.php;h=4fbef6ce67fbd18120b11b684a34e5fefab659a9;hb=514d759b580eca705c1ac1b47f8446657c9b5faa;hp=8c2b143e801ac67a096d9c0210eaaeafbf6ae9bb;hpb=64b8debbff4e48afb01c7ff2042770c41ee8e62b;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/includes/MediaWikiServicesTest.php b/tests/phpunit/includes/MediaWikiServicesTest.php index 8c2b143e80..4fbef6ce67 100644 --- a/tests/phpunit/includes/MediaWikiServicesTest.php +++ b/tests/phpunit/includes/MediaWikiServicesTest.php @@ -147,9 +147,6 @@ class MediaWikiServicesTest extends MediaWikiTestCase { ->disableOriginalConstructor() ->getMock(); - $lbFactory->expects( $this->once() ) - ->method( 'destroy' ); - $newServices->redefineService( 'DBLoadBalancerFactory', function() use ( $lbFactory ) { @@ -164,12 +161,11 @@ class MediaWikiServicesTest extends MediaWikiTestCase { try { MediaWikiServices::getInstance()->getService( 'DBLoadBalancerFactory' ); - $this->fail( 'DBLoadBalancerFactory shoudl have been disabled' ); + $this->fail( 'DBLoadBalancerFactory should have been disabled' ); } catch ( ServiceDisabledException $ex ) { // ok, as expected - } - catch ( Throwable $ex ) { + } catch ( Throwable $ex ) { $this->fail( 'ServiceDisabledException expected, caught ' . get_class( $ex ) ); } @@ -324,6 +320,10 @@ class MediaWikiServicesTest extends MediaWikiTestCase { '_MediaWikiTitleCodec' => [ '_MediaWikiTitleCodec', MediaWikiTitleCodec::class ], 'TitleFormatter' => [ 'TitleFormatter', TitleFormatter::class ], 'TitleParser' => [ 'TitleParser', TitleParser::class ], + 'ProxyLookup' => [ 'ProxyLookup', ProxyLookup::class ], + 'MainObjectStash' => [ 'MainObjectStash', BagOStuff::class ], + 'MainWANObjectCache' => [ 'MainWANObjectCache', WANObjectCache::class ], + 'LocalServerObjectCache' => [ 'LocalServerObjectCache', BagOStuff::class ], 'VirtualRESTServiceClient' => [ 'VirtualRESTServiceClient', VirtualRESTServiceClient::class ] ]; }