Merge "StringUtils: Add a utility for checking if a string is a valid regex"

[lhc/web/wiklou.git] / tests / phpunit / unit / includes / Rest / Handler / HelloHandlerTest.php

diff --git a/tests/phpunit/unit/includes/Rest/Handler/HelloHandlerTest.php b/tests/phpunit/unit/includes/Rest/Handler/HelloHandlerTest.php
index 188629f..ca3cf10 100644 (file)
--- a/tests/phpunit/unit/includes/Rest/Handler/HelloHandlerTest.php
+++ b/tests/phpunit/unit/includes/Rest/Handler/HelloHandlerTest.php
@@ -4,10 +4,15 @@ namespace MediaWiki\Tests\Rest\Handler;
 
 use EmptyBagOStuff;
 use GuzzleHttp\Psr7\Uri;
+use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Rest\BasicAccess\StaticBasicAuthorizer;
 use MediaWiki\Rest\RequestData;
 use MediaWiki\Rest\ResponseFactory;
 use MediaWiki\Rest\Router;
+use MediaWiki\Rest\Validator\Validator;
+use Psr\Container\ContainerInterface;
+use Wikimedia\ObjectFactory;
+use User;
 
 /**
  * @covers \MediaWiki\Rest\Handler\HelloHandler
@@ -48,14 +53,21 @@ class HelloHandlerTest extends \MediaWikiUnitTestCase {
 
        /** @dataProvider provideTestViaRouter */
        public function testViaRouter( $requestInfo, $responseInfo ) {
+               $objectFactory = new ObjectFactory(
+                       $this->getMockForAbstractClass( ContainerInterface::class )
+               );
+               $permissionManager = $this->createMock( PermissionManager::class );
+               $request = new RequestData( $requestInfo );
                $router = new Router(
                        [ __DIR__ . '/../testRoutes.json' ],
                        [],
                        '/rest',
                        new EmptyBagOStuff(),
-                       new ResponseFactory(),
-                       new StaticBasicAuthorizer() );
-               $request = new RequestData( $requestInfo );
+                       new ResponseFactory( [] ),
+                       new StaticBasicAuthorizer(),
+                       $objectFactory,
+                       new Validator( $objectFactory, $permissionManager, $request, new User )
+               );
                $response = $router->execute( $request );
                if ( isset( $responseInfo['statusCode'] ) ) {
                        $this->assertSame( $responseInfo['statusCode'], $response->getStatusCode() );