AC-15050: PHPUnit 12 Upgrade | Added Trait Helper

Author: manishranjan-adobe

app/code/Magento/CatalogSearch/Test/Unit/Block/Plugin/FrontTabPluginTest.php

@@ -13,9 +13,9 @@
 use Magento\Framework\Data\Form;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Data\Form\Element\Fieldset;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\Element\AbstractBlock;
-use Magento\Framework\Test\Unit\Helper\AbstractBlockTestHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -24,6 +24,7 @@
  */
 class FrontTabPluginTest extends TestCase
 {
+    use MockCreationTrait;
     /**
      * @var FrontTabPlugin
      */
@@ -66,23 +67,20 @@ class FrontTabPluginTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->weightSourceMock = $this->getMockBuilder(WeightSource::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->subjectMock = $this->getMockBuilder(ProductAttributeFrontTabBlock::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->formMock = $this->getMockBuilder(Form::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->fieldsetMock = $this->getMockBuilder(Fieldset::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->weightSourceMock = $this->createMock(WeightSource::class);
+
+        $this->subjectMock = $this->createMock(ProductAttributeFrontTabBlock::class);
+
+        $this->formMock = $this->createMock(Form::class);
+
+        $this->fieldsetMock = $this->createMock(Fieldset::class);
+
         $this->childElementMock = $this->createMock(AbstractElement::class);
-        $this->childBlockMock = $this->getMockBuilder(AbstractBlockTestHelper::class)
-            ->onlyMethods(['addFieldMap', 'addFieldDependence'])
-            ->disableOriginalConstructor()
-            ->getMock();
+
+        $this->childBlockMock = $this->createPartialMockWithReflection(
+            AbstractBlock::class,
+            ['addFieldMap', 'addFieldDependence']
+        );
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->plugin = $this->objectManagerHelper->getObject(

app/code/Magento/CatalogSearch/Test/Unit/Controller/Advanced/ResultTest.php

@@ -20,22 +20,22 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Message\Manager;
 use Magento\Framework\Phrase;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Url;
 use Magento\Framework\UrlFactory;
 use Magento\Framework\View\Model\Layout\Merge;
 use Magento\Framework\View\Result\Layout;
 use Magento\Framework\View\Result\Page;
 use Magento\Framework\Webapi\Response;
-use Magento\Framework\Test\Unit\Helper\LayoutTestHelper;
-use Magento\CatalogSearch\Test\Unit\Helper\RequestTestHelper;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ResultTest extends TestCase
 {
+    use MockCreationTrait;
     /**
      * Test result action filters set before load layout scenario
      *
@@ -52,10 +52,10 @@ public function testResultActionFiltersSetBeforeLoadLayout()
         );
         $update = $this->createPartialMock(Merge::class, ['getHandles']);
         $update->expects($this->once())->method('getHandles')->willReturn([]);
-        $layout = $this->getMockBuilder(LayoutTestHelper::class)
-            ->onlyMethods(['getUpdate'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $layout = $this->createPartialMockWithReflection(
+            Layout::class,
+            ['getUpdate']
+        );
         $layout->expects($this->once())->method('getUpdate')->willReturn($update);
         $view->expects($this->once())->method('getLayout')->willReturn($layout);
         $page = $this->createPartialMock(Page::class, ['initLayout']);
@@ -66,10 +66,10 @@ function () use (&$filters, $expectedQuery) {
             }
         );
 
-        $request = $this->getMockBuilder(RequestTestHelper::class)
-            ->onlyMethods(['getQueryValue'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $request = $this->createPartialMockWithReflection(
+            Request::class,
+            ['getQueryValue']
+        );
         $request->expects($this->once())->method('getQueryValue')->willReturn($expectedQuery);
 
         $catalogSearchAdvanced = $this->createPartialMock(
@@ -107,12 +107,13 @@ public function testUrlSetOnException()
         $redirectResultMock->expects($this->once())
             ->method('setUrl');
 
-        $redirectFactoryMock = $this->getMockBuilder(RedirectFactory::class)
-            ->onlyMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $redirectFactoryMock = $this->createPartialMock(
+            RedirectFactory::class,
+            ['create']
+        );
 
-        $redirectFactoryMock->method('create')->willReturn($redirectResultMock);
+        $redirectFactoryMock->method('create')
+            ->willReturn($redirectResultMock);
 
         $catalogSearchAdvanced = $this->createPartialMock(
             Advanced::class,
@@ -133,19 +134,25 @@ public function testUrlSetOnException()
         $requestMock->method('getQueryValue')->willReturn(['key' => 'value']);
 
         $redirectMock = $this->createMock(RedirectInterface::class);
-        $redirectMock->expects($this->any())->method('error')->with('urlstring');
+        $redirectMock->method('error')->with('urlstring');
 
         $messageManagerMock = $this->createMock(Manager::class);
 
         $eventManagerMock = $this->createMock(ManagerInterface::class);
 
         $contextMock = $this->createMock(Context::class);
-        $contextMock->method('getRequest')->willReturn($requestMock);
-        $contextMock->method('getResponse')->willReturn($responseMock);
-        $contextMock->method('getRedirect')->willReturn($redirectMock);
-        $contextMock->method('getMessageManager')->willReturn($messageManagerMock);
-        $contextMock->method('getEventManager')->willReturn($eventManagerMock);
-        $contextMock->method('getResultRedirectFactory')->willReturn($redirectFactoryMock);
+        $contextMock->method('getRequest')
+            ->willReturn($requestMock);
+        $contextMock->method('getResponse')
+            ->willReturn($responseMock);
+        $contextMock->method('getRedirect')
+            ->willReturn($redirectMock);
+        $contextMock->method('getMessageManager')
+            ->willReturn($messageManagerMock);
+        $contextMock->method('getEventManager')
+            ->willReturn($eventManagerMock);
+        $contextMock->method('getResultRedirectFactory')
+            ->willReturn($redirectFactoryMock);
 
         $urlMock = $this->createMock(Url::class);
         $urlMock->expects($this->once())
@@ -186,10 +193,10 @@ public function testNoResultsHandle()
         $update = $this->createPartialMock(Merge::class, ['getHandles']);
         $update->expects($this->once())->method('getHandles')->willReturn([]);
 
-        $layout = $this->getMockBuilder(LayoutTestHelper::class)
-            ->onlyMethods(['getUpdate'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $layout = $this->createPartialMockWithReflection(
+            Layout::class,
+            ['getUpdate']
+        );
         $layout->expects($this->once())->method('getUpdate')->willReturn($update);
 
         $page = $this->createPartialMock(Page::class, ['initLayout']);
@@ -205,10 +212,10 @@ public function testNoResultsHandle()
         $view->expects($this->once())->method('getPage')->willReturn($page);
         $view->expects($this->once())->method('getLayout')->willReturn($layout);
 
-        $request = $this->getMockBuilder(RequestTestHelper::class)
-            ->onlyMethods(['getQueryValue'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $request = $this->createPartialMockWithReflection(
+            Request::class,
+            ['getQueryValue']
+        );
         $request->expects($this->once())->method('getQueryValue')->willReturn($expectedQuery);
 
         $catalogSearchAdvanced = $this->createPartialMock(