Merge remote-tracking branch 'ogresCE/MAGETWO-38028-Travis-CI-Failure' into PR_Branch

Author: mazhalai

dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowFrameworkCommandTest.php

@@ -40,10 +40,15 @@ public function testExecute()
             ['--directory' => __DIR__ . '/_files/root', '--output' => __DIR__ . '/_files/output/framework.csv']
         );
         $this->assertEquals('Report successfully processed.' . PHP_EOL, $this->commandTester->getDisplay());
-        $this->assertFileEquals(
-            __DIR__ . '/_files/expected/framework.csv',
-            __DIR__ . '/_files/output/framework.csv'
+        $fileContents = file_get_contents(__DIR__ . '/_files/output/framework.csv');
+        $this->assertContains(
+            '"Dependencies of framework:","Total number"' . PHP_EOL . '"","2"' . PHP_EOL,
+            $fileContents
         );
+        $this->assertContains('"Dependencies for each module:",""' . PHP_EOL, $fileContents);
+        $this->assertContains('"Magento\A","1"' . PHP_EOL . '" -- Magento\Framework","1"' . PHP_EOL, $fileContents);
+        $this->assertContains('"Magento\B","1"' . PHP_EOL . '" -- Magento\Framework","1"' . PHP_EOL, $fileContents);
+
     }
 
     public function testExecuteInvalidDirectory()

dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowModulesCircularCommandTest.php

@@ -38,9 +38,19 @@ public function testExecute()
             ['--directory' => __DIR__ . '/_files/root', '--output' => __DIR__ . '/_files/output/circular.csv']
         );
         $this->assertEquals('Report successfully processed.' . PHP_EOL, $this->commandTester->getDisplay());
-        $this->assertFileEquals(
-            __DIR__ . '/_files/expected/circular.csv',
-            __DIR__ . '/_files/output/circular.csv'
+        $fileContents = file_get_contents(__DIR__ . '/_files/output/circular.csv');
+        $this->assertContains(
+            '"Circular dependencies:","Total number of chains"' . PHP_EOL . '"","2"' . PHP_EOL,
+            $fileContents
+        );
+        $this->assertContains('"Circular dependencies for each module:",""' . PHP_EOL, $fileContents);
+        $this->assertContains(
+            '"magento/module-a","1"' . PHP_EOL . '"magento/module-a->magento/module-b->magento/module-a"' . PHP_EOL,
+            $fileContents
+        );
+        $this->assertContains(
+            '"magento/module-b","1"' . PHP_EOL . '"magento/module-b->magento/module-a->magento/module-b"' . PHP_EOL,
+            $fileContents
         );
     }
 

dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowModulesCommandTest.php

@@ -38,9 +38,19 @@ public function testExecute()
             ['--directory' => __DIR__ . '/_files/root', '--output' => __DIR__ . '/_files/output/modules.csv']
         );
         $this->assertEquals('Report successfully processed.' . PHP_EOL, $this->commandTester->getDisplay());
-        $this->assertFileEquals(
-            __DIR__ . '/_files/expected/modules.csv',
-            __DIR__ . '/_files/output/modules.csv'
+        $fileContents = file_get_contents(__DIR__ . '/_files/output/modules.csv');
+        $this->assertContains(
+            '"","All","Hard","Soft"' . PHP_EOL . '"Total number of dependencies","2","2","0"' . PHP_EOL,
+            $fileContents
+        );
+        $this->assertContains('"Dependencies for each module:","All","Hard","Soft"'. PHP_EOL, $fileContents);
+        $this->assertContains(
+            '"magento/module-a","1","1","0"' . PHP_EOL . '" -- magento/module-b","","1","0"' . PHP_EOL,
+            $fileContents
+        );
+        $this->assertContains(
+            '"magento/module-b","1","1","0"' . PHP_EOL . '" -- magento/module-a","","1","0"' . PHP_EOL,
+            $fileContents
         );
     }