Merge branch 'MAGETWO44227-FIX-TESTS' into 'master3'

MAGETWO44227: Fix statics and unit tests

See merge request !163

Author: nikshostko

lib/internal/Magento/Framework/Config/View.php

@@ -27,19 +27,20 @@ class View extends \Magento\Framework\Config\Reader\Filesystem
     private $xsdReader;
 
     /**
-     * @param array $configFiles
-     * @param UrnResolver $urnResolver
-     * @param ValidationStateInterface $fileName
+     * @param FileResolverInterface $fileResolver
      * @param ConverterInterface $converterInterface
      * @param SchemaLocatorInterface $schemaLocatorInterface
+     * @param ValidationStateInterface $validationState
+     * @param UrnResolver $urnResolver
+     * @param array $fileName
      * @param array $xpath
      */
     public function __construct(
-        ValidationStateInterface $validationState,
-        UrnResolver $urnResolver,
+        FileResolverInterface $fileResolver,
         ConverterInterface $converterInterface,
         SchemaLocatorInterface $schemaLocatorInterface,
-        FileResolverInterface $fileResolver,
+        ValidationStateInterface $validationState,
+        UrnResolver $urnResolver,
         $fileName,
         $xpath = []
     ) {

lib/internal/Magento/Framework/View/Test/Unit/ConfigTest.php

@@ -42,15 +42,9 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->readerMock = $this->getMock('Magento\Framework\Module\Dir\Reader', [], [], '', false);
         $this->filesystemMock = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
         $this->directoryReadMock = $this->getMock('Magento\Framework\Filesystem\Directory\ReadInterface');
-        $this->filesystemMock->expects($this->once())
-            ->method('getDirectoryRead')
-            ->with($this->equalTo(DirectoryList::ROOT))
-            ->will($this->returnValue($this->directoryReadMock));
         $this->repositoryMock = $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false);
-        $this->fileSystemMock = $this->getMock('Magento\Framework\View\FileSystem', [], [], '', false);
         $this->fileIteratorFactoryMock = $this->getMock(
             'Magento\Framework\Config\FileIteratorFactory',
             [],
@@ -63,10 +57,7 @@ protected function setUp()
         $this->config = $this->objectManagerHelper->getObject(
             'Magento\Framework\View\Config',
             [
-                'moduleReader' => $this->readerMock,
-                'filesystem' => $this->filesystemMock,
                 'assetRepo' => $this->repositoryMock,
-                'viewFileSystem' => $this->fileSystemMock,
                 'fileIteratorFactory' => $this->fileIteratorFactoryMock,
                 'viewConfigFactory' => $this->viewConfigFactoryMock
             ]
@@ -77,55 +68,15 @@ public function testGetViewConfig()
     {
         $themeMock = $this->getMock(
             'Magento\Theme\Model\Theme',
-            ['getCode', 'getCustomization', 'getCustomViewConfigPath'],
+            ['getCustomViewConfigPath'],
             [],
             '',
             false
         );
-        $themeMock->expects($this->atLeastOnce())
-            ->method('getCode')
-            ->will($this->returnValue(2));
-        $themeMock->expects($this->once())
-            ->method('getCustomization')
-            ->will($this->returnSelf());
-        $themeMock->expects($this->once())
-            ->method('getCustomViewConfigPath')
-            ->will($this->returnValue(''));
         $params = ['themeModel' => $themeMock];
-        $configFile = 'config.xml';
-        $this->repositoryMock->expects($this->atLeastOnce())
-            ->method('updateDesignParams')
-            ->with($this->equalTo($params))
-            ->will($this->returnSelf());
-        $iterator = $this->getMock('Magento\Framework\Config\FileIterator', [], [], '', false);
-        $iterator->expects($this->once())
-            ->method('toArray')
-            ->will($this->returnValue([]));
-        $this->readerMock->expects($this->once())
-            ->method('getConfigurationFiles')
-            ->with($this->equalTo(basename(\Magento\Framework\View\ConfigInterface::CONFIG_FILE_NAME)))
-            ->will($this->returnValue($iterator));
-        $this->directoryReadMock->expects($this->once())
-            ->method('isExist')
-            ->with($this->anything())
-            ->will($this->returnValue(true));
-        $this->fileSystemMock->expects($this->once())
-            ->method('getFilename')
-            ->with($this->equalTo(\Magento\Framework\View\ConfigInterface::CONFIG_FILE_NAME), $params)
-            ->will($this->returnValue($configFile));
-        $this->directoryReadMock->expects($this->any())
-            ->method('getRelativePath')
-            ->with($this->equalTo($configFile))
-            ->will($this->returnArgument(0));
-        $xmlData = '<view><vars module="Magento_Catalog"><var name="test">1</var></vars></view>';
-        $this->directoryReadMock->expects($this->once())
-            ->method('readFile')
-            ->with($this->equalTo($configFile))
-            ->will($this->returnValue($xmlData));
         $configViewMock = $this->getMock('Magento\Framework\Config\View', [], [], '', false);
         $this->viewConfigFactoryMock->expects($this->once())
             ->method('create')
-            ->with([$configFile => $xmlData])
             ->willReturn($configViewMock);
         $this->assertInstanceOf('Magento\Framework\Config\View', $this->config->getViewConfig($params));
         // lazy load test