UrlRewrite module fixes

update unit test

Author: arendarenko

app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php

@@ -260,6 +260,7 @@ public function testNoRewriteAfterStoreSwitcherWhenOldRewriteEqualsToNewOne()
      */
     public function testMatchWithRedirect()
     {
+        $queryParams = [];
         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
         $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
             ->disableOriginalConstructor()->getMock();
@@ -268,7 +269,11 @@ public function testMatchWithRedirect()
         $this->urlFinder->expects($this->any())->method('findOneByData')->will($this->returnValue($urlRewrite));
         $this->response->expects($this->once())->method('setRedirect')
             ->with('new-target-path', 'redirect-code');
-        $this->url->expects($this->once())->method('getUrl')->with('', ['_direct' => 'target-path'])
+        $this->request->expects($this->once())->method('getParams')->willReturn($queryParams);
+        $this->url->expects($this->once())->method('getUrl')->with(
+            '',
+            ['_direct' => 'target-path', '_query' => $queryParams]
+        )
             ->will($this->returnValue('new-target-path'));
         $this->request->expects($this->once())->method('setDispatched')->with(true);
         $this->actionFactory->expects($this->once())->method('create')
@@ -282,15 +287,20 @@ public function testMatchWithRedirect()
      */
     public function testMatchWithCustomInternalRedirect()
     {
+        $queryParams = [];
         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
         $urlRewrite = $this->getMockBuilder(UrlRewrite::class)
             ->disableOriginalConstructor()->getMock();
         $urlRewrite->expects($this->any())->method('getEntityType')->will($this->returnValue('custom'));
         $urlRewrite->expects($this->any())->method('getRedirectType')->will($this->returnValue('redirect-code'));
         $urlRewrite->expects($this->any())->method('getTargetPath')->will($this->returnValue('target-path'));
         $this->urlFinder->expects($this->any())->method('findOneByData')->will($this->returnValue($urlRewrite));
+        $this->request->expects($this->any())->method('getParams')->willReturn($queryParams);
         $this->response->expects($this->once())->method('setRedirect')->with('a', 'redirect-code');
-        $this->url->expects($this->once())->method('getUrl')->with('', ['_direct' => 'target-path'])->willReturn('a');
+        $this->url->expects($this->once())->method('getUrl')->with(
+            '',
+            ['_direct' => 'target-path', '_query' => $queryParams]
+        )->willReturn('a');
         $this->request->expects($this->once())->method('setDispatched')->with(true);
         $this->actionFactory->expects($this->once())->method('create')
             ->with(\Magento\Framework\App\Action\Redirect::class);
@@ -312,6 +322,7 @@ public function testMatchWithCustomExternalRedirect($targetPath)
         $urlRewrite->expects($this->any())->method('getTargetPath')->will($this->returnValue($targetPath));
         $this->urlFinder->expects($this->any())->method('findOneByData')->will($this->returnValue($urlRewrite));
         $this->response->expects($this->once())->method('setRedirect')->with($targetPath, 'redirect-code');
+        $this->request->expects($this->never())->method('getParams');
         $this->url->expects($this->never())->method('getUrl');
         $this->request->expects($this->once())->method('setDispatched')->with(true);
         $this->actionFactory->expects($this->once())->method('create')