MAGETWO-67871: Requesting autogenerated classes that are not in constructor cause fatal errors in production mode

- refactor

Author: Igor Melnikov

app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php

@@ -53,11 +53,6 @@ class ImageTest extends \PHPUnit_Framework_TestCase
      */
     private $factory;
 
-    /**
-     * @var \Magento\Framework\View\FileSystem|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $fileSystem;
-
     /**
      * @var \Magento\Framework\Filesystem\Directory\WriteInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -108,7 +103,6 @@ protected function setUp()
             ->with(DirectoryList::MEDIA)
             ->will($this->returnValue($this->mediaDirectory));
         $this->factory = $this->getMock(\Magento\Framework\Image\Factory::class, [], [], '', false);
-        $this->fileSystem = $this->getMock(\Magento\Framework\View\FileSystem::class, [], [], '', false);
 
         $this->viewAssetImageFactory = $this->getMockBuilder(ImageFactory::class)
             ->disableOriginalConstructor()
@@ -127,7 +121,6 @@ protected function setUp()
                 'coreFileStorageDatabase' => $this->coreFileHelper,
                 'filesystem' => $this->filesystem,
                 'imageFactory' => $this->factory,
-                'viewFileSystem' => $this->fileSystem,
                 'viewAssetImageFactory' => $this->viewAssetImageFactory,
                 'viewAssetPlaceholderFactory' => $this->viewAssetPlaceholderFactory
             ]

dev/tests/static/testsuite/Magento/Test/Legacy/AutogeneratedClassNotInConstructorTest.php

@@ -106,7 +106,7 @@ private function getWhitelistedClasses()
     {
         if (!$this->autogeneratedClassesWhitelist) {
             $this->autogeneratedClassesWhitelist = require_once __DIR__
-                . '/_files/autogenerated_class_not_in_contructor_whitelist.php';
+                . '/_files/autogenerated_class_not_in_constructor_whitelist.php';
         }
         return $this->autogeneratedClassesWhitelist;
     }