Merge remote-tracking branch 'origin/MAGETWO-34612-Code-Coverage' into develop

Olga Kopylova · Olga Kopylova · commit 9493fa4f873e · 2015-04-15T11:50:25.000-05:00
diff --git a/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Configurator.php b/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Configurator.php
@@ -16,7 +16,6 @@ public function getConfiguration()
     {
         return [
             'preferences' => [
-                'Magento\Framework\Stdlib\Cookie' => 'Magento\TestFramework\Cookie',
                 'Magento\Framework\Stdlib\CookieManagerInterface' => 'Magento\TestFramework\CookieManager',
             ]
         ];
diff --git a/dev/tests/integration/framework/Magento/TestFramework/ObjectManagerFactory.php b/dev/tests/integration/framework/Magento/TestFramework/ObjectManagerFactory.php
@@ -95,7 +95,6 @@ protected function _loadPrimaryConfig(DirectoryList $directoryList, $driverPool,
                     'Magento\Framework\Stdlib\CookieManagerInterface' => 'Magento\TestFramework\CookieManager',
                     'Magento\Framework\ObjectManager\DynamicConfigInterface' =>
                         '\Magento\TestFramework\ObjectManager\Configurator',
-                    'Magento\Framework\Stdlib\Cookie' => 'Magento\TestFramework\Cookie',
                     'Magento\Framework\App\RequestInterface' => 'Magento\TestFramework\Request',
                     'Magento\Framework\App\Request\Http' => 'Magento\TestFramework\Request',
                     'Magento\Framework\App\ResponseInterface' => 'Magento\TestFramework\Response',
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
@@ -69,7 +69,7 @@ function ($file) {
 
                 $this->_assertClassesExist($classes, $file);
             },
-            \Magento\Framework\App\Utility\Files::init()->getPhpFiles()
+            \Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, true, true, true, false)
         );
     }
 
@@ -530,29 +530,11 @@ public function testCoversAnnotation()
     {
         $files = \Magento\Framework\App\Utility\Files::init();
         $errors = [];
-        $fileList = $files->getFiles(
-            [
-                BP . '/dev/tests/integration',
-                BP . '/app/code/*/*/Test/Unit',
-                BP . '/lib/internal/*/*/*/Test/Unit',
-                BP . '/lib/internal/Magento/Framework/Test/Unit',
-                BP . '/dev/tools/Magento/Tools/*/Test/Unit',
-                BP . '/setup/src/Magento/Setup/Test/Unit',
-            ],
-            '*.php'
-        );
-        foreach ($fileList as $file) {
+        foreach ($files->getFiles([BP . '/dev/tests/{integration,unit}'], '*') as $file) {
             $code = file_get_contents($file);
-            if (preg_match_all(
-                '/@covers(DefaultClass)?\s+([\w\\\\]+)(::([\w\\\\]+))?/',
-                $code,
-                $matchesAll,
-                PREG_SET_ORDER
-            )) {
-                foreach ($matchesAll as $matches) {
-                    if ($this->isNonexistentEntityCovered($matches)) {
-                        $errors[] = $file . ': ' . $matches[0];
-                    }
+            if (preg_match('/@covers(DefaultClass)?\s+([\w\\\\]+)(::([\w\\\\]+))?/', $code, $matches)) {
+                if ($this->isNonexistentEntityCovered($matches)) {
+                    $errors[] = $file . ': ' . $matches[0];
                 }
             }
         }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -427,7 +427,7 @@ public function getAllFiles()
             $files,
             $this->_prepareFiles(
                 'php',
-                \Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, false, false, true),
+                \Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, false, false, true, false),
                 true
             )
         );
@@ -489,7 +489,7 @@ protected static function _prepareMapRouters()
         $pattern = '/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)\/Controller\/' .
             '(?<path>[\/\w]*).php/';
 
-        $files = \Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, false, false, false);
+        $files = \Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, false, false, false, false);
         foreach ($files as $file) {
             if (preg_match($pattern, $file, $matches)) {
                 $module = $matches['namespace'] . '\\' . $matches['module'];
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/BlocksTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/BlocksTest.php
@@ -7,6 +7,8 @@
  */
 namespace Magento\Test\Integrity\Layout;
 
+use Magento\Framework\App\Utility\Files;
+
 class BlocksTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -24,7 +26,7 @@ class BlocksTest extends \PHPUnit_Framework_TestCase
      */
     public static function setUpBeforeClass()
     {
-        foreach (\Magento\Framework\App\Utility\Files::init()->getLayoutFiles([], false) as $file) {
+        foreach (Files::init()->getLayoutFiles([], false) as $file) {
             $xml = simplexml_load_file($file);
             $elements = $xml->xpath('/layout//*[self::container or self::block]') ?: [];
             /** @var $node \SimpleXMLElement */
@@ -94,7 +96,7 @@ function ($alias, $file) {
     public function getChildBlockDataProvider()
     {
         $result = [];
-        foreach (\Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, false, true, false) as $file) {
+        foreach (Files::init()->getPhpFiles(true, false, true, false, false) as $file) {
             $aliases = \Magento\Framework\App\Utility\Classes::getAllMatches(
                 file_get_contents($file),
                 '/\->getChildBlock\(\'([^\']+)\'\)/x'
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
@@ -85,7 +85,7 @@ function ($file) use ($path) {
                     );
                 }
             },
-            $files->getPhpFiles(false, true, false)
+            $files->getPhpFiles(false, true, false, true, false)
         );
     }
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ClassesTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ClassesTest.php
@@ -22,7 +22,7 @@ function ($file) {
                 $classes = \Magento\Framework\App\Utility\Classes::collectPhpCodeClasses(file_get_contents($file));
                 $this->_assertNonFactoryName($classes, $file);
             },
-            \Magento\Framework\App\Utility\Files::init()->getPhpFiles()
+            \Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, true, true, true, false)
         );
     }
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/TableTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/TableTest.php
@@ -32,7 +32,7 @@ function ($filePath) {
                 $message = $this->_composeFoundsMessage($legacyTables);
                 $this->assertEmpty($message, $message);
             },
-            \Magento\Framework\App\Utility\Files::init()->getPhpFiles()
+            \Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, true, true, true, false)
         );
     }
 
