#27500 Prepare CatalogSearch module Tests for PHPUnit 8

magento · Apr 12, 2020 · 0a5c603 · 0a5c603
1 parent 86515dd
commit 0a5c603
Show file tree

Hide file tree

Showing 60 changed files with 1,206 additions and 885 deletions.
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Block/Plugin/FrontTabPluginTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Block/Plugin/FrontTabPluginTest.php
@@ -1,23 +1,25 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\CatalogSearch\Test\Unit\Block\Plugin;
 
+use Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front as ProductAttributeFrontTabBlock;
 use Magento\CatalogSearch\Block\Plugin\FrontTabPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\CatalogSearch\Model\Source\Weight as WeightSource;
-use Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front as ProductAttributeFrontTabBlock;
 use Magento\Framework\Data\Form;
-use Magento\Framework\Data\Form\Element\Fieldset;
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Fieldset;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\Element\AbstractBlock;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class FrontTabPluginTest extends \PHPUnit\Framework\TestCase
+class FrontTabPluginTest extends TestCase
 {
     /**
      * @var FrontTabPlugin
@@ -30,36 +32,36 @@ class FrontTabPluginTest extends \PHPUnit\Framework\TestCase
     private $objectManagerHelper;
 
     /**
-     * @var WeightSource|\PHPUnit_Framework_MockObject_MockObject
+     * @var WeightSource|MockObject
      */
     private $weightSourceMock;
 
     /**
-     * @var ProductAttributeFrontTabBlock|\PHPUnit_Framework_MockObject_MockObject
+     * @var ProductAttributeFrontTabBlock|MockObject
      */
     private $subjectMock;
 
     /**
-     * @var Form|\PHPUnit_Framework_MockObject_MockObject
+     * @var Form|MockObject
      */
     private $formMock;
 
     /**
-     * @var Fieldset|\PHPUnit_Framework_MockObject_MockObject
+     * @var Fieldset|MockObject
      */
     private $fieldsetMock;
 
     /**
-     * @var AbstractElement|\PHPUnit_Framework_MockObject_MockObject
+     * @var AbstractElement|MockObject
      */
     private $childElementMock;
 
     /**
-     * @var AbstractBlock|\PHPUnit_Framework_MockObject_MockObject
+     * @var AbstractBlock|MockObject
      */
     private $childBlockMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->weightSourceMock = $this->getMockBuilder(WeightSource::class)
             ->disableOriginalConstructor()

diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Block/ResultTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Block/ResultTest.php
@@ -1,57 +1,67 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\CatalogSearch\Test\Unit\Block;
 
-use \Magento\CatalogSearch\Block\Result;
+use Magento\Catalog\Block\Product\ListProduct;
+use Magento\Catalog\Model\Layer;
+use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Catalog\Model\Layer\Search;
+use Magento\CatalogSearch\Block\Result;
+use Magento\CatalogSearch\Helper\Data;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Search\Model\Query;
+use Magento\Search\Model\QueryFactory;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit test for \Magento\CatalogSearch\Block\Result
  */
-class ResultTest extends \PHPUnit\Framework\TestCase
+class ResultTest extends TestCase
 {
-    /** @var  \Magento\Search\Model\Query|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  Query|MockObject */
     private $queryMock;
 
-    /** @var  \Magento\Search\Model\QueryFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  QueryFactory|MockObject */
     private $queryFactoryMock;
 
-    /** @var \Magento\CatalogSearch\Block\Result */
+    /** @var Result */
     protected $model;
 
-    /** @var \Magento\Framework\View\Element\Template\Context|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var Context|MockObject */
     protected $contextMock;
 
-    /** @var \Magento\Catalog\Model\Layer|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var Layer|MockObject */
     protected $layerMock;
 
-    /** @var \Magento\CatalogSearch\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var Data|MockObject */
     protected $dataMock;
 
     /**
-     * @var \Magento\Catalog\Block\Product\ListProduct|\PHPUnit_Framework_MockObject_MockObject
+     * @var ListProduct|MockObject
      */
     protected $childBlockMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->contextMock = $this->createMock(\Magento\Framework\View\Element\Template\Context::class);
-        $this->layerMock = $this->createMock(\Magento\Catalog\Model\Layer\Search::class);
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Layer\Resolver $layerResolver */
-        $layerResolver = $this->getMockBuilder(\Magento\Catalog\Model\Layer\Resolver::class)
+        $this->contextMock = $this->createMock(Context::class);
+        $this->layerMock = $this->createMock(Search::class);
+        /** @var MockObject|Resolver $layerResolver */
+        $layerResolver = $this->getMockBuilder(Resolver::class)
             ->disableOriginalConstructor()
             ->setMethods(['get', 'create'])
             ->getMock();
         $layerResolver->expects($this->any())
             ->method($this->anything())
             ->will($this->returnValue($this->layerMock));
-        $this->dataMock = $this->createMock(\Magento\CatalogSearch\Helper\Data::class);
-        $this->queryMock = $this->getMockBuilder(\Magento\Search\Model\Query::class)
+        $this->dataMock = $this->createMock(Data::class);
+        $this->queryMock = $this->getMockBuilder(Query::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->queryFactoryMock = $this->getMockBuilder(\Magento\Search\Model\QueryFactory::class)
+        $this->queryFactoryMock = $this->getMockBuilder(QueryFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['get'])
             ->getMock();
@@ -85,7 +95,7 @@ public function testGetNoResultText($isMinQueryLength, $expectedResult)
             $this->returnValue($isMinQueryLength)
         );
         if ($isMinQueryLength) {
-            $queryMock = $this->createMock(\Magento\Search\Model\Query::class);
+            $queryMock = $this->createMock(Query::class);
             $queryMock->expects($this->once())->method('getMinQueryLength')->will($this->returnValue('5'));
 
             $this->queryFactoryMock->expects($this->once())->method('get')->will($this->returnValue($queryMock));