MAGETWO-34434: Fix Dependency Test

Olga Kopylova · Olga Kopylova · commit 78385494e33e · 2015-02-25T16:44:21.000-06:00
- limited setup classes check to 'php' files
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/DbRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/DbRule.php
@@ -37,7 +37,7 @@ public function __construct(array $tables)
      */
     public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
     {
-        if (!preg_match('#/app/.*/(Setup|Resource)/.*\.php$#', $file)) {
+        if ('php' != $fileType || !preg_match('#/app/.*/(Setup|Resource)/.*\.php$#', $file)) {
             return [];
         }
 
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DbRuleTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DbRuleTest.php
@@ -26,7 +26,7 @@ protected function setUp()
      */
     public function testGetDependencyInfo($module, $file, $contents, array $expected)
     {
-        $this->assertEquals($expected, $this->model->getDependencyInfo($module, 'any', $file, $contents));
+        $this->assertEquals($expected, $this->model->getDependencyInfo($module, 'php', $file, $contents));
     }
 
     public function getDependencyInfoDataProvider()

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct(array $tables)`
`37`	`37`	`*/`
`38`	`38`	`public function getDependencyInfo($currentModule, $fileType, $file, &$contents)`
`39`	`39`	`{`
`40`		`- if (!preg_match('#/app/./(Setup\|Resource)/.\.php$#', $file)) {`
	`40`	`+ if ('php' != $fileType \|\| !preg_match('#/app/./(Setup\|Resource)/.\.php$#', $file)) {`
`41`	`41`	`return [];`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ protected function setUp()`
`26`	`26`	`*/`
`27`	`27`	`public function testGetDependencyInfo($module, $file, $contents, array $expected)`
`28`	`28`	`{`
`29`		`- $this->assertEquals($expected, $this->model->getDependencyInfo($module, 'any', $file, $contents));`
	`29`	`+ $this->assertEquals($expected, $this->model->getDependencyInfo($module, 'php', $file, $contents));`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public function getDependencyInfoDataProvider()`