AC-10634: setMethods replaced with onlyMethods() or addMethods()

Author: nishant04412

app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php

@@ -130,11 +130,6 @@ class QuoteTest extends TestCase
      */
     protected $objectManagerMock;
 
-    /**
-     * @var SessionStartChecker
-     */
-    protected $sessionStartCheckerMock;
-
     /**
      * Set up
      *
@@ -215,14 +210,13 @@ protected function setUp(): void
 
         $this->quoteFactoryMock = $this->createPartialMock(QuoteFactory::class, ['create']);
 
-        $this->sessionStartCheckerMock = $this->createMock(SessionStartChecker::class);
-
-        /** @var ObjectManagerInterface|MockObject $objectManagerMock */
-        $objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
-        $objectManagerMock->expects($this->once())
-            ->method('get')
-            ->willReturn($this->sessionStartCheckerMock);
-        \Magento\Framework\App\ObjectManager::setInstance($objectManagerMock);
+        $objects = [
+            [
+                SessionStartChecker::class,
+                $this->createMock(SessionStartChecker::class)
+            ]
+        ];
+        $this->objectManager->prepareObjectManager($objects);
 
         $this->quote = $this->getMockBuilder(Quote::class)
             ->addMethods(['getStoreId', 'getQuoteId', 'setQuoteId', 'hasCustomerId', 'getCustomerId'])

app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php

@@ -22,6 +22,7 @@
 use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\ImportExport\Model\ResourceModel\Helper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -101,6 +102,11 @@ class DownloadTest extends TestCase
      */
     protected $resultRedirectMock;
 
