ACP2E-3631: Adobe Commerce 2.4.7-p3 unit tests are failing

Author: dhorytskyi

app/code/Magento/Config/Test/Unit/Model/Config/XsdTest.php

@@ -52,7 +52,7 @@ public function testSchemaCorrectlyIdentifiesInvalidXml($xmlString, $expectedErr
                         $this->assertMatchesRegularExpression($error, $actualError);
                         $matched = true;
                         break;
-                    } catch (AssertionFailedError $e) {
+                    } catch (AssertionFailedError) {
                     }
                 }
                 $this->assertTrue($matched, "None of the errors matched: $error");

app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php

@@ -224,7 +224,7 @@ protected function _testXmlAgainstXsd($fixtureXml, $schemaFile, array $expectedE
                         $this->assertMatchesRegularExpression($error, $actualError);
                         $matched = true;
                         break;
-                    } catch (AssertionFailedError $e) {
+                    } catch (AssertionFailedError) {
                     }
                 }
                 $this->assertTrue($matched, "None of the errors matched: $error");

app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/XsdTest.php

@@ -66,7 +66,7 @@ public function testSchemaCorrectlyIdentifiesInvalidProductOptionsXml($xmlString
                         $this->assertMatchesRegularExpression($error, $actualError);
                         $matched = true;
                         break;
-                    } catch (AssertionFailedError $e) {
+                    } catch (AssertionFailedError) {
                     }
                 }
                 $this->assertTrue($matched, "None of the errors matched: $error");

app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/XsdMergedTest.php

@@ -52,7 +52,7 @@ public function testSchemaCorrectlyIdentifiesInvalidXml($xmlString, $expectedErr
                         $this->assertMatchesRegularExpression($error, $actualError);
                         $matched = true;
                         break;
-                    } catch (AssertionFailedError $e) {
+                    } catch (AssertionFailedError) {
                     }
                 }
                 $this->assertTrue($matched, "None of the errors matched: $error");

app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/XsdTest.php

@@ -52,7 +52,7 @@ public function testSchemaCorrectlyIdentifiesInvalidXml($xmlString, $expectedErr
                         $this->assertMatchesRegularExpression($error, $actualError);
                         $matched = true;
                         break;
-                    } catch (AssertionFailedError $e) {
+                    } catch (AssertionFailedError) {
                     }
                 }
                 $this->assertTrue($matched, "None of the errors matched: $error");

app/code/Magento/Integration/Test/Unit/Model/Config/XsdTest.php

@@ -1,17 +1,19 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\MessageQueue\Test\Unit\Console;
 
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager as AppObjectManager;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface;
 use Magento\Framework\Module\ModuleListInterface;
 use Magento\Framework\Mview\TriggerCleaner;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\Patch\PatchApplier;
@@ -166,6 +168,18 @@ protected function setUp(): void
             });
         $this->setupFactory = $this->createMock(SetupFactory::class);
         $this->setupFactory->method('create')->willReturn($this->schemaSetupInterface);
+
+        try {
+            AppObjectManager::getInstance();
+        } catch (\RuntimeException) {
+            // Installer class creates instance of DeploymentConfig in the constructor
+            // so the object manager should be defined.
+            $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+            $objectManagerMock->method('get')
+                ->willReturnCallback(fn ($type) => $this->createMock($type));
+            AppObjectManager::setInstance($objectManagerMock);
+        }
+
         $this->installer = $objectManager->getObject(
             Installer::class,
             [

app/code/Magento/MessageQueue/Test/Unit/Console/PoisonPillApplyDuringSetupUpgradeTest.php

@@ -60,7 +60,7 @@ public function testSchemaCorrectlyIdentifiesInvalidXml($xmlString, $expectedErr
                         $this->assertMatchesRegularExpression($error, $actualError);
                         $matched = true;
                         break;
-                    } catch (AssertionFailedError $e) {
+                    } catch (AssertionFailedError) {
                     }
                 }
                 $this->assertTrue($matched, "None of the errors matched: $error");

app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/XsdTest.php

@@ -57,7 +57,7 @@ public function testSchemaCorrectlyIdentifiesInvalidXml($xmlString, $expectedErr
                         $this->assertMatchesRegularExpression($error, $actualError);
                         $matched = true;
                         break;
-                    } catch (AssertionFailedError $e) {
+                    } catch (AssertionFailedError) {
                     }
                 }
                 $this->assertTrue($matched, "None of the errors matched: $error");