diff --git a/dev/tools/Magento/Tools/Migration/factory_names.php b/dev/tools/Magento/Tools/Migration/factory_names.php
@@ -8,7 +8,7 @@
 require realpath(dirname(dirname(dirname(dirname(dirname(__DIR__)))))) . '/dev/tests/static/framework/bootstrap.php';
 
 // PHP code
-foreach (\Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, true, true, false) as $file) {
+foreach (\Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, true, true, false, false) as $file) {
     $content = file_get_contents($file);
     $classes = \Magento\Framework\App\Utility\Classes::collectPhpCodeClasses($content);
     $factoryNames = array_filter($classes, 'isFactoryName');
diff --git a/dev/tools/Magento/Tools/Migration/factory_table_names.php b/dev/tools/Magento/Tools/Migration/factory_table_names.php
@@ -32,7 +32,7 @@
 $tablesAssociation = getFilesCombinedArray(__DIR__ . '/FactoryTableNames', 'replace_*.php');
 $blackList = getFilesCombinedArray(__DIR__ . '/FactoryTableNames', 'blacklist_*.php');
 
-$phpFiles = \Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, false, false, false);
+$phpFiles = \Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, false, false, false, false);
 
 $replacementResult = false;
 if (!$isSearchTables || $isDryRunMode) {
diff --git a/dev/tools/Magento/Tools/Migration/get_aliases_map.php b/dev/tools/Magento/Tools/Migration/get_aliases_map.php
@@ -39,7 +39,7 @@
 $map = [];
 $compositeModules = getFilesCombinedArray(__DIR__ . '/aliases_map', '/^composite_modules_.*\.php$/');
 // PHP code
-foreach ($utilityFiles->getPhpFiles(true, true, true, false) as $file) {
+foreach ($utilityFiles->getPhpFiles(true, true, true, false, false) as $file) {
     $content = file_get_contents($file);
     $classes = \Magento\Framework\App\Utility\Classes::collectPhpCodeClasses($content);
     if ($classes) {
diff --git a/lib/internal/Magento/Framework/App/Utility/Classes.php b/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);
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/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));
             }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ public function getConfiguration()`
`16`	`16`	`{`
`17`	`17`	`return [`
`18`	`18`	`'preferences' => [`
`19`		`- 'Magento\Framework\Stdlib\Cookie' => 'Magento\TestFramework\Cookie',`
`20`	`19`	`'Magento\Framework\Stdlib\CookieManagerInterface' => 'Magento\TestFramework\CookieManager',`
`21`	`20`	`]`
`22`	`21`	`];`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ function ($file) use ($path) {`
`85`	`85`	`);`
`86`	`86`	`}`
`87`	`87`	`},`
`88`		`- $files->getPhpFiles(false, true, false)`
	`88`	`+ $files->getPhpFiles(false, true, false, true, false)`
`89`	`89`	`);`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ function ($file) {`
`22`	`22`	`$classes = \Magento\Framework\App\Utility\Classes::collectPhpCodeClasses(file_get_contents($file));`
`23`	`23`	`$this->_assertNonFactoryName($classes, $file);`
`24`	`24`	`},`
`25`		`- \Magento\Framework\App\Utility\Files::init()->getPhpFiles()`
	`25`	`+ \Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, true, true, true, false)`
`26`	`26`	`);`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ function ($filePath) {`
`32`	`32`	`$message = $this->_composeFoundsMessage($legacyTables);`
`33`	`33`	`$this->assertEmpty($message, $message);`
`34`	`34`	`},`
`35`		`- \Magento\Framework\App\Utility\Files::init()->getPhpFiles()`
	`35`	`+ \Magento\Framework\App\Utility\Files::init()->getPhpFiles(true, true, true, true, false)`
`36`	`36`	`);`
`37`	`37`	`}`
`38`	`38`