Merge pull request #651 from magento/MQE-2039

MQE-2039: fatal error in actionGroupArguments static check when there…

Author: jilu1

src/Magento/FunctionalTestingFramework/StaticCheck/ActionGroupArgumentsCheck.php

@@ -6,12 +6,9 @@
 
 namespace Magento\FunctionalTestingFramework\StaticCheck;
 
-use Magento\FunctionalTestingFramework\Config\MftfApplicationConfig;
-use Magento\FunctionalTestingFramework\Exceptions\XmlException;
 use Magento\FunctionalTestingFramework\Test\Handlers\ActionGroupObjectHandler;
 use Magento\FunctionalTestingFramework\Test\Objects\ActionGroupObject;
 use Symfony\Component\Console\Input\InputInterface;
-use Magento\FunctionalTestingFramework\Util\ModuleResolver;
 use Symfony\Component\Finder\Finder;
 use Exception;
 use Magento\FunctionalTestingFramework\Util\Script\ScriptUtil;
@@ -22,7 +19,6 @@
  */
 class ActionGroupArgumentsCheck implements StaticCheckInterface
 {
-
     const ACTIONGROUP_XML_REGEX_PATTERN = '/<actionGroup\sname=(?: (?!<\/actionGroup>).)*/mxs';
     const ACTIONGROUP_ARGUMENT_REGEX_PATTERN = '/<argument[^\/>]*name="([^"\']*)/mxs';
     const ACTIONGROUP_NAME_REGEX_PATTERN = '/<actionGroup name=["\']([^\'"]*)/';
@@ -42,6 +38,13 @@ class ActionGroupArgumentsCheck implements StaticCheckInterface
      */
     private $output;
 
+    /**
+     * ScriptUtil instance
+     *
+     * @var ScriptUtil
+     */
+    private $scriptUtil;
+
     /**
      * Checks unused arguments in action groups and prints out error to file.
      *
@@ -51,16 +54,17 @@ class ActionGroupArgumentsCheck implements StaticCheckInterface
      */
     public function execute(InputInterface $input)
     {
-        $allModules = ScriptUtil::getAllModulePaths();
+        $this->scriptUtil = new ScriptUtil();
+        $allModules = $this->scriptUtil->getAllModulePaths();
 
-        $actionGroupXmlFiles = ScriptUtil::getModuleXmlFilesByScope(
+        $actionGroupXmlFiles = $this->scriptUtil->getModuleXmlFilesByScope(
             $allModules,
             DIRECTORY_SEPARATOR . 'ActionGroup' . DIRECTORY_SEPARATOR
         );
 
         $this->errors = $this->findErrorsInFileSet($actionGroupXmlFiles);
 
-        $this->output = ScriptUtil::printErrorsToFile(
+        $this->output = $this->scriptUtil->printErrorsToFile(
             $this->errors,
             self::ERROR_LOG_FILENAME,
             self::ERROR_LOG_MESSAGE
@@ -132,10 +136,19 @@ private function findUnusedArguments($actionGroupXml)
 
         preg_match_all(self::ACTIONGROUP_ARGUMENT_REGEX_PATTERN, $actionGroupXml, $arguments);
         preg_match(self::ACTIONGROUP_NAME_REGEX_PATTERN, $actionGroupXml, $actionGroupName);
+        $validActionGroup = false;
         try {
             $actionGroup = ActionGroupObjectHandler::getInstance()->getObject($actionGroupName[1]);
-        } catch (XmlException $e) {
+            if ($actionGroup) {
+                $validActionGroup = true;
+            }
+        } catch (Exception $e) {
+        }
+
+        if (!$validActionGroup) {
+            return $unusedArguments;
         }
+
         foreach ($arguments[1] as $argument) {
             //pattern to match all argument references
             $patterns = [

src/Magento/FunctionalTestingFramework/Test/Handlers/ActionGroupObjectHandler.php

@@ -6,6 +6,7 @@
 namespace Magento\FunctionalTestingFramework\Test\Handlers;
 
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
+use Magento\FunctionalTestingFramework\Exceptions\XmlException;
 use Magento\FunctionalTestingFramework\ObjectManager\ObjectHandlerInterface;
 use Magento\FunctionalTestingFramework\ObjectManagerFactory;
 use Magento\FunctionalTestingFramework\Test\Objects\ActionGroupObject;
@@ -49,6 +50,7 @@ class ActionGroupObjectHandler implements ObjectHandlerInterface
      * Singleton getter for instance of ActionGroupObjectHandler
      *
      * @return ActionGroupObjectHandler
+     * @throws XmlException
      */
     public static function getInstance(): ActionGroupObjectHandler
     {
@@ -61,6 +63,7 @@ public static function getInstance(): ActionGroupObjectHandler
 
     /**
      * ActionGroupObjectHandler constructor.
+     * @throws XmlException
      */
     private function __construct()
     {
@@ -73,6 +76,8 @@ private function __construct()
      *
      * @param string $actionGroupName
      * @return ActionGroupObject
+     * @throws TestFrameworkException
+     * @throws XmlException
      */
     public function getObject($actionGroupName)
     {
@@ -88,6 +93,8 @@ public function getObject($actionGroupName)
      * Function to return all objects for which the handler is responsible
      *
      * @return array
+     * @throws TestFrameworkException
+     * @throws XmlException
      */
     public function getAllObjects(): array
     {
@@ -101,6 +108,7 @@ public function getAllObjects(): array
      * Method which populates field array with objects from parsed action_group.xml
      *
      * @return void
+     * @throws XmlException
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
      */
     private function initActionGroups()
@@ -137,6 +145,7 @@ private function initActionGroups()
      *
      * @param ActionGroupObject $actionGroupObject
      * @return ActionGroupObject
+     * @throws XmlException
      * @throws TestFrameworkException
      */
     private function extendActionGroup($actionGroupObject): ActionGroupObject