From cd694703c2b14f1187e85e63e9335f2e3a2cfbf8 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@ebay.com>
Date: Tue, 17 Feb 2015 17:35:12 +0200
Subject: [PATCH] MAGETWO-33068: [Dev] Layout Processing Improvement

---
 .../Magento/Indexer/Model/Resource/AbstractResourceTest.php | 4 ++--
 .../unit/testsuite/Magento/Theme/Model/CopyServiceTest.php  | 2 +-
 .../testsuite/Magento/Theme/Model/Favicon/FaviconTest.php   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Indexer/Model/Resource/AbstractResourceTest.php b/dev/tests/unit/testsuite/Magento/Indexer/Model/Resource/AbstractResourceTest.php
index e0e324aad575d..ddb305a390221 100644
--- a/dev/tests/unit/testsuite/Magento/Indexer/Model/Resource/AbstractResourceTest.php
+++ b/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();
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
index 17a2fcf94d394..17b4c7475b990 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
+++ b/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'],
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/Favicon/FaviconTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Favicon/FaviconTest.php
index 67c5654825a91..6aaa3f3c16944 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/Favicon/FaviconTest.php
+++ b/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()