Merge pull request #9057 from magento-gl/GL_PR_Arrows_July_03_2024

internal-magento-queue-manager[bot] · web-flow · commit 90e25b6b5e64 · 2024-07-13T13:52:21.000Z
[Arrows] Platform Health Delivery
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Event/TestErroredSubscriber.php b/dev/tests/integration/framework/Magento/TestFramework/Event/TestErroredSubscriber.php
@@ -24,12 +24,12 @@ public function notify(Errored $event): void
     {
         $className = $event->test()->className();
         $methodName = $event->test()->methodName();
-
         $objectManager = Bootstrap::getObjectManager();
-        $assetRepo = $objectManager->create($className, ['name' => $methodName]);
 
-        $mageEvent = Magento::getDefaultEventManager();
-        $mageEvent->fireEvent('endTest', [$assetRepo], true);
+        $testObj = $objectManager->create($className, ['name' => $methodName]);
+        $phpUnit = $objectManager->create(PhpUnit::class);
+        $phpUnit->endTest($testObj, 0);
+        
         Magento::setCurrentEventObject(null);
         Magento::setTestPrepared(false);
     }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Event/TestFinishedSubscriber.php b/dev/tests/integration/framework/Magento/TestFramework/Event/TestFinishedSubscriber.php
@@ -24,12 +24,12 @@ public function notify(Finished $event): void
     {
         $className = $event->test()->className();
         $methodName = $event->test()->methodName();
-
         $objectManager = Bootstrap::getObjectManager();
-        $assetRepo = $objectManager->create($className, ['name' => $methodName]);
 
-        $mageEvent = Magento::getDefaultEventManager();
-        $mageEvent->fireEvent('endTest', [$assetRepo], true);
+        $testObj = $objectManager->create($className, ['name' => $methodName]);
+        $phpUnit = $objectManager->create(PhpUnit::class);
+        $phpUnit->endTest($testObj, 0);
+
         Magento::setCurrentEventObject(null);
         Magento::setTestPrepared(false);
     }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Event/TestPreparedSubscriber.php b/dev/tests/integration/framework/Magento/TestFramework/Event/TestPreparedSubscriber.php
@@ -27,17 +27,17 @@ public function notify(Prepared $event): void
         $methodName = $event->test()->methodName();
 
         $objectManager = Bootstrap::getObjectManager();
-        $assetRepo = $objectManager->create($className, ['name' => $methodName]);
+        $testObj = $objectManager->create($className, ['name' => $methodName]);
 
         $testData = $event->test()->testData();
         if ($testData->hasDataFromDataProvider()) {
             $dataSetName = $testData->dataFromDataProvider()->dataSetName();
-            $assetRepo->setData($dataSetName, ['']);
+            $testObj->setData($dataSetName, ['']);
         }
 
-        $skipConfig = Config::getInstance()->getSkipConfiguration($assetRepo);
+        $skipConfig = Config::getInstance()->getSkipConfiguration($testObj);
         if ($skipConfig['skip']) {
-            $assetRepo->markTestSkipped($skipConfig['skipMessage']);
+            $testObj->markTestSkipped($skipConfig['skipMessage']);
         }
         Magento::setTestPrepared(true);
     }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Event/TestPreprationStartedSubscriber.php b/dev/tests/integration/framework/Magento/TestFramework/Event/TestPreprationStartedSubscriber.php
