ACP2E-3334: [Internal] Fixture apply failure is not shown during execution or in logs

Author: dhorytskyi

dev/tests/integration/framework/Magento/TestFramework/Annotation/AbstractDataFixture.php

@@ -127,7 +127,8 @@ protected function _applyFixtures(array $fixtures, TestCase $test)
                     'Unable to apply fixture: ' . $this->getFixtureReference($fixture),
                     $fixture['test']['class'],
                     $fixture['test']['method'],
-                    $exception
+                    $exception,
+                    $test
                 );
             }
             $this->_appliedFixtures[] = $fixture;
@@ -157,7 +158,8 @@ protected function _revertFixtures(?TestCase $test = null)
                     'Unable to revert fixture: ' . $this->getFixtureReference($fixture),
                     $fixture['test']['class'],
                     $fixture['test']['method'],
-                    $exception
+                    $exception,
+                    $test
                 );
             }
         }

dev/tests/integration/framework/Magento/TestFramework/Annotation/ExceptionHandler.php

@@ -8,6 +8,7 @@
 namespace Magento\TestFramework\Annotation;
 
 use PHPUnit\Framework\Exception;
+use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use ReflectionException;
 
@@ -20,13 +21,15 @@ class ExceptionHandler
      * @param string $testClass
      * @param string|null $testMethod
      * @param \Throwable|null $previous
+     * @param TestCase|null $test
      * @return void
      */
     public static function handle(
         string $message,
         string $testClass,
         string $testMethod = null,
-        \Throwable $previous = null
+        \Throwable $previous = null,
+        TestCase $test = null
     ): void {
         try {
             $reflected = new ReflectionClass($testClass);
@@ -72,7 +75,7 @@ public static function handle(
                     . $exception->getTraceAsString();
             } while ($exception = $exception->getPrevious());
         }
-        throw new Exception(
+        $exception = new Exception(
             sprintf(
                 "%s\n#0 %s%s",
                 $message,
@@ -82,5 +85,14 @@ public static function handle(
             0,
             $previous
         );
+        if ($test) {
+            \PHPUnit\Event\Facade::emitter()->testErrored(
+                $test->valueObjectForEvents(),
+                \PHPUnit\Event\Code\ThrowableBuilder::from($exception),
+            );
+            $test::fail($exception->getMessage());
+        } else {
+            throw $exception;
+        }
     }
 }

dev/tests/integration/framework/Magento/TestFramework/Event/TestPreparedSubscriber.php

@@ -40,9 +40,5 @@ public function notify(Prepared $event): void
             $testObj->markTestSkipped($skipConfig['skipMessage']);
         }
         Magento::setTestPrepared(true);
-        Magento::setCurrentEventObject($event);
-
-        $phpUnit = $objectManager->create(PhpUnit::class);
-        $phpUnit->startTest($testObj);
     }
 }

dev/tests/integration/framework/Magento/TestFramework/Event/TestPreprationStartedSubscriber.php

@@ -26,11 +26,11 @@ public function notify(PreparationStarted $event): void
         $className = $event->test()->className();
         $methodName = $event->test()->methodName();
 
-//        $testObj = $objectManager->create($className, ['name' => $methodName]);
-//
-//        Magento::setCurrentEventObject($event);
-//
-//        $phpUnit = $objectManager->create(PhpUnit::class);
-//        $phpUnit->startTest($testObj);
+        $testObj = $objectManager->create($className, ['name' => $methodName]);
+
+        Magento::setCurrentEventObject($event);
+
+        $phpUnit = $objectManager->create(PhpUnit::class);
+        $phpUnit->startTest($testObj);
     }
 }