AC-10821: Static Test fixes

Author: nishant04412

app/code/Magento/Backend/Test/Unit/Block/MenuTest.php

@@ -16,13 +16,14 @@
 use Magento\Backend\Model\Menu\Filter\IteratorFactory;
 use Magento\Backend\Model\Menu\Item;
 use Magento\Backend\Model\UrlInterface;
-use Magento\Directory\Helper\Data as DirectoryHelper;
-use Magento\Framework\Json\Helper\Data as JsonHelper;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class MenuTest extends TestCase
 {
     /**
@@ -75,17 +76,8 @@ protected function setUp(): void
             ->getMock();
 
         $objectManagerHelper = new ObjectManagerHelper($this);
-        $objects = [
-            [
-                JsonHelper::class,
-                $this->createMock(JsonHelper::class)
-            ],
-            [
-                DirectoryHelper::class,
-                $this->createMock(DirectoryHelper::class)
-            ]
-        ];
-        $objectManagerHelper->prepareObjectManager($objects);
+        $objectManagerHelper->prepareObjectManager();
+
         $this->menu =  $objectManagerHelper->getObject(
             Menu::class,
             [

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

@@ -25,6 +25,9 @@
 use ReflectionMethod;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class DynamicStorageTest extends TestCase
 {
     /**

app/code/Magento/Checkout/Test/Unit/Model/DefaultConfigProviderTest.php

@@ -128,7 +128,7 @@ protected function setUp(): void
         $this->addressMetadata = $this->createMock(AddressMetadataInterface::class);
         $attributeOptionManager = $this->createMock(AttributeOptionManagementInterface::class);
         $customerAddressData = $this->createMock(CustomerAddressDataProvider::class);
-        $escaper = $this->createMock(Escaper::class);
+        $this->escaper = $this->createMock(Escaper::class);
         $this->model = new DefaultConfigProvider(
             $checkoutHelper,
             $this->checkoutSession,
@@ -160,7 +160,7 @@ protected function setUp(): void
             $this->addressMetadata,
             $attributeOptionManager,
             $customerAddressData,
-            $escaper
+            $this->escaper
         );
     }
 

app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Wysiwyg/Images/TreeTest.php

@@ -11,12 +11,10 @@
 use Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree;
 use Magento\Cms\Helper\Wysiwyg\Images;
 use Magento\Cms\Model\Wysiwyg\Images\Storage;
-use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\DataObject;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\Read;
-use Magento\Framework\Json\Helper\Data as JsonHelper;
 use Magento\Framework\Registry;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -64,18 +62,7 @@ class TreeTest extends TestCase
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
-
-        $objects = [
-            [
-                JsonHelper::class,
-                $this->createMock(JsonHelper::class)
-            ],
-            [
-                DirectoryHelper::class,
-                $this->createMock(DirectoryHelper::class)
-            ]
-        ];
-        $objectManager->prepareObjectManager($objects);
+        $objectManager->prepareObjectManager();
 
         $contextMock = $this->createMock(Context::class);
         $this->cmsWysiwygImagesMock = $this->createMock(Images::class);

lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php

@@ -368,7 +368,7 @@ public function setBackwardCompatibleProperty($object, $propertyName, $propertyV
      *
      * @param array $map
      */
-    public function prepareObjectManager($map)
+    public function prepareObjectManager(array $map = [])
     {
         $objectManagerMock = $this->_testObject->getMockBuilder(ObjectManagerInterface::class)
             ->addMethods(['getInstance'])