Merge remote-tracking branch 'origin/webapi_test' into phpunit10

Author: nishant04412

dev/tests/api-functional/phpunit_graphql.xml.dist

@@ -58,6 +58,6 @@
             <!-- Path to config file (default is config/allure.config.php) -->
             <parameter name="config" value="allure/allure.config.php" />
         </bootstrap>
-        <bootstrap class="Magento\TestFramework\Event\PhpUnitExtension"/>
+        <bootstrap class="Magento\TestFramework\Event\Subscribers"/>
     </extensions>
 </phpunit>

dev/tests/api-functional/phpunit_rest.xml.dist

@@ -62,6 +62,6 @@
             <!-- Path to config file (default is config/allure.config.php) -->
             <parameter name="config" value="allure/allure.config.php" />
         </bootstrap>
-        <bootstrap class="Magento\TestFramework\Event\PhpUnitExtension"/>
+        <bootstrap class="Magento\TestFramework\Event\Subscribers"/>
 	</extensions>
 </phpunit>

dev/tests/api-functional/phpunit_soap.xml.dist

@@ -61,5 +61,6 @@
             <!-- Path to config file (default is config/allure.config.php) -->
             <parameter name="config" value="allure/allure.config.php" />
         </bootstrap>
+        <bootstrap class="Magento\TestFramework\Event\Subscribers"/>
 	</extensions>
 </phpunit>

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

@@ -30,6 +30,27 @@ class Magento implements ObserverInterface
      */
     protected static $_eventObject;
 
+    /**
+     * @var $testPrepared
+     */
+    protected static $testPrepared = false;
+
+    /**
+     * set TestPrepared value
+     */
+    public static function setTestPrepared($value)
+    {
+        self::$testPrepared = $value;
+    }
+
+    /**
+     * get TestPrepared value
+     */
+    public static function getTestPrepared()
+    {
+        return  self::$testPrepared;
+    }
+
     /**
      * Assign current Event Object
      *

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

@@ -102,7 +102,7 @@ public function startTestSuite(\PHPUnit\Framework\TestSuite $suite): void
         if ($suite instanceof \PHPUnit\Framework\DataProviderTestSuite) {
             return;
         }
-        $this->_eventManager->fireEvent('testSuiteStarted');
+        $this->_eventManager->fireEvent('startTestSuite');
     }
 
     /**

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

@@ -1,38 +1,44 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 
 /**
- * Listener of PHPUnit built-in events
+ * Subscribers of PHPUnit built-in events
  */
 namespace Magento\TestFramework\Event;
 
 use PHPUnit\Runner;
 use PHPUnit\TextUI;
 
-final class PhpUnitExtension implements Runner\Extension\Extension
+class Subscribers implements Runner\Extension\Extension
 {
+    /**
+     * Register Event Subscribers
+     *
+     * @param TextUI\Configuration\Configuration $configuration
+     * @param Runner\Extension\Facade $facade
+     * @param Runner\Extension\ParameterCollection $parameters
+     */
     public function bootstrap(
         TextUI\Configuration\Configuration $configuration,
         Runner\Extension\Facade $facade,
         Runner\Extension\ParameterCollection $parameters
-    ): void
-    {
-        if($configuration->hasConfigurationFile() &&
-            str_contains($configuration->configurationFile(), 'setup-integration')){
+    ): void {
+        if ($configuration->hasConfigurationFile() &&
+            str_contains($configuration->configurationFile(), 'setup-integration')) {
             $facade->registerSubscribers(
-                new PhpUnitExtensionSubscriber(),
-                new PhpUnitExtensionSubscriberFinished()
+                new TestPreprationStartedSubscriber(),
+                new TestFinishedSubscriber()
             );
-        }else{
+        } else {
             $facade->registerSubscribers(
                 new TestSuitStartedSubscriber(),
                 new TestSuitEndSubscriber(),
                 new TestPreparedSubscriber(),
-                new PhpUnitExtensionSubscriber(),
-                new PhpUnitExtensionSubscriberFinished(),
+                new TestPreprationStartedSubscriber(),
+                new TestFinishedSubscriber(),
                 new TestSkippedSubscriber(),
                 new TestErroredSubscriber()
             );

dev/tests/integration/framework/Magento/TestFramework/Event/PhpUnitExtension.php renamed to dev/tests/integration/framework/Magento/TestFramework/Event/Subscribers.php

@@ -1,31 +1,36 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 
 /**
- * Listener of PHPUnit built-in events
+ * Test Errored Subscriber
  */
 namespace Magento\TestFramework\Event;
 
 use PHPUnit\Event\Test\ErroredSubscriber;
 use PHPUnit\Event\Test\Errored;
 use Magento\TestFramework\Helper\Bootstrap;
 
-final class TestErroredSubscriber implements ErroredSubscriber
+class TestErroredSubscriber implements ErroredSubscriber
 {
-    public function notify(Errored $event): void{
+    /**
+     * Errored Subscriber
+     *
+     * @param Errored $event
+     */
+    public function notify(Errored $event): void
+    {
         $className = $event->test()->className();
         $methodName = $event->test()->methodName();
 
-        if(!in_array($methodName, ['testAclHasAccess', 'testAclNoAccess'])) {
-            $objectManager = Bootstrap::getObjectManager();
-            $assetRepo = $objectManager->create($className, ['name' => $methodName]);
+        $objectManager = Bootstrap::getObjectManager();
+        $assetRepo = $objectManager->create($className, ['name' => $methodName]);
 
-            $mageEvent = Magento::getDefaultEventManager();
-            $mageEvent->fireEvent('endTest', [$assetRepo], true);
-            Magento::setCurrentEventObject(null);
-        }
+        $mageEvent = Magento::getDefaultEventManager();
+        $mageEvent->fireEvent('endTest', [$assetRepo], true);
+        Magento::setCurrentEventObject(null);
+        Magento::setTestPrepared(false);
     }
 }

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

@@ -1,21 +1,25 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 
 /**
- * Listener of PHPUnit built-in events
+ * Test Finished Subscriber
  */
 namespace Magento\TestFramework\Event;
 
 use PHPUnit\Event\Test\FinishedSubscriber;
 use PHPUnit\Event\Test\Finished;
 use Magento\TestFramework\Helper\Bootstrap;
 
-
-final class PhpUnitExtensionSubscriberFinished implements FinishedSubscriber
+class TestFinishedSubscriber implements FinishedSubscriber
 {
+    /**
+     * Test finished Subscriber
+     *
+     * @param Finished $event
+     */
     public function notify(Finished $event): void
     {
         $className = $event->test()->className();
@@ -27,5 +31,6 @@ public function notify(Finished $event): void
         $mageEvent = Magento::getDefaultEventManager();
         $mageEvent->fireEvent('endTest', [$assetRepo], true);
         Magento::setCurrentEventObject(null);
+        Magento::setTestPrepared(false);
     }
 }