Integration test fix

Author: Atul-glo35265

app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/TableResolver.php

@@ -7,7 +7,6 @@
 namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\App\State;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
@@ -28,24 +27,16 @@ class TableResolver
      */
     private $tableResolver;
 
-    /**
-     * @var State
-     */
-    private $state;
-
     /**
      * @param StoreManagerInterface $storeManager
      * @param IndexScopeResolver $tableResolver
-     * @param State $state
      */
     public function __construct(
         StoreManagerInterface $storeManager,
-        IndexScopeResolver $tableResolver,
-        State $state
+        IndexScopeResolver $tableResolver
     ) {
         $this->storeManager = $storeManager;
         $this->tableResolver = $tableResolver;
-        $this->state = $state;
     }
 
     /**
@@ -64,14 +55,9 @@ public function afterGetTableName(
         string $result,
         $modelEntity
     ) {
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $state = $objectManager->get('Magento\Framework\App\State');
-        $areaCode = $state->getAreaCode();
-
         if (!is_array($modelEntity) &&
             $modelEntity === AbstractAction::MAIN_INDEX_TABLE &&
-            $this->storeManager->getStore()->getId() &&
-            $areaCode != 'adminhtml'
+            $this->storeManager->getStore()->getId()
         ) {
             $catalogCategoryProductDimension = new Dimension(
                 \Magento\Store\Model\Store::ENTITY,

app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php

@@ -568,7 +568,6 @@ private function getProductsCountFromCategoryTable(Category $item, string $websi
     private function getProductsCountQuery(array $categoryIds, $addVisibilityFilter = true): Select
     {
         $categoryTable = $this->_resource->getTableName('catalog_category_product_index');
-
         $select = $this->_conn->select()
             ->from(
                 ['cat_index' => $categoryTable],

dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/TreeTest.php

@@ -64,7 +64,47 @@ public function testSetGetCategoryIds(): void
      */
     public function testGetTreeJson(): void
     {
-        $jsonTree = $this->block->getTreeJson();
+        $categoryFactoryMock = $this->getMockBuilder(\Magento\Catalog\Model\CategoryFactory::class)
+            ->onlyMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $categoryMock = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
+            ->onlyMethods(['getCollection'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        // create resource connection mock
+        $resourceConnection = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+            ->onlyMethods(['getTableName'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $resourceConnection->method('getTableName')
+            ->willReturn('catalog_category_product_index');
+
+        $categoryFactoryMock->method('create')
+            ->willReturn($categoryMock);
+
+        $categoryCollection = $this->objectManager->create(
+            \Magento\Catalog\Model\ResourceModel\Category\Collection::class,
+            [
+                'resource' => $resourceConnection
+            ]
+        );
+
+        $categoryMock->method('getCollection')
+            ->willReturn($categoryCollection);
+
+        $treeObject = $this->objectManager->create(
+            \Magento\Catalog\Block\Adminhtml\Category\Checkboxes\Tree::class,
+            [
+                'categoryFactory' => $categoryFactoryMock
+            ]
+        );
+
+        $jsonTree = $treeObject->getTreeJson();
+
         $this->assertStringContainsString('Default Category (4)', $jsonTree);
         $this->assertStringContainsString('Category 1.1 (2)', $jsonTree);
         $this->assertStringContainsString('Category 1.1.1 (1)', $jsonTree);