MAGETWO-32640: Move Magento\Core\Model\Factory.php is to Magento Framework as a part of Magento\Framework\Data\Collection

- fix tests

Author: arkadiych

app/code/Magento/Backend/Model/Auth.php

@@ -40,7 +40,7 @@ class Auth
     protected $_coreConfig;
 
     /**
-     * @var \Magento\Framework\Data\Collection\Factory
+     * @var \Magento\Framework\Data\Collection\ModelFactory
      */
     protected $_modelFactory;
 
@@ -50,15 +50,15 @@ class Auth
      * @param \Magento\Backend\Model\Auth\StorageInterface $authStorage
      * @param \Magento\Backend\Model\Auth\Credential\StorageInterface $credentialStorage
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
-     * @param \Magento\Framework\Data\Collection\Factory $modelFactory
+     * @param \Magento\Framework\Data\Collection\ModelFactory $modelFactory
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Backend\Helper\Data $backendData,
         \Magento\Backend\Model\Auth\StorageInterface $authStorage,
         \Magento\Backend\Model\Auth\Credential\StorageInterface $credentialStorage,
         \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
-        \Magento\Framework\Data\Collection\Factory $modelFactory
+        \Magento\Framework\Data\Collection\ModelFactory $modelFactory
     ) {
         $this->_eventManager = $eventManager;
         $this->_backendData = $backendData;

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

@@ -2837,7 +2837,7 @@
     ['Magento\GiftMessage\Helper\Url'],
     ['Magento\Rss\Helper\Data'],
     ['Magento\Core\Model\EntityFactory', 'Magento\Framework\Data\Collection\EntityFactory'],
-    ['Magento\Core\Model\Factory', 'Magento\Framework\Data\Collection\Factory'],
+    ['Magento\Core\Model\Factory', 'Magento\Framework\Data\Collection\ModelFactory'],
     ['Magento\Sales\Model\ConverterInterface'],
     ['Magento\Paypal\Block\System\Config\Fieldset\Location'],
     ['Magento\Paypal\Block\Payflow\Advanced\Review'],

dev/tests/unit/testsuite/Magento/Backend/Model/AuthTest.php

@@ -36,7 +36,7 @@ protected function setUp()
     {
         $this->_eventManagerMock = $this->getMock('\Magento\Framework\Event\ManagerInterface');
         $this->_credentialStorage = $this->getMock('\Magento\Backend\Model\Auth\Credential\StorageInterface');
-        $this->_modelFactoryMock = $this->getMock('\Magento\Framework\Data\Collection\Factory', [], [], '', false);
+        $this->_modelFactoryMock = $this->getMock('\Magento\Framework\Data\Collection\ModelFactory', [], [], '', false);
         $objectManager = new ObjectManager($this);
         $this->_model = $objectManager->getObject(
             'Magento\Backend\Model\Auth',

dev/tests/unit/testsuite/Magento/Eav/Model/Entity/Collection/AbstractCollectionTest.php

@@ -59,7 +59,13 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->coreEntityFactoryMock = $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false);
+        $this->coreEntityFactoryMock = $this->getMock(
+            'Magento\Framework\Data\Collection\EntityFactory',
+            [],
+            [],
+            '',
+            false
+        );
         $this->loggerMock = $this->getMock('Psr\Log\LoggerInterface');
         $this->fetchStrategyMock = $this->getMock(
             'Magento\Framework\Data\Collection\Db\FetchStrategyInterface',

lib/internal/Magento/Framework/Data/Collection/Factory.php renamed to lib/internal/Magento/Framework/Data/Collection/ModelFactory.php

@@ -8,7 +8,7 @@
 /**
  * Model object factory
  */
-class Factory
+class ModelFactory
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface