MAGETWO-33068: [Dev] Layout Processing Improvement

Author: slavvka

dev/tests/unit/testsuite/Magento/Indexer/Model/Resource/AbstractResourceTest.php

@@ -28,7 +28,7 @@ class AbstractResourceTest extends \PHPUnit_Framework_TestCase
     protected $_categoryCollectionFactoryMock;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_storeManagerMock;
 
@@ -53,7 +53,7 @@ protected function setUp()
         $this->_categoryCollectionFactoryMock = $this->getMockBuilder(
             'Magento\Catalog\Model\Resource\Category\CollectionFactory'
         )->disableOriginalConstructor()->getMock();
-        $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->_catalogConfigMock = $this->getMockBuilder('Magento\Catalog\Model\Config')
             ->disableOriginalConstructor()
             ->getMock();

dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php

@@ -186,7 +186,7 @@ protected function setUp()
             '',
             false
         );
-        $this->updateFactory->expects($this->at(0))->method('create')->will($this->returnValue($this->_update));
+        $this->updateFactory->expects($this->at(0))->method('create')->will($this->returnValue($this->update));
         $this->updateCollection = $this->getMock(
             'Magento\Widget\Model\Resource\Layout\Update\Collection',
             ['addThemeFilter', 'delete', 'getIterator'],

dev/tests/unit/testsuite/Magento/Theme/Model/Favicon/FaviconTest.php

@@ -8,7 +8,7 @@
 use Magento\Backend\Model\Config\Backend\Image\Favicon as ImageFavicon;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\UrlInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class FaviconTest extends \PHPUnit_Framework_TestCase
 {
@@ -42,12 +42,12 @@ class FaviconTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')->getMock();
+        $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')->getMock();
         $this->store = $this->getMockBuilder('Magento\Store\Model\Store')->disableOriginalConstructor()->getMock();
         $storeManager->expects($this->any())
             ->method('getStore')
             ->willReturn($this->store);
-        /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
         $this->scopeManager = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')->getMock();
         $this->fileStorageDatabase = $this->getMockBuilder('Magento\Core\Helper\File\Storage\Database')
             ->disableOriginalConstructor()