Merge remote-tracking branch 'origin/AC-10621' into AC-10821

Author: nishant04412

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/EditTest.php

@@ -17,7 +17,6 @@
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Registry;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\LayoutFactory;
 use Magento\Framework\View\Page\Title;
@@ -26,8 +25,6 @@
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Magento\Framework\Stdlib\DateTime\Filter\Date;
-use Magento\Cms\Model\Wysiwyg\Config;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -119,26 +116,6 @@ protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
 
-        $objects = [
-            [
-                Date::class,
-                $this->createMock(Date::class)
-            ],
-            [
-                Registry::class,
-                $this->createMock(Registry::class)
-            ],
-            [
-                StoreManagerInterface::class,
-                $this->createMock(StoreManagerInterface::class)
-            ],
-            [
-                Config::class,
-                $this->createMock(Config::class)
-            ]
-        ];
-        $this->objectManager->prepareObjectManager($objects);
-
         $this->categoryMock = $this->createPartialMock(
             Category::class,
             [

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Storage/DynamicStorageTest.php

@@ -16,6 +16,7 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\Store\Model\ScopeInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
@@ -128,6 +129,15 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $objectManager = new ObjectManager($this);
+        $objects = [
+            [
+                LoggerInterface::class,
+                $this->createMock(LoggerInterface::class)
+            ]
+        ];
+        $objectManager->prepareObjectManager($objects);
+
         $this->object = new DynamicStorage(
             $this->urlRewriteFactoryMock,
             $this->dataObjectHelperMock,

app/code/Magento/Checkout/Test/Unit/Block/Cart/LinkTest.php

@@ -9,10 +9,12 @@
 
 use Magento\Checkout\Block\Cart\Link;
 use Magento\Checkout\Helper\Cart;
+use Magento\Framework\Math\Random;
 use Magento\Framework\Module\Manager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 use PHPUnit\Framework\TestCase;
 
 class LinkTest extends TestCase
@@ -25,6 +27,18 @@ class LinkTest extends TestCase
     protected function setUp(): void
     {
         $this->_objectManagerHelper = new ObjectManager($this);
+
+        $objects = [
+            [
+                SecureHtmlRenderer::class,
+                $this->createMock(SecureHtmlRenderer::class)
+            ],
+            [
+                Random::class,
+                $this->createMock(Random::class)
+            ]
+        ];
+        $this->_objectManagerHelper->prepareObjectManager($objects);
     }
 
     public function testGetUrl()
@@ -51,7 +65,7 @@ public function testToHtml()
         $moduleManager = $this->getMockBuilder(
             Manager::class
         )->disableOriginalConstructor()
-            ->setMethods(
+            ->onlyMethods(
                 ['isOutputEnabled']
             )->getMock();
         $helper = $this->getMockBuilder(Cart::class)
@@ -83,7 +97,7 @@ public function testGetLabel($productCount, $label)
         $helper = $this->getMockBuilder(
             Cart::class
         )->disableOriginalConstructor()
-            ->setMethods(
+            ->onlyMethods(
                 ['getSummaryCount']
             )->getMock();
 

app/code/Magento/Checkout/Test/Unit/Block/LinkTest.php

@@ -65,14 +65,14 @@ public function testToHtml($canOnepageCheckout, $isOutputEnabled)
         $helper = $this->getMockBuilder(
             Data::class
         )->disableOriginalConstructor()
-            ->setMethods(
+            ->onlyMethods(
                 ['canOnepageCheckout', 'isModuleOutputEnabled']
             )->getMock();
 
         $moduleManager = $this->getMockBuilder(
             Manager::class
         )->disableOriginalConstructor()
-            ->setMethods(
+            ->onlyMethods(
                 ['isOutputEnabled']
             )->getMock();
 

app/code/Magento/Cms/Test/Unit/Model/BlockRepositoryTest.php

@@ -19,7 +19,9 @@
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\EntityManager\HydratorInterface;
 use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -128,7 +130,7 @@ protected function setUp(): void
             ->getMock();
         $this->collection = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
-            ->setMethods(['addFieldToFilter', 'getSize', 'setCurPage', 'setPageSize', 'load', 'addOrder'])
+            ->onlyMethods(['addFieldToFilter', 'getSize', 'setCurPage', 'setPageSize', 'load', 'addOrder'])
             ->getMock();
 
         $blockFactory->expects($this->any())
@@ -156,6 +158,10 @@ protected function setUp(): void
         $this->collectionProcessor = $this->getMockBuilder(CollectionProcessorInterface::class)
             ->getMockForAbstractClass();
 
+        $hydrator = $this->getMockBuilder(HydratorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->repository = new BlockRepository(
             $this->blockResource,
             $blockFactory,
@@ -165,7 +171,8 @@ protected function setUp(): void
             $this->dataHelper,
             $this->dataObjectProcessor,
             $this->storeManager,
-            $this->collectionProcessor
+            $this->collectionProcessor,
+            $hydrator
         );
     }