MAGETWO-34434: Fix Dependency Test

Olga Kopylova · Olga Kopylova · commit 85a5c33ad1c1 · 2015-02-25T14:17:05.000-06:00
- fixed few bugs in the test (incorrect usage of Vendor\Module vs Vendor_Module)
- adjusted the test to the new representation of installs/upgrades
- fixed missing dependencies
diff --git a/app/code/Magento/Core/composer.json b/app/code/Magento/Core/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-authorization": "0.42.0-beta9",
         "magento/module-store": "0.42.0-beta9",
         "magento/module-backend": "0.42.0-beta9",
         "magento/framework": "0.42.0-beta9",
diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-core": "0.42.0-beta9",
         "magento/module-store": "0.42.0-beta9",
         "magento/module-shipping": "0.42.0-beta9",
         "magento/module-backend": "0.42.0-beta9",
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-core": "0.42.0-beta9",
         "magento/module-store": "0.42.0-beta9",
         "magento/module-shipping": "0.42.0-beta9",
         "magento/module-directory": "0.42.0-beta9",
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
@@ -10,6 +10,7 @@
         "magento/module-sales-rule": "0.42.0-beta9",
         "magento/module-directory": "0.42.0-beta9",
         "magento/module-checkout": "0.42.0-beta9",
+        "magento/module-sales": "0.42.0-beta9",
         "magento/module-quote": "0.42.0-beta9",
         "magento/framework": "0.42.0-beta9",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
@@ -5,6 +5,7 @@
         "php": "~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta9",
         "magento/module-catalog": "0.42.0-beta9",
+        "magento/module-catalog-rule": "0.42.0-beta9",
         "magento/module-customer": "0.42.0-beta9",
         "magento/module-authorization": "0.42.0-beta9",
         "magento/module-payment": "0.42.0-beta9",
diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json
@@ -4,6 +4,7 @@
     "require": {
         "php": "~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta9",
+        "magento/module-eav": "0.42.0-beta9",
         "magento/module-rule": "0.42.0-beta9",
         "magento/module-catalog": "0.42.0-beta9",
         "magento/module-sales": "0.42.0-beta9",
diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json
@@ -5,6 +5,7 @@
         "php": "~5.5.0|~5.6.0",
         "magento/framework": "0.42.0-beta9",
         "magento/module-backend": "0.42.0-beta9",
+        "magento/module-catalog-search": "0.42.0-beta9",
         "magento/module-store": "0.42.0-beta9",
         "magento/module-reports": "0.42.0-beta9",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-core": "0.42.0-beta9",
         "magento/module-store": "0.42.0-beta9",
         "magento/module-shipping": "0.42.0-beta9",
         "magento/module-directory": "0.42.0-beta9",
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/.*/(sql|data|resource)/.*\.php$#', $file)) {
+        if (!preg_match('#/app/.*/(Setup|Resource)/.*\.php$#', $file)) {
             return [];
         }
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -311,9 +311,9 @@ private function collectDependency($dependency, $currentModule, &$undeclared)
         $hard = $this->_getDependencies($currentModule, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
 
         $declared = $type == self::TYPE_SOFT ? array_merge($soft, $hard) : $hard;
-        if (!in_array($module, $declared) && !in_array($nsModule, $declared) && !$this->_isFake($module)) {
+        if (!in_array($module, $declared) && !in_array($nsModule, $declared) && !$this->_isFake($nsModule)) {
             $undeclared[$type][] = $module;
-        } elseif ((in_array($module, $declared) || in_array($nsModule, $declared)) && $this->_isFake($module)) {
+        } elseif ((in_array($module, $declared) || in_array($nsModule, $declared)) && $this->_isFake($nsModule)) {
             $this->_setDependencies($currentModule, $type, self::MAP_TYPE_REDUNDANT, $module);
         }
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php

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/./(sql\|data\|resource)/.\.php$#', $file)) {`
	`40`	`+ if (!preg_match('#/app/./(Setup\|Resource)/.\.php$#', $file)) {`
`41`	`41`	`return [];`
`42`	`42`	`}`
`43`	`43`