AC-9755:Fix unit tests

Author: glo17680

app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php

@@ -27,9 +27,9 @@ class IndexerHandler extends Grid
     private $flatScopeResolver;
 
     /***
-     * Old Charset for flat table
+     * check for old collation
      */
-    private const OLDCHARSET = 'utf8|utf8mb3';
+    private const OLDCOLLATION = 'utf8_general_ci|utf8mb3_general_ci';
 
     /***
      * table design_config_grid_flat
@@ -88,8 +88,8 @@ public function cleanIndex($dimensions)
             $this->connection->delete($tableName);
             // change the charset to utf8mb4
             if ($tableName === self::DESIGN_CONFIG_GRID_FLAT) {
-                $getTableSchema = $this->connection->getCreateTable($tableName) ?? '';
-                if (preg_match('/\b('. self::OLDCHARSET .')\b/', $getTableSchema)) {
+                $getTableSchema = $this->connection->showTableStatus($tableName) ?? '';
+                if (isset($getTableSchema['Collation']) && preg_match('/\b('. SELF::OLDCOLLATION .')\b/', $getTableSchema['Collation'])) {
                     $charset = $this->columnConfig->getDefaultCharset();
                     $collate = $this->columnConfig->getDefaultCollation();
                     $columnEncoding = " CHARACTER SET ".$charset." COLLATE ".$collate;

app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php

@@ -22,6 +22,7 @@
 use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Framework\Indexer\StructureFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table as DtoFactoriesTable;
 use Magento\Theme\Model\Data\Design\Config as DesignConfig;
 use Magento\Theme\Model\Indexer\Design\Config;
 use Magento\Theme\Model\ResourceModel\Design\Config\Scope\CollectionFactory;
@@ -91,6 +92,10 @@ class ConfigTest extends TestCase
      * @var CollectionFactory|MockObject
      */
     private $collectionFactory;
+    /***
+     * @var DtoFactoriesTable|MockObject
+     */
+    private $dtoFactoriesTable;
 
     protected function setUp(): void
     {
@@ -132,6 +137,9 @@ protected function setUp(): void
             ->getMock();
         $this->indexerFieldset = $this->getMockBuilder(FieldsetInterface::class)
             ->getMockForAbstractClass();
+        $this->dtoFactoriesTable = $this->getMockBuilder(DtoFactoriesTable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 
     /**
@@ -171,7 +179,9 @@ private function getDesignConfigIndexerModel(): Config
             [
                 'fieldsets' => [],
                 'indexer_id' => DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID
-            ]
+            ],
+            [],
+            $this->dtoFactoriesTable
         );
 
         $this->saveHandlerFactory->expects($this->any())