MAGETWO-31369: [South] Unit and Integration tests coverage

Author: slavvka

dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php

@@ -14,7 +14,7 @@
 class CustomizationTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
@@ -40,7 +40,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')->getMock();
+        $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')->getMock();
         $this->designPackage = $this->getMockBuilder('Magento\Framework\View\DesignInterface')->getMock();
         $this->themeCollection = $this->getMockBuilder('Magento\Theme\Model\Resource\Theme\Collection')
             ->disableOriginalConstructor()

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

@@ -115,20 +115,20 @@ protected function setUp()
                 'sort_order' => 20,
             ]
         );
-        $this->_sourceFiles = [$sourceFileOne, $sourceFileTwo];
-        $this->_sourceTheme = $this->getMock(
+        $this->sourceFiles = [$sourceFileOne, $sourceFileTwo];
+        $this->sourceTheme = $this->getMock(
             'Magento\Theme\Model\Theme',
             ['__wakeup', 'getCustomization'],
             [],
             '',
             false
         );
 
-        $this->_targetFiles = [
+        $this->targetFiles = [
             $this->getMock('Magento\Theme\Model\Theme\File', ['__wakeup', 'delete'], [], '', false),
             $this->getMock('Magento\Theme\Model\Theme\File', ['__wakeup', 'delete'], [], '', false),
         ];
-        $this->_targetTheme = $this->getMock(
+        $this->targetTheme = $this->getMock(
             'Magento\Theme\Model\Theme',
             ['__wakeup', 'getCustomization'],
             [],

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\Store\Model\ScopeInterface;
+use Magento\Framework\Store\ScopeInterface;
 
 class FaviconTest extends \PHPUnit_Framework_TestCase
 {
@@ -42,12 +42,12 @@ class FaviconTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')->getMock();
+        $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')->getMock();
         $this->store = $this->getMockBuilder('Magento\Store\Model\Store')->disableOriginalConstructor()->getMock();
         $storeManager->expects($this->any())
             ->method('getStore')
             ->willReturn($this->store);
-        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+        /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
         $this->scopeManager = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')->getMock();
         $this->fileStorageDatabase = $this->getMockBuilder('Magento\Core\Helper\File\Storage\Database')
             ->disableOriginalConstructor()