Fix Integration Test

Author: Atul-glo35265

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

@@ -7,6 +7,7 @@
 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;
@@ -27,16 +28,24 @@ class TableResolver
      */
     private $tableResolver;
 
+    /**
+     * @var State
+     */
+    private $state;
+
     /**
      * @param StoreManagerInterface $storeManager
      * @param IndexScopeResolver $tableResolver
+     * @param State $state
      */
     public function __construct(
         StoreManagerInterface $storeManager,
-        IndexScopeResolver $tableResolver
+        IndexScopeResolver $tableResolver,
+        State $state
     ) {
         $this->storeManager = $storeManager;
         $this->tableResolver = $tableResolver;
+        $this->state = $state;
     }
 
     /**
@@ -55,9 +64,12 @@ public function afterGetTableName(
         string $result,
         $modelEntity
     ) {
+        $areaCode = $this->state->getAreaCode();
+
         if (!is_array($modelEntity) &&
             $modelEntity === AbstractAction::MAIN_INDEX_TABLE &&
-            $this->storeManager->getStore()->getId()
+            $this->storeManager->getStore()->getId() &&
+            $areaCode != 'adminhtml'
         ) {
             $catalogCategoryProductDimension = new Dimension(
                 \Magento\Store\Model\Store::ENTITY,

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

@@ -567,13 +567,7 @@ private function getProductsCountFromCategoryTable(Category $item, string $websi
      */
     private function getProductsCountQuery(array $categoryIds, $addVisibilityFilter = true): Select
     {
-        $connections = $this->_resource->getConnection();
-        $categoryTable = $connections->getTableName('catalog_category_product_index');
-
-        $tablePrefix = $this->_resource->getTablePrefix();
-        if ($tablePrefix && strpos($categoryTable, $tablePrefix) !== 0) {
-            $categoryTable = $tablePrefix . $categoryTable;
-        }
+        $categoryTable = $this->_resource->getTableName('catalog_category_product_index');
 
         $select = $this->_conn->select()
             ->from(