MQE-904: Deliver changes from Magento Contribution Day

Author: okolesnyk

RoboFile.php

@@ -54,7 +54,7 @@ function generateTests($opts = ['config' => null, 'force' => true, 'nodes' => nu
 
         require 'dev' . DIRECTORY_SEPARATOR . 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';
         \Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()
-            ->createAllTestFiles($opts['config'], $opts['nodes'], $opts['debug'], $this->getOutput());
+            ->createAllTestFiles($opts['config'], $opts['nodes'], $opts['debug']);
         $this->say("Generate Tests Command Run");
     }
 

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -20,17 +20,13 @@
 use Magento\FunctionalTestingFramework\Test\Util\ActionObjectExtractor;
 use Magento\FunctionalTestingFramework\Test\Util\TestObjectExtractor;
 use Magento\FunctionalTestingFramework\Util\Filesystem\DirSetupUtil;
-use Robo\Common\IO;
-use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Class TestGenerator
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
 class TestGenerator
 {
-    use IO;
-
     const REQUIRED_ENTITY_REFERENCE = 'createDataKey';
     const GENERATED_DIR = '_generated';
 
@@ -55,6 +51,13 @@ class TestGenerator
      */
     private $tests;
 
+    /**
+     * Symfony console output interface.
+     *
+     * @var \Symfony\Component\Console\Output\ConsoleOutput
+     */
+    private $consoleOutput;
+
     /**
      * TestGenerator constructor.
      *
@@ -70,6 +73,7 @@ private function __construct($exportDir, $tests)
             DIRECTORY_SEPARATOR
         );
         $this->tests = $tests;
+        $this->consoleOutput = new \Symfony\Component\Console\Output\ConsoleOutput();
     }
 
     /**
@@ -137,20 +141,19 @@ private function createCestFile($testPhp, $filename)
      * @param string $runConfig
      * @param int $nodes
      * @param bool $debug
-     * @param OutputInterface|null $output
      * @return void
      * @throws TestReferenceException
      * @throws \Exception
      */
-    public function createAllTestFiles($runConfig = null, $nodes = null, $debug = false, $output = null)
+    public function createAllTestFiles($runConfig = null, $nodes = null, $debug = false)
     {
         DirSetupUtil::createGroupDir($this->exportDirectory);
-        if ($output !== null) {
-            $this->setOutput($output);
-        }
-
         // create our manifest file here
-        $testManifest = TestManifestFactory::makeManifest($this->exportDirectory, $runConfig);
+        $testManifest = TestManifestFactory::makeManifest(
+            dirname($this->exportDirectory),
+            $this->exportDirectory,
+            $runConfig
+        );
         $testPhpArray = $this->assembleAllTestPhp($testManifest, $nodes, $debug);
 
         foreach ($testPhpArray as $testPhpFile) {
@@ -219,7 +222,7 @@ private function assembleAllTestPhp($testManifest, $nodes, $debug = false)
             $debugInformation = $test->getDebugInformation();
 
             $this->debug($debugInformation, $debug);
-            $this->debug('Finish creating test ' . $test->getCodeceptionName(), $debug);
+            $this->debug('Finish creating test ' . $test->getCodeceptionName() . PHP_EOL, $debug);
         }
 
         $testManifest->generate($nodes);
@@ -239,7 +242,7 @@ private function debug($messages, $debug = false)
         if ($debug && $messages) {
             $messages = (array) $messages;
             foreach ($messages as $message) {
-                $this->say($message);
+                $this->consoleOutput->writeln($message);
             }
         }
     }