Skip to content

Commit 0043a15

Browse files
committed
MAGETWO-34612: Unit tests coverage build failure
- adding tests folders to be checked for obsolete tests
1 parent 02240b4 commit 0043a15

File tree

9 files changed

+21
-10
lines changed

9 files changed

+21
-10
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ public function getAllFiles()
427427
$files,
428428
$this->_prepareFiles(
429429
'php',
430-
\Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, false, false, true),
430+
\Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, false, false, true, false),
431431
true
432432
)
433433
);
@@ -489,7 +489,7 @@ protected static function _prepareMapRouters()
489489
$pattern = '/(?<namespace>[A-Z][a-z]+)[_\/\\\\](?<module>[A-Z][a-zA-Z]+)\/Controller\/' .
490490
'(?<path>[\/\w]*).php/';
491491

492-
$files = \Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, false, false, false);
492+
$files = \Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, false, false, false, false);
493493
foreach ($files as $file) {
494494
if (preg_match($pattern, $file, $matches)) {
495495
$module = $matches['namespace'] . '\\' . $matches['module'];

dev/tests/static/testsuite/Magento/Test/Integrity/Layout/BlocksTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ function ($alias, $file) {
9494
public function getChildBlockDataProvider()
9595
{
9696
$result = [];
97-
foreach (\Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, false, true, false) as $file) {
97+
foreach (
98+
\Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, false, true, false, false) as $file
99+
) {
98100
$aliases = \Magento\Framework\Test\Utility\Classes::getAllMatches(
99101
file_get_contents($file),
100102
'/\->getChildBlock\(\'([^\']+)\'\)/x'

dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function ($file) use ($path) {
8585
);
8686
}
8787
},
88-
$files->getPhpFiles(false, true, false)
88+
$files->getPhpFiles(false, true, false, true, false)
8989
);
9090
}
9191

dev/tests/static/testsuite/Magento/Test/Legacy/TableTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function ($filePath) {
3232
$message = $this->_composeFoundsMessage($legacyTables);
3333
$this->assertEmpty($message, $message);
3434
},
35-
\Magento\Framework\Test\Utility\Files::init()->getPhpFiles()
35+
\Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, true, true, true, false)
3636
);
3737
}
3838

dev/tools/Magento/Tools/Migration/factory_names.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
require realpath(dirname(dirname(dirname(dirname(dirname(__DIR__)))))) . '/dev/tests/static/framework/bootstrap.php';
99

1010
// PHP code
11-
foreach (\Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, true, true, false) as $file) {
11+
foreach (\Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, true, true, false, false) as $file) {
1212
$content = file_get_contents($file);
1313
$classes = \Magento\Framework\Test\Utility\Classes::collectPhpCodeClasses($content);
1414
$factoryNames = array_filter($classes, 'isFactoryName');

dev/tools/Magento/Tools/Migration/factory_table_names.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
$tablesAssociation = getFilesCombinedArray(__DIR__ . '/FactoryTableNames', 'replace_*.php');
3333
$blackList = getFilesCombinedArray(__DIR__ . '/FactoryTableNames', 'blacklist_*.php');
3434

35-
$phpFiles = \Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, false, false, false);
35+
$phpFiles = \Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, false, false, false, false);
3636

3737
$replacementResult = false;
3838
if (!$isSearchTables || $isDryRunMode) {

dev/tools/Magento/Tools/Migration/get_aliases_map.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
$map = [];
4040
$compositeModules = getFilesCombinedArray(__DIR__ . '/aliases_map', '/^composite_modules_.*\.php$/');
4141
// PHP code
42-
foreach ($utilityFiles->getPhpFiles(true, true, true, false) as $file) {
42+
foreach ($utilityFiles->getPhpFiles(true, true, true, false, false) as $file) {
4343
$content = file_get_contents($file);
4444
$classes = \Magento\Framework\Test\Utility\Classes::collectPhpCodeClasses($content);
4545
if ($classes) {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,9 @@ public static function collectModuleClasses($subTypePattern = '[A-Za-z]+')
189189
'/'
190190
) . '\/app\/code\/([A-Za-z]+)\/([A-Za-z]+)\/(' . $subTypePattern . '\/.+)\.php$/';
191191
$result = [];
192-
foreach (\Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, false, false, false) as $file) {
192+
foreach (
193+
\Magento\Framework\Test\Utility\Files::init()->getPhpFiles(true, false, false, false, false) as $file
194+
) {
193195
if (preg_match($pattern, $file, $matches)) {
194196
$module = "{$matches[1]}_{$matches[2]}";
195197
$class = "{$module}" . '\\' . str_replace(

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,10 @@ public function getPathToSource()
100100
* @param bool $otherCode non-application PHP-code (doesn't include "dev" directory)
101101
* @param bool $templates application PHTML-code
102102
* @param bool $asDataSet
103+
* @param bool $tests tests folder
103104
* @return array
104105
*/
105-
public function getPhpFiles($appCode = true, $otherCode = true, $templates = true, $asDataSet = true)
106+
public function getPhpFiles($appCode = true, $otherCode = true, $templates = true, $asDataSet = true, $tests = true)
106107
{
107108
$key = __METHOD__ . "/{$this->_path}/{$appCode}/{$otherCode}/{$templates}";
108109
if (!isset(self::$_cache[$key])) {
@@ -124,6 +125,12 @@ public function getPhpFiles($appCode = true, $otherCode = true, $templates = tru
124125
self::getFiles(["{$this->_path}/dev/tools/Magento/Tools/SampleData"], '*.php')
125126
);
126127
}
128+
if ($tests) {
129+
$files = array_merge(
130+
$files,
131+
self::getFiles(["{$this->_path}/dev/tests"], '*.php')
132+
);
133+
}
127134
if ($templates) {
128135
$files = array_merge($files, $this->getPhtmlFiles(false, false));
129136
}

0 commit comments

Comments
 (0)