MAGETWO-53474: [Github] Caches Aren't Enabled by Default on RC1 with Composer when Upgrading via CLI

- Updating tests.

Author: mazhalai

setup/src/Magento/Setup/Console/Command/UpgradeCommand.php

@@ -99,10 +99,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         //TODO: to be removed in scope of MAGETWO-53476
-        $writeFactory = $objectManager->get('\Magento\Framework\Filesystem\Directory\WriteFactory');
+        $writeFactory = $objectManager->get('Magento\Framework\Filesystem\Directory\WriteFactory');
         $write = $writeFactory->create(BP);
         /** @var \Magento\Framework\App\Filesystem\DirectoryList $dirList */
-        $dirList = $objectManager->get('\Magento\Framework\App\Filesystem\DirectoryList');
+        $dirList = $objectManager->get('Magento\Framework\App\Filesystem\DirectoryList');
 
         $pathToCacheStatus = $write->getRelativePath($dirList->getPath(DirectoryList::VAR_DIR) . '/.cachestates.json');
 

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

@@ -20,19 +20,31 @@ public function testExecute()
         $state = $this->getMock('Magento\Framework\App\State', [], [], '', false);
         $state->expects($this->once())->method('setAreaCode')->with('setup');
         $objectManagerProvider->expects($this->once())->method('get')->willReturn($objectManager);
-        $objectManager->expects($this->exactly(2))
-            ->method('get')
-            ->will($this->returnValueMap([
-                ['Magento\Framework\App\State', $state],
-                ['Magento\Framework\ObjectManager\ConfigLoaderInterface', $configLoader],
-        ]));
         $objectManager->expects($this->once())->method('configure');
         $state->expects($this->once())->method('setAreaCode')->with('setup');
         $installer = $this->getMock('Magento\Setup\Model\Installer', [], [], '', false);
         $installer->expects($this->at(0))->method('updateModulesSequence');
         $installer->expects($this->at(1))->method('installSchema');
         $installer->expects($this->at(2))->method('installDataFixtures');
         $installerFactory->expects($this->once())->method('create')->willReturn($installer);
+
+        $pathToCacheStatus = '/path/to/cachefile';
+        $writeFactory = $this->getMock('\Magento\Framework\Filesystem\Directory\WriteFactory', [], [], '', false);
+        $write = $this->getMock('\Magento\Framework\Filesystem\Directory\Write', [], [], '', false);
+        $write->expects($this->once())->method('isExist')->with('/path/to/cachefile')->willReturn(false);
+        $write->expects($this->once())->method('getRelativePath')->willReturn($pathToCacheStatus);
+
+        $writeFactory->expects($this->once())->method('create')->willReturn($write);
+        $directoryList = $this->getMock('\Magento\Framework\App\Filesystem\DirectoryList', [], [], '', false);
+        $objectManager->expects($this->exactly(4))
+            ->method('get')
+            ->will($this->returnValueMap([
+                ['Magento\Framework\App\State', $state],
+                ['Magento\Framework\ObjectManager\ConfigLoaderInterface', $configLoader],
+                ['Magento\Framework\Filesystem\Directory\WriteFactory', $writeFactory],
+                ['Magento\Framework\App\Filesystem\DirectoryList', $directoryList],
+            ]));
+
         $commandTester = new CommandTester(new UpgradeCommand($installerFactory, $objectManagerProvider));
         $commandTester->execute([]);
     }

setup/src/Magento/Setup/Test/Unit/Model/Cron/JobUpgradeTest.php

@@ -12,7 +12,7 @@ class JobUpgradeTest extends \PHPUnit_Framework_TestCase
     public function testExecute()
     {
         $queue = $this->getMock('Magento\Setup\Model\Cron\Queue', [], [], '', false);
-        $queue->expects($this->exactly(3))->method('addJobs');
+        $queue->expects($this->exactly(2))->method('addJobs');
         $command = $this->getMock('Magento\Setup\Console\Command\UpgradeCommand', [], [], '', false);
         $command->expects($this->once())->method('run');
         $status = $this->getMock('Magento\Setup\Model\Cron\Status', [], [], '', false);
@@ -21,30 +21,6 @@ public function testExecute()
         $objectManagerProvider = $this->getMock('Magento\Setup\Model\ObjectManagerProvider', ['get'], [], '', false);
         $objectManagerProvider->expects($this->once())->method('get')->willReturn($objectManager);
 
-        $cleanupFiles = $this->getMock('\Magento\Framework\App\State\CleanupFiles', [], [], '', false);
-        $cache = $this->getMock('\Magento\Framework\App\Cache', [], [], '', false);
-
-        $pathToCacheStatus = '/path/to/cachefile';
-        $writeFactory = $this->getMock('\Magento\Framework\Filesystem\Directory\WriteFactory', [], [], '', false);
-        $write = $this->getMock('\Magento\Framework\Filesystem\Directory\Write', [], [], '', false);
-        $write->expects($this->once())->method('isExist')->with('/path/to/cachefile')->willReturn(true);
-        $write->expects($this->once())->method('readFile')->with('/path/to/cachefile')->willReturn(
-            '{"cacheOne":1,"cacheTwo":1,"cacheThree":1}'
-        );
-        $write->expects($this->once())->method('delete')->with('/path/to/cachefile')->willReturn(true);
-        $write->expects($this->once())->method('getRelativePath')->willReturn($pathToCacheStatus);
-
-        $writeFactory->expects($this->once())->method('create')->willReturn($write);
-        $directoryList = $this->getMock('\Magento\Framework\App\Filesystem\DirectoryList', [], [], '', false);
-        $directoryList->expects($this->once())->method('getPath')->willReturn('/some/full/path' . $pathToCacheStatus);
-
-        $objectManager->expects($this->any())->method('get')->will($this->returnValueMap([
-            ['\Magento\Framework\Filesystem\Directory\WriteFactory', $writeFactory],
-            ['\Magento\Framework\App\Filesystem\DirectoryList', $directoryList],
-            ['\Magento\Framework\App\State\CleanupFiles', $cleanupFiles],
-            ['\Magento\Framework\App\Cache', $cache],
-        ]));
-
         $jobUpgrade = new JobUpgrade(
             $command,
             $objectManagerProvider,