MAGETWO-52000: [Github][PR]impossible to see what is wrong with cron - unhelpful error message #3189

- updating tests

Author: mazhalai

lib/internal/Magento/Framework/Code/Test/Unit/GeneratedFilesTest.php

@@ -51,13 +51,16 @@ public function testRegenerate($getPathMap, $isDirectoryMap, $deleteMap)
     {
 
         $this->writeInterface
-            ->expects($this->once())
+            ->expects($this->any())
             ->method('isExist')
-            ->with(GeneratedFiles::REGENERATE_FLAG)
-            ->willReturn(true);
-        $this->directoryList->expects($this->exactly(2))->method('getPath')->willReturnMap($getPathMap);
-        $this->writeInterface->expects($this->exactly(2))->method('getRelativePath')->willReturnMap($getPathMap);
-        $this->writeInterface->expects($this->exactly(2))->method('isDirectory')->willReturnMap($isDirectoryMap);
+            ->with()
+            ->willReturnMap([
+                [GeneratedFiles::REGENERATE_FLAG, true],
+                ['path/to/di', false]
+            ]);
+        $this->directoryList->expects($this->any())->method('getPath')->willReturnMap($getPathMap);
+        $this->writeInterface->expects($this->any())->method('getRelativePath')->willReturnMap($getPathMap);
+        $this->writeInterface->expects($this->any())->method('isDirectory')->willReturnMap($isDirectoryMap);
         $this->writeInterface->expects($this->exactly(1))->method('delete')->willReturnMap($deleteMap);
         $this->model->regenerate();
     }
@@ -69,9 +72,15 @@ public function regenerateDataProvider()
     {
         $pathToGeneration = 'path/to/generation';
         $pathToDi = 'path/to/di';
+        $pathToCache = 'path/to/di';
+        $pathToConfig = 'path/to/config';
 
         $getPathMap =     [[DirectoryList::GENERATION, $pathToGeneration],
-            [DirectoryList::DI, $pathToDi]];
+            [DirectoryList::DI, $pathToDi],
+            [DirectoryList::CACHE, $pathToCache],
+            [DirectoryList::CONFIG, $pathToConfig],
+        ];
+
         $deleteMap = [[BP . '/' . $pathToGeneration, true],
             [BP . '/' . $pathToDi, true],
             [BP . GeneratedFiles::REGENERATE_FLAG, true],

setup/src/Magento/Setup/Model/Cron/JobUpgrade.php

@@ -76,7 +76,7 @@ public function execute()
             /**
              * @var \Magento\Framework\Filesystem\Directory\WriteFactory $writeFactory
              */
-            $writeFactory = $this->objectManager->get('\\Magento\Framework\Filesystem\Directory\WriteFactory');
+            $writeFactory = $this->objectManager->get('\Magento\Framework\Filesystem\Directory\WriteFactory');
             $write = $writeFactory->create(BP);
             $dirList = $this->objectManager->get('\Magento\Framework\App\Filesystem\DirectoryList');
             $pathToCacheStatus = $write->getRelativePath(

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

@@ -12,6 +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');
         $command = $this->getMock('Magento\Setup\Console\Command\UpgradeCommand', [], [], '', false);
         $command->expects($this->once())->method('run');
         $status = $this->getMock('Magento\Setup\Model\Cron\Status', [], [], '', false);
@@ -20,6 +21,30 @@ 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,