MAGETWO-34612: Unit tests coverage build failure

- fixing test after mainline merge

Author: mazhalai

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

@@ -82,7 +82,7 @@ function ($file) {
     protected function _collectResourceHelpersPhp($contents, &$classes)
     {
         $regex = '/(?:\:\:|\->)getResourceHelper\(\s*\'([a-z\d\\\\]+)\'\s*\)/ix';
-        $matches = \Magento\Framework\Test\Utility\Classes::getAllMatches($contents, $regex);
+        $matches = \Magento\Framework\App\Utility\Classes::getAllMatches($contents, $regex);
         foreach ($matches as $moduleName) {
             $classes[] = "{$moduleName}\\Model\\Resource\\Helper\\Mysql4";
         }
@@ -96,10 +96,10 @@ public function testConfigFiles()
              * @param string $path
              */
             function ($path) {
-                $classes = \Magento\Framework\Test\Utility\Classes::collectClassesInConfig(simplexml_load_file($path));
+                $classes = \Magento\Framework\App\Utility\Classes::collectClassesInConfig(simplexml_load_file($path));
                 $this->_assertClassesExist($classes, $path);
             },
-            \Magento\Framework\Test\Utility\Files::init()->getMainConfigFiles()
+            \Magento\Framework\App\Utility\Files::init()->getMainConfigFiles()
         );
     }
 
@@ -113,30 +113,30 @@ public function testLayoutFiles()
             function ($path) {
                 $xml = simplexml_load_file($path);
 
-                $classes = \Magento\Framework\Test\Utility\Classes::getXmlNodeValues(
+                $classes = \Magento\Framework\App\Utility\Classes::getXmlNodeValues(
                     $xml,
                     '/layout//*[contains(text(), "\\\\Block\\\\") or contains(text(),
                         "\\\\Model\\\\") or contains(text(), "\\\\Helper\\\\")]'
                 );
-                foreach (\Magento\Framework\Test\Utility\Classes::getXmlAttributeValues(
+                foreach (\Magento\Framework\App\Utility\Classes::getXmlAttributeValues(
                     $xml,
                     '/layout//@helper',
                     'helper'
                 ) as $class) {
-                    $classes[] = \Magento\Framework\Test\Utility\Classes::getCallbackClass($class);
+                    $classes[] = \Magento\Framework\App\Utility\Classes::getCallbackClass($class);
                 }
-                foreach (\Magento\Framework\Test\Utility\Classes::getXmlAttributeValues(
+                foreach (\Magento\Framework\App\Utility\Classes::getXmlAttributeValues(
                     $xml,
                     '/layout//@module',
                     'module'
                 ) as $module) {
                     $classes[] = str_replace('_', '\\', "{$module}_Helper_Data");
                 }
-                $classes = array_merge($classes, \Magento\Framework\Test\Utility\Classes::collectLayoutClasses($xml));
+                $classes = array_merge($classes, \Magento\Framework\App\Utility\Classes::collectLayoutClasses($xml));
 
                 $this->_assertClassesExist(array_unique($classes), $path);
             },
-            \Magento\Framework\Test\Utility\Files::init()->getLayoutFiles()
+            \Magento\Framework\App\Utility\Files::init()->getLayoutFiles()
         );
     }
 
@@ -166,11 +166,11 @@ protected function _assertClassesExist($classes, $path)
                     $this->assertTrue(
                         isset(
                             self::$_existingClasses[$class]
-                        ) || \Magento\Framework\Test\Utility\Files::init()->classFileExists(
+                        ) || \Magento\Framework\App\Utility\Files::init()->classFileExists(
                             $class
-                        ) || \Magento\Framework\Test\Utility\Classes::isVirtual(
+                        ) || \Magento\Framework\App\Utility\Classes::isVirtual(
                             $class
-                        ) || \Magento\Framework\Test\Utility\Classes::isAutogenerated(
+                        ) || \Magento\Framework\App\Utility\Classes::isAutogenerated(
                             $class
                         )
                     );
@@ -199,7 +199,7 @@ public function testClassNamespaces()
              */
             function ($file) {
                 $relativePath = str_replace(
-                    \Magento\Framework\Test\Utility\Files::init()->getPathToSource() . "/",
+                    \Magento\Framework\App\Utility\Files::init()->getPathToSource() . "/",
                     "",
                     $file
                 );
@@ -225,7 +225,7 @@ function ($file) {
                 $className = array_pop($classParts);
                 $this->_assertClassNamespace($file, $relativePath, $contents, $className);
             },
-            \Magento\Framework\Test\Utility\Files::init()->getClassFiles()
+            \Magento\Framework\App\Utility\Files::init()->getClassFiles()
         );
     }
 
@@ -236,11 +236,11 @@ protected function _setNamespaceBlackList()
             foreach (glob(__DIR__ . '/_files/blacklist/namespace.txt') as $list) {
                 $fileList = file($list, FILE_IGNORE_NEW_LINES);
                 foreach ($fileList as $currentFile) {
-                    $absolutePath = \Magento\Framework\Test\Utility\Files::init()->getPathToSource() .
+                    $absolutePath = \Magento\Framework\App\Utility\Files::init()->getPathToSource() .
                         '/' .
                         $currentFile;
                     if (is_dir($absolutePath)) {
-                        $recursiveFiles = \Magento\Framework\Test\Utility\Files::getFiles(
+                        $recursiveFiles = \Magento\Framework\App\Utility\Files::getFiles(
                             [$absolutePath],
                             '*.php',
                             true
@@ -308,7 +308,7 @@ public function testClassReferences()
              */
             function ($file) {
                 $relativePath = str_replace(
-                    \Magento\Framework\Test\Utility\Files::init()->getPathToSource(),
+                    \Magento\Framework\App\Utility\Files::init()->getPathToSource(),
                     "",
                     $file
                 );
@@ -390,7 +390,7 @@ function ($file) {
                 $badClasses = $this->removeSpecialCases($badClasses, $file, $contents, $namespacePath);
                 $this->_assertClassReferences($badClasses, $file);
             },
-            \Magento\Framework\Test\Utility\Files::init()->getClassFiles()
+            \Magento\Framework\App\Utility\Files::init()->getClassFiles()
         );
     }
 
@@ -479,13 +479,11 @@ protected function removeSpecialCases($badClasses, $file, $contents, $namespaceP
                 '/dev/tests/performance/framework/',
                 '/dev/tests/static/framework/',
                 '/dev/tests/static/testsuite/',
-                '/dev/tests/unit/framework/',
-                '/dev/tests/unit/testsuite/',
                 '/setup/src/',
             ];
             // Full list of directories where there may be namespace classes
             foreach ($directories as $directory) {
-                $fullPath = \Magento\Framework\Test\Utility\Files::init()->getPathToSource() .
+                $fullPath = \Magento\Framework\App\Utility\Files::init()->getPathToSource() .
                     $directory .
                     $namespacePath .
                     '/' .
@@ -530,7 +528,7 @@ protected function _assertClassReferences($badClasses, $file)
 
     public function testCoversAnnotation()
     {
-        $files = \Magento\Framework\Test\Utility\Files::init();
+        $files = \Magento\Framework\App\Utility\Files::init();
         $errors = [];
         foreach ($files->getFiles([BP . '/dev/tests/{integration,unit}'], '*') as $file) {
             $code = file_get_contents($file);