+    /**
+     * @var Helper
+     */
+    protected $resourceHelper;
+
     protected function setUp(): void
     {
         $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
@@ -111,11 +117,12 @@ protected function setUp(): void
             ->getMock();
         $this->backupModelFactoryMock = $this->getMockBuilder(BackupFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
         $this->backupModelMock = $this->getMockBuilder(Backup::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getTime', 'exists', 'getSize', 'output', 'getPath', 'getFileName'])
+            ->addMethods(['getTime', 'getPath'])
+            ->onlyMethods(['exists', 'getSize', 'output', 'getFileName'])
             ->getMock();
         $this->dataHelperMock = $this->getMockBuilder(Data::class)
             ->disableOriginalConstructor()
@@ -125,12 +132,12 @@ protected function setUp(): void
             ->getMock();
         $this->resultRawFactoryMock = $this->getMockBuilder(RawFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
         $this->resultRedirectFactoryMock = $this->getMockBuilder(
             RedirectFactory::class
         )->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
         $this->resultRawMock = $this->getMockBuilder(Raw::class)
             ->disableOriginalConstructor()
@@ -139,6 +146,10 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->resourceHelper = $this->getMockBuilder(Helper::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->objectManager = new ObjectManager($this);
         $this->context = $this->objectManager->getObject(
             Context::class,
@@ -149,9 +160,19 @@ protected function setUp(): void
                 'resultRedirectFactory' => $this->resultRedirectFactoryMock
             ]
         );
+
+        $objects = [
+            [
+                Data::class,
+                $this->dataHelperMock
+            ]
+        ];
+        $this->objectManager->prepareObjectManager($objects);
+
         $this->downloadController = $this->objectManager->getObject(
             Download::class,
             [
+                'helper' => $this->resourceHelper,
                 'context' => $this->context,
                 'backupModelFactory' => $this->backupModelFactoryMock,
                 'fileFactory' => $this->fileFactoryMock,
@@ -260,7 +281,7 @@ public function testExecuteBackupNotFound($time, $exists, $existsCount)
     /**
      * @return array
      */
-    public function executeBackupNotFoundDataProvider()
+    public static function executeBackupNotFoundDataProvider()
     {
         return [
             [1, false, 1],

app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php

@@ -18,6 +18,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Session\Storage;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Session\SessionStartChecker;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManager;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -120,19 +121,6 @@ protected function setUp(): void
             $this->_getStoreStub()
         );
 
-        // \Magento\Customer\Model\Session
-        $this->_objectManager = $this->getMockForAbstractClass(ObjectManagerInterface::class);
-        $this->_objectManager->expects(
-            $this->any()
-        )->method(
-            'get'
-        )->willReturnMap(
-            [
-                Data::class => $this->_getHelperStub(),
-                Session::class => $this->session,
-            ]
-        );
-
         $this->_resLogFactory = $this->createPartialMock(
             LogFactory::class,
             ['create']
@@ -284,12 +272,20 @@ public function testGetWord()
     protected function _getSessionStub()
     {
         $helper = new ObjectManager($this);
+        $objects = [
+            [
+                SessionStartChecker::class,
+                $this->createMock(SessionStartChecker::class)
+            ]
+        ];
+        $helper->prepareObjectManager($objects);
         $sessionArgs = $helper->getConstructArguments(
             Session::class,
             ['storage' => new Storage()]
         );
         $session = $this->getMockBuilder(Session::class)
-            ->setMethods(['isLoggedIn', 'getUserCreateWord'])
+            ->addMethods(['getUserCreateWord'])
+            ->onlyMethods(['isLoggedIn'])
             ->setConstructorArgs($sessionArgs)
             ->getMock();
         $session->expects($this->any())->method('isLoggedIn')->willReturn(false);
@@ -315,7 +311,7 @@ protected function _getHelperStub()
         $helper = $this->getMockBuilder(
             Data::class
         )->disableOriginalConstructor()
-            ->setMethods(
+            ->onlyMethods(
                 ['getConfig', 'getFonts', '_getWebsiteCode', 'getImgUrl']
             )->getMock();
 
@@ -415,7 +411,7 @@ public function testIsShownToLoggedInUser($expectedResult, $formId)
     /**
      * @return array
      */
-    public function isShownToLoggedInUserDataProvider()
+    public static function isShownToLoggedInUserDataProvider()
     {
         return [
             [true, 'contact_us'],
@@ -449,7 +445,7 @@ public function testGenerateWord($string)
     /**
      * @return array
      */
-    public function generateWordProvider()
+    public static function generateWordProvider()
     {
         return [
             ['ABC123'],

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -29,6 +29,7 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Locale\Format;
 use Magento\Framework\Locale\FormatInterface;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Model\StoreManagerInterface;
@@ -125,38 +126,38 @@ protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
         $this->productLinkFactoryMock = $this->getMockBuilder(ProductLinkInterfaceFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->productRepositoryMock = $this->createMock(ProductRepository::class);
         $this->requestMock = $this->getMockBuilder(RequestInterface::class)
-            ->setMethods(['getPost'])
+            ->addMethods(['getPost'])
             ->getMockForAbstractClass();
         $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
         $this->stockFilterMock = $this->createMock(StockDataFilter::class);
 
         $this->productMock = $this->getMockBuilder(Product::class)
-            ->setMethods(
+            ->addMethods(['getOptionsReadOnly'])
+            ->onlyMethods(
                 [
                     'getId',
                     'isLockedAttribute',
                     'lockAttribute',
                     'getAttributes',
                     'unlockAttribute',
-                    'getOptionsReadOnly',
                     'getSku',
                 ]
             )
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $productExtensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
-            ->setMethods(['getCategoryLinks', 'setCategoryLinks'])
+            ->addMethods(['getCategoryLinks', 'setCategoryLinks'])
             ->getMockForAbstractClass();
         $this->productMock->setExtensionAttributes($productExtensionAttributes);
 
         $this->customOptionFactoryMock = $this->getMockBuilder(ProductCustomOptionInterfaceFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->getMock();
         $this->productLinksMock = $this->createMock(ProductLinks::class);
         $this->linkTypeProviderMock = $this->createMock(LinkTypeProvider::class);
@@ -169,14 +170,22 @@ protected function setUp(): void
         $this->dateTimeFilterMock = $this->createMock(DateTime::class);
 
         $categoryLinkFactoryMock = $this->getMockBuilder(CategoryLinkInterfaceFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $categoryLinkFactoryMock->method('create')
             ->willReturnCallback(function () {
                 return $this->createMock(CategoryLinkInterface::class);
             });
 
+        $objects = [
+            [
+                ProductCustomOptionInterfaceFactory::class,
+                $this->customOptionFactoryMock
+            ]
+        ];
+        $this->prepareObjectManager($objects);
+
         $this->helper = $this->objectManager->getObject(
             Helper::class,
             [
@@ -280,7 +289,7 @@ public function testInitialize(
 
         $customOptionMock = $this->getMockBuilder(Option::class)
             ->disableOriginalConstructor()
-            ->setMethods(null)
+            ->onlyMethods([])
             ->getMock();
         $firstExpectedCustomOption = clone $customOptionMock;
         $firstExpectedCustomOption->setData($optionsData['option2']);
@@ -316,7 +325,7 @@ public function testInitialize(
             ->willReturnCallback(
                 function () {
                     return $this->getMockBuilder(ProductLink::class)
-                        ->setMethods(null)
+                        ->onlyMethods([])
                         ->disableOriginalConstructor()
                         ->getMock();
                 }
@@ -383,7 +392,7 @@ private function setProductAttributes(array $attributes): void
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function initializeDataProvider()
+    public static function initializeDataProvider()
     {
         return [
             [
@@ -559,7 +568,7 @@ public function initializeDataProvider()
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function mergeProductOptionsDataProvider()
+    public static function mergeProductOptionsDataProvider()
     {
         return [
             'options are not array, empty array is returned' => [
@@ -763,4 +772,22 @@ private function assembleProductRepositoryMock($links)
             ->method('getById')
             ->willReturnMap($repositoryReturnMap);
     }
+
+    /**
+     * @param $map
+     */
+    private function prepareObjectManager($map)
+    {
+        $objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->addMethods(['getInstance'])
+            ->onlyMethods(['get'])
+            ->getMockForAbstractClass();
+
+        $objectManagerMock->method('getInstance')->willReturnSelf();
+        $objectManagerMock->method('get')->willReturnMap($map);
+
+        $reflectionProperty = new \ReflectionProperty(\Magento\Framework\App\ObjectManager::class, '_instance');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($objectManagerMock);
+    }
 }