Merge branch 'BUG#AC-3049' into spartans_cloud_native_245_25052022

Author: glo80326

dev/tests/setup-integration/framework/Magento/TestFramework/TestCase/SetupTestCase.php

@@ -7,10 +7,12 @@
 
 namespace Magento\TestFramework\TestCase;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\ConnectionException;
 use Magento\Framework\DB\Adapter\SqlVersionProvider;
 use Magento\TestFramework\Annotation\DataProviderFromFile;
 use Magento\TestFramework\Helper\Bootstrap;
+use Zend_Db_Statement_Exception;
 
 /**
  * Instance of Setup test case. Used in order to tweak dataProviders functionality.
@@ -32,17 +34,25 @@ class SetupTestCase extends \PHPUnit\Framework\TestCase implements MutableDataIn
      */
     private $sqlVersionProvider;
 
+    /**
+     * @var ResourceConnection
+     */
+    private ResourceConnection $resourceConnection;
+
     /**
      * @inheritDoc
      */
     public function __construct(
         $name = null,
         array $data = [],
-        $dataName = ''
+        $dataName = '',
+        ResourceConnection $resourceConnection = null
     ) {
         parent::__construct($name, $data, $dataName);
 
-        $this->sqlVersionProvider = Bootstrap::getObjectManager()->get(SqlVersionProvider::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $this->sqlVersionProvider = $objectManager->get(SqlVersionProvider::class);
+        $this->resourceConnection = $resourceConnection ?? $objectManager->get(ResourceConnection::class);
     }
 
     /**
@@ -105,4 +115,20 @@ private function getDbKey(): string
 
         return $this->dbKey;
     }
+
+    /**
+     * Checks if the DB connection Aurora RDS
+     *
+     * @param string $resource
+     * @return bool
+     */
+    public function isUsingAuroraDb(string $resource = ResourceConnection::DEFAULT_CONNECTION): bool
+    {
+        try {
+            $this->resourceConnection->getConnection($resource)->query('SELECT AURORA_VERSION();');
+            return true;
+        } catch (Zend_Db_Statement_Exception $e) {
+            return false;
+        }
+    }
 }

dev/tests/setup-integration/testsuite/Magento/Setup/DeclarativeInstallerTest.php

@@ -216,7 +216,7 @@ public function testInstallationWithConstraintsModification()
         );
         self::assertNull($diff->getAll());
         $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
-        self::assertEquals($this->getTrimmedData(), $shardData);
+        $this->assertTableCreationStatements($this->getTrimmedData(), $shardData);
     }
 
     /**
@@ -246,7 +246,7 @@ public function testInstallationWithDroppingTables()
         );
         self::assertNull($diff->getAll());
         $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
-        self::assertEquals($this->getData(), $shardData);
+        $this->assertTableCreationStatements($this->getData(), $shardData);
     }
 
     /**
@@ -305,6 +305,10 @@ public function testInstallWithCodeBaseRollback()
         $this->cliCommand->install(
             ['Magento_TestSetupDeclarationModule1']
         );
+
+        if ($this->isUsingAuroraDb()) {
+            $this->markTestSkipped('Test skipped in AWS Aurora');
+        }
         $beforeRollback = $this->describeTable->describeShard('default');
         self::assertEquals($this->getTrimmedData()['before'], $beforeRollback);
         //Move db_schema.xml file and tried to install
@@ -344,7 +348,9 @@ public function testTableRename()
             $this->resourceConnection->getTableName('some_table'),
             $dataToMigrate
         );
-        self::assertEquals($this->getData()['before'], $before['some_table']);
+        $this->isUsingAuroraDb() ?
+            $this->assertStringContainsString($before['some_table'], $this->getTrimmedData()['before']) :
+            $this->assertEquals($this->getData()['before'], $before['some_table']);
         //Move db_schema.xml file and tried to install
         $this->moduleManager->updateRevision(
             'Magento_TestSetupDeclarationModule1',
@@ -355,7 +361,9 @@ public function testTableRename()
 
         $this->cliCommand->upgrade();
         $after = $this->describeTable->describeShard('default');
-        self::assertEquals($this->getData()['after'], $after['some_table_renamed']);
+        $this->isUsingAuroraDb() ?
+            $this->assertStringContainsString($after['some_table_renamed'], $this->getTrimmedData()['after']) :
+            $this->assertEquals($this->getData()['after'], $after['some_table_renamed']);
         $select = $adapter->select()
             ->from($this->resourceConnection->getTableName('some_table_renamed'));
         self::assertEquals([$dataToMigrate], $adapter->fetchAll($select));
@@ -459,6 +467,26 @@ public function testInstallationWithDisablingTables()
         );
         self::assertNull($diff->getAll());
         $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
-        self::assertEquals($this->getData(), $shardData);
+        $this->assertTableCreationStatements($this->getData(), $shardData);
+    }
+
+    /**
+     * Assert table creation statements
+     *
+     * @param array $expectedData
+     * @param array $actualData
+     */
+    private function assertTableCreationStatements(array $expectedData, array $actualData): void
+    {
+        if (!$this->isUsingAuroraDb()) {
+            $this->assertEquals($expectedData, $actualData);
+        } else {
+            ksort($expectedData);
+            ksort($actualData);
+            $this->assertSameSize($expectedData, $actualData);
+            foreach ($expectedData as $key => $value) {
+                $this->assertStringContainsString($actualData[$key], $value);
+            }
+        }
     }
 }

dev/tests/setup-integration/testsuite/Magento/Setup/ShardingTest.php

@@ -78,7 +78,7 @@ public function testInstall()
         self::assertCount(2, $default);
         self::assertCount(1, $shard1);
         self::assertCount(1, $shard2);
-        self::assertEquals($this->getData(), array_replace($default, $shard1, $shard2));
+        $this->assertTableCreationStatements($this->getData(), array_replace($default, $shard1, $shard2));
     }
 
     /**
@@ -99,6 +99,26 @@ public function testUpgrade()
         self::assertCount(2, $default);
         self::assertCount(1, $shard1);
         self::assertCount(1, $shard2);
-        self::assertEquals($this->getData(), array_replace($default, $shard1, $shard2));
+        $this->assertTableCreationStatements($this->getData(), array_replace($default, $shard1, $shard2));
+    }
+
+    /**
+     * Assert table creation statements
+     *
+     * @param array $expectedData
+     * @param array $actualData
+     */
+    private function assertTableCreationStatements(array $expectedData, array $actualData): void
+    {
+        if (!$this->isUsingAuroraDb()) {
+            $this->assertEquals($expectedData, $actualData);
+        } else {
+            ksort($expectedData);
+            ksort($actualData);
+            $this->assertSameSize($expectedData, $actualData);
+            foreach ($expectedData as $key => $value) {
+                $this->assertStringContainsString($actualData[$key], $value);
+            }
+        }
     }
 }