MAGETWO-34612: Unit tests coverage build failure

- changes after merging with mainline

Author: mazhalai

dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php

@@ -90,7 +90,7 @@ protected function _collectResourceHelpersPhp($contents, &$classes)
 
     public function testConfigFiles()
     {
-        $invoker = new \Magento\Framework\Test\Utility\AggregateInvoker($this);
+        $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
             /**
              * @param string $path
@@ -105,7 +105,7 @@ function ($path) {
 
     public function testLayoutFiles()
     {
-        $invoker = new \Magento\Framework\Test\Utility\AggregateInvoker($this);
+        $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
             /**
              * @param string $path
@@ -190,7 +190,7 @@ protected function _assertClassesExist($classes, $path)
 
     public function testClassNamespaces()
     {
-        $invoker = new \Magento\Framework\Test\Utility\AggregateInvoker($this);
+        $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
             /**
              * Assert PHP classes have valid formal namespaces according to file locations
@@ -301,7 +301,7 @@ protected function _assertClassNamespace($file, $relativePath, $contents, $class
 
     public function testClassReferences()
     {
-        $invoker = new \Magento\Framework\Test\Utility\AggregateInvoker($this);
+        $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
             /**
              * @param string $file

lib/internal/Magento/Framework/App/Utility/Classes.php

@@ -7,6 +7,8 @@
  */
 namespace Magento\Framework\App\Utility;
 
+use Magento\Framework\App\Utility\Files;
+
 class Classes
 {
     /**
@@ -185,11 +187,11 @@ public static function collectLayoutClasses(\SimpleXMLElement $xml)
     public static function collectModuleClasses($subTypePattern = '[A-Za-z]+')
     {
         $pattern = '/^' . preg_quote(
-            \Magento\Framework\App\Utility\Files::init()->getPathToSource(),
+            Files::init()->getPathToSource(),
             '/'
         ) . '\/app\/code\/([A-Za-z]+)\/([A-Za-z]+)\/(' . $subTypePattern . '\/.+)\.php$/';
         $result = [];
-        foreach (\Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, false, false, false) as $file) {
+        foreach (Files::init()->getPhpFiles(true, false, false, false, false) as $file) {
             if (preg_match($pattern, $file, $matches)) {
                 $module = "{$matches[1]}_{$matches[2]}";
                 $class = "{$module}" . '\\' . str_replace(
@@ -214,7 +216,7 @@ public static function getVirtualClasses()
         if (!empty(self::$_virtualClasses)) {
             return self::$_virtualClasses;
         }
-        $configFiles = \Magento\Framework\App\Utility\Files::init()->getDiConfigs();
+        $configFiles = Files::init()->getDiConfigs();
         foreach ($configFiles as $fileName) {
             $configDom = new \DOMDocument();
             $configDom->load($fileName);

lib/internal/Magento/Framework/App/Utility/Files.php

@@ -109,9 +109,10 @@ public function getPathToSource()
      * @param bool $otherCode non-application PHP-code (doesn't include "dev" directory)
      * @param bool $templates application PHTML-code
      * @param bool $asDataSet
+     * @param bool $tests tests folder
      * @return array
      */
-    public function getPhpFiles($appCode = true, $otherCode = true, $templates = true, $asDataSet = true)
+    public function getPhpFiles($appCode = true, $otherCode = true, $templates = true, $asDataSet = true, $tests = true)
     {
         $key = __METHOD__ . "/{$this->_path}/{$appCode}/{$otherCode}/{$templates}";
         if (!isset(self::$_cache[$key])) {
@@ -137,6 +138,12 @@ public function getPhpFiles($appCode = true, $otherCode = true, $templates = tru
                     self::getFiles(["{$this->_path}/dev/tools/Magento/Tools/SampleData"], '*.php')
                 );
             }
+            if ($tests) {
+                $files = array_merge(
+                    $files,
+                    self::getFiles(["{$this->_path}/dev/tests"], '*.php')
+                );
+            }
             if ($templates) {
                 $files = array_merge($files, $this->getPhtmlFiles(false, false));
             }