Merge remote-tracking branch 'falcons/MAGETWO-56787' into MAGETWO-60790

Author: Bohdan Korablov

setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php

@@ -11,7 +11,12 @@
 
 class UpgradeCommandTest extends \PHPUnit_Framework_TestCase
 {
-    public function testExecute()
+    /**
+     * @param array $options
+     * @param string $expectedString
+     * @dataProvider executeDataProvider
+     */
+    public function testExecute($options = [], $expectedString ='')
     {
         $installerFactory = $this->getMock(\Magento\Setup\Model\InstallerFactory::class, [], [], '', false);
         $installer = $this->getMock(\Magento\Setup\Model\Installer::class, [], [], '', false);
@@ -20,6 +25,25 @@ public function testExecute()
         $installer->expects($this->at(2))->method('installDataFixtures');
         $installerFactory->expects($this->once())->method('create')->willReturn($installer);
         $commandTester = new CommandTester(new UpgradeCommand($installerFactory));
-        $this->assertSame(Cli::RETURN_SUCCESS, $commandTester->execute([]));
+        $this->assertSame(Cli::RETURN_SUCCESS, $commandTester->execute($options));
+        $this->assertEquals($expectedString, $commandTester->getDisplay());
+    }
+
+    /**
+     * @return array
+     */
+    public function executeDataProvider()
+    {
+        return [
+            [
+                'options' => [],
+                'expectedString' => 'Please re-run Magento compile command. Use the command "setup:di:compile"'
+                    . PHP_EOL
+            ],
+            [
+                'options' => ['--keep-generated' => true],
+                'expectedString' => ''
+            ],
+        ];
     }
 }