Merge pull request magento#334 from magento-gl/AC-9335-cleaned

Ac 9335 cleaned

Author: KevinBKozan

dev/tests/unit/Magento/FunctionalTestFramework/Util/UnusedEntityCheckTest.php

@@ -42,11 +42,11 @@ public function testUnusedActiongroupFiles()
 
  public function testUnusedActiongroupFilesReturnedWhenActionXmlFilesAreNotEmpty()
  {
- $this->scriptUtil = new ScriptUtil();
+ $scriptUtil = new ScriptUtil();
  $unusedEntityCheck = new UnusedEntityCheck();
  $domDocument = new \DOMDocument();
- $modulePaths = $this->scriptUtil->getAllModulePaths();
- $actionGroupXmlFiles = $this->scriptUtil->getModuleXmlFilesByScope($modulePaths, "ActionGroup");
+ $modulePaths = $scriptUtil->getAllModulePaths();
+ $actionGroupXmlFiles = $scriptUtil->getModuleXmlFilesByScope($modulePaths, "ActionGroup");
  $actionGroupFiles = ['DeprecationCheckActionGroup' =>
  '/verification/DeprecationCheckModule/ActionGroup/DeprecationCheckActionGroup.xml',
  'ActionGroupWithMultiplePausesActionGroup'=>
@@ -82,9 +82,9 @@ public function testUnusedSectionFiles()
  public function testUnusedSectionFilesReturnedWhenSectionXmlFilesAreNotEmpty()
  {
  $unusedEntityCheck = new UnusedEntityCheck();
- $this->scriptUtil = new ScriptUtil();
- $modulePaths = $this->scriptUtil->getAllModulePaths();
- $sectionXmlFiles = $this->scriptUtil->getModuleXmlFilesByScope($modulePaths, "Section");
+ $scriptUtil = new ScriptUtil();
+ $modulePaths = $scriptUtil->getAllModulePaths();
+ $sectionXmlFiles = $scriptUtil->getModuleXmlFilesByScope($modulePaths, "Section");
 
  $domDocument = new \DOMDocument();
  $section = [
@@ -119,9 +119,9 @@ public function testUnusedPageFilesReturnedWhenPageXmlFilesPassedAreNotEmpty()
  {
  $unusedEntityCheck = new UnusedEntityCheck();
  $domDocument = new \DOMDocument();
- $this->scriptUtil = new ScriptUtil();
- $modulePaths = $this->scriptUtil->getAllModulePaths();
- $pageXmlFiles = $this->scriptUtil->getModuleXmlFilesByScope($modulePaths, "Page");
+ $scriptUtil = new ScriptUtil();
+ $modulePaths = $scriptUtil->getAllModulePaths();
+ $pageXmlFiles = $scriptUtil->getModuleXmlFilesByScope($modulePaths, "Page");
  $page = [
  'DeprecationCheckPage' => '/verification/DeprecationCheckModule/Page/DeprecationCheckPage.xml',
  'DeprecatedPage' => '/verification/TestModule/Page/DeprecatedPage.xml',
@@ -164,9 +164,9 @@ public function testUnusedDataReturnedWhenCreateDataEntityAreNotEmpty()
  {
  $unusedEntityCheck = new UnusedEntityCheck();
  $domDocument = new \DOMDocument();
- $this->scriptUtil = new ScriptUtil();
- $modulePaths = $this->scriptUtil->getAllModulePaths();
- $dataXmlFiles = $this->scriptUtil->getModuleXmlFilesByScope($modulePaths, "Data");
+ $scriptUtil = new ScriptUtil();
+ $modulePaths = $scriptUtil->getAllModulePaths();
+ $dataXmlFiles = $scriptUtil->getModuleXmlFilesByScope($modulePaths, "Data");
  $data = [
  "simpleData" =>
  [

src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php

@@ -42,6 +42,12 @@
 class MagentoAllureAdapter extends AllureCodeception
 {
  const STEP_PASSED = "passed";
+
+ /**
+ * @var array
+ */
+ private $options = [];
+
  /**
  * Test files cache.
  *
@@ -184,7 +190,6 @@ public function stepBefore(StepEvent $stepEvent)
  // Strip control characters so that report generation does not fail
  $stepName = preg_replace('/[[:cntrl:]]/', '', $stepName);
 
- $this->emptyStep = false;
  $this->getLifecycle()->fire(new StepStartedEvent($stepName));
  }
 

src/Magento/FunctionalTestingFramework/Config/Reader.php

@@ -48,9 +48,9 @@ public function __construct(
  $this->fileName = $fileName;
  $this->idAttributes = array_replace($this->idAttributes, $idAttributes);
  $this->schemaFile = $schemaLocator->getSchema();
- $this->isValidated = $validationState->isValidated();
- $this->perFileSchema = $schemaLocator->getPerFileSchema() &&
- $this->isValidated ? $schemaLocator->getPerFileSchema() : null;
+ $isValidated = $validationState->isValidated();
+ $this->perFileSchema = $schemaLocator->getPerFileSchema() && $isValidated ?
+   $schemaLocator->getPerFileSchema() : null;
  $this->domDocumentClass = $domDocumentClass;
  $this->defaultScope = $defaultScope;
  }

src/Magento/FunctionalTestingFramework/ObjectManager/Config/Reader/Dom.php

@@ -65,6 +65,6 @@ public function __construct(
  */
  protected function _createConfigMerger($mergerClass, $initialContents)
  {
- return new $mergerClass($initialContents, $this->_idAttributes, self::TYPE_ATTRIBUTE, $this->_perFileSchema);
+ return new $mergerClass($initialContents, $this->idAttributes, self::TYPE_ATTRIBUTE, $this->perFileSchema);
  }
 }

src/Magento/FunctionalTestingFramework/StaticCheck/CreatedDataFromOutsideActionGroupCheck.php

@@ -60,6 +60,11 @@ class CreatedDataFromOutsideActionGroupCheck implements StaticCheckInterface
  */
  private $scriptUtil;
 
+ /**
+ * @var array
+ */
+ private $actionGroupXmlFile = [];
+
  /**
  * Checks test dependencies, determined by references in tests versus the dependencies listed in the Magento module
  *

src/Magento/FunctionalTestingFramework/StaticCheck/UnusedEntityCheck.php

@@ -37,6 +37,16 @@ class UnusedEntityCheck implements StaticCheckInterface
  */
  private $scriptUtil;
 
+ /**
+ * @var array
+ */
+ private $errors = [];
+
+ /**
+ * @var string
+ */
+ private $output = '';
+
  /**
  * Checks test dependencies, determined by references in tests versus the dependencies listed in the Magento module
  *
@@ -625,7 +635,7 @@ public function getErrors()
  /**
  * Return output
  *
- * @return array
+ * @return string
  */
  public function getOutput()
  {

src/Magento/FunctionalTestingFramework/Test/Objects/TestObject.php

@@ -337,7 +337,7 @@ public function getAnnotationByName($name)
  */
  public function getCustomData()
  {
- return $this->customData;
+ return null;
  }
 
  /**