@@ -22,14 +22,15 @@ class TestPreprationStartedSubscriber implements PreparationStartedSubscriber
      */
     public function notify(PreparationStarted $event): void
     {
+        $objectManager = Bootstrap::getObjectManager();
         $className = $event->test()->className();
         $methodName = $event->test()->methodName();
 
-        $objectManager = Bootstrap::getObjectManager();
-        $assetRepo = $objectManager->create($className, ['name' => $methodName]);
+        $testObj = $objectManager->create($className, ['name' => $methodName]);
 
         Magento::setCurrentEventObject($event);
-        $mageEvent = Magento::getDefaultEventManager();
-        $mageEvent->fireEvent('startTest', [$assetRepo]);
+
+        $phpUnit = $objectManager->create(PhpUnit::class);
+        $phpUnit->startTest($testObj);
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Event/TestSkippedSubscriber.php b/dev/tests/integration/framework/Magento/TestFramework/Event/TestSkippedSubscriber.php
@@ -27,10 +27,10 @@ public function notify(Skipped $event): void
 
         if (!Magento::getTestPrepared()) {
             $objectManager = Bootstrap::getObjectManager();
-            $assetRepo = $objectManager->create($className, ['name' => $methodName]);
+            $testObj = $objectManager->create($className, ['name' => $methodName]);
 
-            $mageEvent = Magento::getDefaultEventManager();
-            $mageEvent->fireEvent('endTest', [$assetRepo], true);
+            $phpUnit = $objectManager->create(PhpUnit::class);
+            $phpUnit->endTest($testObj, 0);
             Magento::setCurrentEventObject(null);
             Magento::setTestPrepared(false);
         }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Event/TestSuitEndSubscriber.php b/dev/tests/integration/framework/Magento/TestFramework/Event/TestSuitEndSubscriber.php
@@ -11,6 +11,8 @@
 
 use PHPUnit\Event\TestSuite\Finished;
 use PHPUnit\Event\TestSuite\FinishedSubscriber;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestSuite;
 
 class TestSuitEndSubscriber implements FinishedSubscriber
 {
@@ -21,7 +23,10 @@ class TestSuitEndSubscriber implements FinishedSubscriber
      */
     public function notify(Finished $event): void
     {
-        $mageEvent = Magento::getDefaultEventManager();
-        $mageEvent->fireEvent('rollbackTransaction');
+        $phpUnit = Bootstrap::getObjectManager()->create(PhpUnit::class);
+        if (class_exists($event->testSuite()->name())) {
+            $testSuite = TestSuite::empty($event->testSuite()->name());
+            $phpUnit->endTestSuite($testSuite);
+        }
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Event/TestSuitStartedSubscriber.php b/dev/tests/integration/framework/Magento/TestFramework/Event/TestSuitStartedSubscriber.php
@@ -11,6 +11,8 @@
 
 use PHPUnit\Event\TestSuite\Started;
 use PHPUnit\Event\TestSuite\StartedSubscriber;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestSuite;
 
 class TestSuitStartedSubscriber implements StartedSubscriber
 {
@@ -21,7 +23,10 @@ class TestSuitStartedSubscriber implements StartedSubscriber
      */
     public function notify(Started $event): void
     {
-        $mageEvent = Magento::getDefaultEventManager();
-        $mageEvent->fireEvent('startTestSuite');
+        $phpUnit = Bootstrap::getObjectManager()->create(PhpUnit::class);
+        if (class_exists($event->testSuite()->name())) {
+            $testSuite = TestSuite::empty($event->testSuite()->name());
+            $phpUnit->startTestSuite($testSuite);
+        }
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/TestCaseProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/TestCaseProperties.php
@@ -25,11 +25,19 @@ public function endTestSuite(\PHPUnit\Framework\TestSuite $suite)
             $properties = $reflectionClass->getProperties();
             foreach ($properties as $property) {
                 $property->setAccessible(true);
-                $value = $property->getValue($test);
-                if (is_object($value) && method_exists($value, '__destruct') && is_callable([$value, '__destruct'])) {
-                    $value->__destruct();
+                if ($property->isInitialized($test)) {
+                    $value = $property->getValue($test);
+                    if (is_object($value) && method_exists($value, '__destruct') &&
+                        is_callable([$value, '__destruct'])) {
+                        $value->__destruct();
+                    }
+                }
+
+                if (is_array($property->getDefaultValue())) {
+                    $property->setValue($test, []);
+                } else {
+                    $property->setValue($test, null);
                 }
-                $property->setValue($test, null);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -27,17 +27,17 @@ public function notify(Prepared $event): void`
`27`	`27`	`$methodName = $event->test()->methodName();`
`28`	`28`
`29`	`29`	`$objectManager = Bootstrap::getObjectManager();`
`30`		`- $assetRepo = $objectManager->create($className, ['name' => $methodName]);`
	`30`	`+ $testObj = $objectManager->create($className, ['name' => $methodName]);`
`31`	`31`
`32`	`32`	`$testData = $event->test()->testData();`
`33`	`33`	`if ($testData->hasDataFromDataProvider()) {`
`34`	`34`	`$dataSetName = $testData->dataFromDataProvider()->dataSetName();`
`35`		`- $assetRepo->setData($dataSetName, ['']);`
	`35`	`+ $testObj->setData($dataSetName, ['']);`
`36`	`36`	`}`
`37`	`37`
`38`		`- $skipConfig = Config::getInstance()->getSkipConfiguration($assetRepo);`
	`38`	`+ $skipConfig = Config::getInstance()->getSkipConfiguration($testObj);`
`39`	`39`	`if ($skipConfig['skip']) {`
`40`		`- $assetRepo->markTestSkipped($skipConfig['skipMessage']);`
	`40`	`+ $testObj->markTestSkipped($skipConfig['skipMessage']);`
`41`	`41`	`}`
`42`	`42`	`Magento::setTestPrepared(true);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,15 @@ class TestPreprationStartedSubscriber implements PreparationStartedSubscriber`
`22`	`22`	`*/`
`23`	`23`	`public function notify(PreparationStarted $event): void`
`24`	`24`	`{`
	`25`	`+ $objectManager = Bootstrap::getObjectManager();`
`25`	`26`	`$className = $event->test()->className();`
`26`	`27`	`$methodName = $event->test()->methodName();`
`27`	`28`
`28`		`- $objectManager = Bootstrap::getObjectManager();`
`29`		`- $assetRepo = $objectManager->create($className, ['name' => $methodName]);`
	`29`	`+ $testObj = $objectManager->create($className, ['name' => $methodName]);`
`30`	`30`
`31`	`31`	`Magento::setCurrentEventObject($event);`
`32`		`- $mageEvent = Magento::getDefaultEventManager();`
`33`		`- $mageEvent->fireEvent('startTest', [$assetRepo]);`
	`32`	`+`
	`33`	`+ $phpUnit = $objectManager->create(PhpUnit::class);`
	`34`	`+ $phpUnit->startTest($testObj);`
`34`	`35`	`}`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`use PHPUnit\Event\TestSuite\Finished;`
`13`	`13`	`use PHPUnit\Event\TestSuite\FinishedSubscriber;`
	`14`	`+use Magento\TestFramework\Helper\Bootstrap;`
	`15`	`+use PHPUnit\Framework\TestSuite;`
`14`	`16`
`15`	`17`	`class TestSuitEndSubscriber implements FinishedSubscriber`
`16`	`18`	`{`
`@@ -21,7 +23,10 @@ class TestSuitEndSubscriber implements FinishedSubscriber`
`21`	`23`	`*/`
`22`	`24`	`public function notify(Finished $event): void`
`23`	`25`	`{`
`24`		`- $mageEvent = Magento::getDefaultEventManager();`
`25`		`- $mageEvent->fireEvent('rollbackTransaction');`
	`26`	`+ $phpUnit = Bootstrap::getObjectManager()->create(PhpUnit::class);`
	`27`	`+ if (class_exists($event->testSuite()->name())) {`
	`28`	`+ $testSuite = TestSuite::empty($event->testSuite()->name());`
	`29`	`+ $phpUnit->endTestSuite($testSuite);`
	`30`	`+ }`
`26`	`31`	`}`
`27`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,19 @@ public function endTestSuite(\PHPUnit\Framework\TestSuite $suite)`
`25`	`25`	`$properties = $reflectionClass->getProperties();`
`26`	`26`	`foreach ($properties as $property) {`
`27`	`27`	`$property->setAccessible(true);`
`28`		`- $value = $property->getValue($test);`
`29`		`- if (is_object($value) && method_exists($value, '__destruct') && is_callable([$value, '__destruct'])) {`
`30`		`- $value->__destruct();`
	`28`	`+ if ($property->isInitialized($test)) {`
	`29`	`+ $value = $property->getValue($test);`
	`30`	`+ if (is_object($value) && method_exists($value, '__destruct') &&`
	`31`	`+ is_callable([$value, '__destruct'])) {`
	`32`	`+ $value->__destruct();`
	`33`	`+ }`
	`34`	`+ }`
	`35`	`+`
	`36`	`+ if (is_array($property->getDefaultValue())) {`
	`37`	`+ $property->setValue($test, []);`
	`38`	`+ } else {`
	`39`	`+ $property->setValue($test, null);`
`31`	`40`	`}`
`32`		`- $property->setValue($test, null);`
`33`	`41`	`}`
`34`	`42`	`}`
`35`	`43`	`}`