MAGETWO-37935: Bugfix PR

arkadiych · arkadiych · commit 765823e61054 · 2015-05-26T19:58:58.000+03:00
- fixes for L1
diff --git a/app/code/Magento/Backend/Test/Unit/App/UserConfigTest.php b/app/code/Magento/Backend/Test/Unit/App/UserConfigTest.php
@@ -10,7 +10,7 @@ class UserConfigTest extends \PHPUnit_Framework_TestCase
 {
     public function testUserRequestCreation()
     {
-        $factoryMock = $this->getMock('Magento\Config\Model\Config\Factory', [], [], '', false);
+        $factoryMock = $this->getMock('Magento\Config\Model\Config\Factory', ['create'], [], '', false);
         $responseMock = $this->getMock('Magento\Framework\App\Console\Response', [], [], '', false);
         $configMock = $this->getMock('Magento\Config\Model\Config', [], [], '', false);
 
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php b/app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
@@ -177,7 +177,7 @@ protected function setUp()
         );
         $this->orderFactoryMock = $this->getMock(
             'Magento\Sales\Model\OrderFactory',
-            [],
+            ['create'],
             [],
             '',
             false
diff --git a/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php b/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php
@@ -94,6 +94,7 @@ public function setUp()
             ->getMock();
         $this->backupModelFactoryMock = $this->getMockBuilder('Magento\Backup\Model\BackupFactory')
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $this->backupModelMock = $this->getMockBuilder('Magento\Backup\Model\Backup')
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php
@@ -62,8 +62,8 @@ class PriceTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->ruleFactoryMock = $this->getMock(
-            '\Magento\CatalogRule\Model\Resource\RuleFactory',
-            [],
+            'Magento\CatalogRule\Model\Resource\RuleFactory',
+            ['create'],
             [],
             '',
             false
@@ -77,8 +77,20 @@ protected function setUp()
         $this->priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
         $this->groupManagement = $this->getMockBuilder('Magento\Customer\Api\GroupManagementInterface')
             ->getMockForAbstractClass();
-        $gpFactory = $this->getMock('Magento\Catalog\Api\Data\ProductGroupPriceInterfaceFactory', [], [], '', false);
-        $tpFactory = $this->getMock('Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory', [], [], '', false);
+        $gpFactory = $this->getMock(
+            'Magento\Catalog\Api\Data\ProductGroupPriceInterfaceFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+        $tpFactory = $this->getMock(
+            'Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
         $scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
 
         $objectManagerHelper = new ObjectManagerHelper($this);
diff --git a/app/code/Magento/Captcha/Test/Unit/Helper/DataTest.php b/app/code/Magento/Captcha/Test/Unit/Helper/DataTest.php
@@ -71,7 +71,7 @@ public function testGetCaptcha()
                 new \Magento\Captcha\Model\DefaultModel(
                     $this->getMock('Magento\Framework\Session\SessionManager', [], [], '', false),
                     $this->getMock('Magento\Captcha\Helper\Data', [], [], '', false),
-                    $this->getMock('Magento\Captcha\Model\Resource\LogFactory', [], [], '', false),
+                    $this->getMock('Magento\Captcha\Model\Resource\LogFactory', ['create'], [], '', false),
                     'user_create'
                 )
             )
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/CronTest.php b/app/code/Magento/Captcha/Test/Unit/Model/CronTest.php
@@ -69,7 +69,7 @@ public function setUp()
         );
 
         $this->_model = new \Magento\Captcha\Model\Cron(
-            $this->getMock('Magento\Captcha\Model\Resource\LogFactory', [], [], '', false),
+            $this->getMock('Magento\Captcha\Model\Resource\LogFactory', ['create'], [], '', false),
             $this->_helper,
             $this->_adminHelper,
             $this->_filesystem,
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/Edit/FormTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/Edit/FormTest.php
@@ -82,7 +82,7 @@ protected function setUp()
         );
         $this->categoryFactoryMock = $this->getMock(
             'Magento\Catalog\Model\CategoryFactory',
-            [],
+            ['create'],
             [],
             '',
             false
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/OptionsTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/OptionsTest.php
@@ -59,7 +59,7 @@ public function testGetOptionHtml()
 
         $optValFactoryMock = $this->getMock(
             'Magento\Catalog\Model\Product\Option\ValueFactory',
-            [],
+            ['create'],
             [],
             '',
             false
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php
@@ -69,7 +69,8 @@ class IndexTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->contextMock = $this->getMock('Magento\Framework\App\Action\Context',
+        $this->contextMock = $this->getMock(
+            'Magento\Framework\App\Action\Context',
             ['getRequest', 'getResponse', 'getResultRedirectFactory'],
             [],
             '',
@@ -90,10 +91,16 @@ protected function setUp()
             ->method('getResultRedirectFactory')
             ->willReturn($this->redirectFactoryMock);
 
-        $this->itemFactoryMock = $this->getMock('Magento\Catalog\Model\Product\Compare\ItemFactory', [], [], '', false);
+        $this->itemFactoryMock = $this->getMock(
+            'Magento\Catalog\Model\Product\Compare\ItemFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
         $this->collectionFactoryMock = $this->getMock(
             'Magento\Catalog\Model\Resource\Product\Compare\Item\CollectionFactory',
-            [],
+            ['create'],
             [],
             '',
             false
@@ -131,10 +138,12 @@ public function testExecute()
         $beforeUrl = 'test_url';
         $this->request->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
+            ->willReturnMap(
+                [
                     ['items', null, null],
                     ['uenc', null, $beforeUrl],
-                ]);
+                ]
+            );
         $this->decoderMock->expects($this->once())
             ->method('decode')
             ->with($beforeUrl)
@@ -152,10 +161,12 @@ public function testExecuteWithItems()
     {
         $this->request->expects($this->any())
             ->method('getParam')
-            ->willReturnMap([
+            ->willReturnMap(
+                [
                     ['items', null, '1,2,3'],
                     ['uenc', null, null],
-                ]);
+                ]
+            );
         $this->decoderMock->expects($this->never())->method('decode');
         $this->catalogSession->expects($this->never())->method('setBeforeCompareUrl');
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Helper/Product/Flat/IndexerTest.php b/app/code/Magento/Catalog/Test/Unit/Helper/Product/Flat/IndexerTest.php
@@ -65,13 +65,13 @@ public function setUp()
 
         $resourceConfigFactoryMock = $this->getMock(
             'Magento\Catalog\Model\Resource\ConfigFactory',
-            [],
+            ['create'],
             [],
             '',
             false
         );
 
-        $eavFactoryMock = $this->getMock('Magento\Eav\Model\Entity\AttributeFactory', [], [], '', false);
+        $eavFactoryMock = $this->getMock('Magento\Eav\Model\Entity\AttributeFactory', ['create'], [], '', false);
 
         $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Entity/AttributeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Entity/AttributeTest.php
@@ -141,6 +141,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->typeFactoryMock = $this->getMockBuilder('Magento\Eav\Model\Entity\TypeFactory')
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
@@ -153,6 +154,7 @@ protected function setUp()
             ->getMock();
         $this->attributeOptionFactoryMock =
             $this->getMockBuilder('Magento\Eav\Api\Data\AttributeOptionInterfaceFactory')
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->dataObjectProcessorMock = $this->getMockBuilder('Magento\Framework\Reflection\DataObjectProcessor')
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ObserverTest.php
@@ -66,17 +66,26 @@ public function setUp()
 
         $layerResolver = $this->_getCleanMock('Magento\Catalog\Model\Layer\Resolver');
         $layerResolver->expects($this->once())->method('get')->willReturn(null);
-        $this->_observer = (new ObjectManager($this))->getObject('Magento\Catalog\Model\Observer', [
-            'categoryResource' => $this->_getCleanMock('\Magento\Catalog\Model\Resource\Category'),
-            'catalogProduct' => $this->_getCleanMock('\Magento\Catalog\Model\Resource\Product'),
-            'storeManager' => $this->_storeManager,
-            'layerResolver' => $layerResolver,
-            'indexIndexer' => $this->_getCleanMock('\Magento\Index\Model\Indexer'),
-            'catalogCategory' => $this->_catalogCategory,
-            'catalogData' => $this->_getCleanMock('\Magento\Catalog\Helper\Data'),
-            'categoryFlatState' => $this->_categoryFlatState,
-            'productResourceFactory' => $this->_getCleanMock('\Magento\Catalog\Model\Resource\ProductFactory'),
-        ]);
+        $this->_observer = (new ObjectManager($this))->getObject(
+            'Magento\Catalog\Model\Observer',
+            [
+                'categoryResource' => $this->_getCleanMock('\Magento\Catalog\Model\Resource\Category'),
+                'catalogProduct' => $this->_getCleanMock('\Magento\Catalog\Model\Resource\Product'),
+                'storeManager' => $this->_storeManager,
+                'layerResolver' => $layerResolver,
+                'indexIndexer' => $this->_getCleanMock('\Magento\Index\Model\Indexer'),
+                'catalogCategory' => $this->_catalogCategory,
+                'catalogData' => $this->_getCleanMock('\Magento\Catalog\Helper\Data'),
+                'categoryFlatState' => $this->_categoryFlatState,
+                'productResourceFactory' => $this->getMock(
+                    'Magento\Catalog\Model\Resource\ProductFactory',
+                    ['create'],
+                    [],
+                    '',
+                    false
+                )
+            ]
+        );
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
@@ -24,7 +24,7 @@ protected function setUp()
         $this->_helper = $this->getMock('Magento\Catalog\Helper\Data', ['isPriceGlobal'], [], '', false);
         $this->_helper->expects($this->any())->method('isPriceGlobal')->will($this->returnValue(true));
 
-        $currencyFactoryMock = $this->getMock('Magento\Directory\Model\CurrencyFactory', [], [], '', false);
+        $currencyFactoryMock = $this->getMock('Magento\Directory\Model\CurrencyFactory', ['create'], [], '', false);
         $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
         $productTypeMock = $this->getMock('Magento\Catalog\Model\Product\Type', [], [], '', false);
         $configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
@@ -83,7 +83,7 @@ protected function setUp()
             ->willReturn(new \Magento\Framework\Object(['default_attribute_set_id' => 4]));
         $this->validatorFactoryMock = $this->getMock(
             'Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory',
-            [],
+            ['create'],
             [],
             '',
             false);
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php
@@ -38,7 +38,7 @@ protected function setUp()
         );
         $attrSetColFactory = $this->getMock(
             '\Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory',
-            [],
+            ['create'],
             [],
             '',
             false
@@ -52,7 +52,7 @@ protected function setUp()
         );
         $attrColFactory = $this->getMock(
             '\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory',
-            [],
+            ['create'],
             [],
             '',
             false
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php b/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
@@ -38,19 +38,18 @@ public function setUp()
      */
     public function testGetLastRealOrder($orderId, $incrementId, $orderMock)
     {
-        $orderFactory = $this->getMockBuilder(
-            'Magento\Sales\Model\OrderFactory'
-        )->disableOriginalConstructor()->setMethods(
-            ['create']
-        )->getMock();
+        $orderFactory = $this->getMockBuilder('Magento\Sales\Model\OrderFactory')
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
         $orderFactory->expects($this->once())->method('create')->will($this->returnValue($orderMock));
 
-        $messageCollectionFactory = $this->getMockBuilder(
-            'Magento\Framework\Message\CollectionFactory'
-        )->disableOriginalConstructor()->getMock();
-        $quoteRepository = $this->getMockBuilder(
-            'Magento\Quote\Model\QuoteRepository'
-        )->disableOriginalConstructor()->getMock();
+        $messageCollectionFactory = $this->getMockBuilder('Magento\Framework\Message\CollectionFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $quoteRepository = $this->getMockBuilder('Magento\Quote\Model\QuoteRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $appState = $this->getMock('\Magento\Framework\App\State', [], [], '', false);
         $appState->expects($this->any())->method('isInstalled')->will($this->returnValue(true));
@@ -323,7 +322,7 @@ public function testReplaceQuote()
         $quoteIdMaskMock->expects($this->once())->method('setQuoteId')->with($replaceQuoteId)->willReturnSelf();
         $quoteIdMaskMock->expects($this->once())->method('save');
 
-        $quoteIdMaskFactoryMock = $this->getMock('\Magento\Quote\Model\QuoteIdMaskFactory', [], [], '', false);
+        $quoteIdMaskFactoryMock = $this->getMock('\Magento\Quote\Model\QuoteIdMaskFactory', ['create'], [], '', false);
         $quoteIdMaskFactoryMock->expects($this->once())->method('create')->willReturn($quoteIdMaskMock);
 
         $session = $this->_helper->getObject(
diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/PreviewTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Template/PreviewTest.php
@@ -52,9 +52,15 @@ protected function setUp()
             '',
             false
         );
-        $templateFactory = $this->getMock('Magento\Newsletter\Model\TemplateFactory', [], [], '', false);
+        $templateFactory = $this->getMock('Magento\Newsletter\Model\TemplateFactory', ['create'], [], '', false);
         $templateFactory->expects($this->once())->method('create')->willReturn($this->template);
-        $this->subscriberFactory = $this->getMock('Magento\Newsletter\Model\SubscriberFactory', [], [], '', false);
+        $this->subscriberFactory = $this->getMock(
+            'Magento\Newsletter\Model\SubscriberFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->preview = $this->objectManagerHelper->getObject(
@@ -71,10 +77,12 @@ protected function setUp()
 
     public function testToHtml()
     {
-        $this->request->expects($this->any())->method('getParam')->willReturnMap([
-            ['id', null, 1],
-            ['store_id', null, 1]
-        ]);
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['id', null, 1],
+                ['store_id', null, 1]
+            ]
+        );
 
         $this->template->expects($this->atLeastOnce())->method('emulateDesign')->with(1);
         $this->template->expects($this->atLeastOnce())->method('revertDesign');
@@ -92,11 +100,13 @@ public function testToHtml()
 
     public function testToHtmlForNewTemplate()
     {
-        $this->request->expects($this->any())->method('getParam')->willReturnMap([
-            ['type', null, TemplateTypesInterface::TYPE_TEXT],
-            ['text', null, 'Processed Template'],
-            ['styles', null, '.class-name{color:red;}']
-        ]);
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['type', null, TemplateTypesInterface::TYPE_TEXT],
+                ['text', null, 'Processed Template'],
+                ['styles', null, '.class-name{color:red;}']
+            ]
+        );
 
         $this->template->expects($this->once())->method('setTemplateType')->with(TemplateTypesInterface::TYPE_TEXT)
             ->willReturnSelf();
@@ -135,11 +145,13 @@ public function testToHtmlForNewTemplate()
 
     public function testToHtmlWithSubscriber()
     {
-        $this->request->expects($this->any())->method('getParam')->willReturnMap([
-            ['id', null, 2],
-            ['store_id', null, 1],
-            ['subscriber', null, 3]
-        ]);
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['id', null, 2],
+                ['store_id', null, 1],
+                ['subscriber', null, 3]
+            ]
+        );
         $subscriber = $this->getMock('Magento\Newsletter\Model\Subscriber', [], [], '', false);
         $subscriber->expects($this->atLeastOnce())->method('load')->with(3)->willReturnSelf();
         $this->subscriberFactory->expects($this->atLeastOnce())->method('create')->willReturn($subscriber);

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class UserConfigTest extends \PHPUnit_Framework_TestCase`
`10`	`10`	`{`
`11`	`11`	`public function testUserRequestCreation()`
`12`	`12`	`{`
`13`		`- $factoryMock = $this->getMock('Magento\Config\Model\Config\Factory', [], [], '', false);`
	`13`	`+ $factoryMock = $this->getMock('Magento\Config\Model\Config\Factory', ['create'], [], '', false);`
`14`	`14`	`$responseMock = $this->getMock('Magento\Framework\App\Console\Response', [], [], '', false);`
`15`	`15`	`$configMock = $this->getMock('Magento\Config\Model\Config', [], [], '', false);`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function testGetCaptcha()`
`71`	`71`	`new \Magento\Captcha\Model\DefaultModel(`
`72`	`72`	`$this->getMock('Magento\Framework\Session\SessionManager', [], [], '', false),`
`73`	`73`	`$this->getMock('Magento\Captcha\Helper\Data', [], [], '', false),`
`74`		`- $this->getMock('Magento\Captcha\Model\Resource\LogFactory', [], [], '', false),`
	`74`	`+ $this->getMock('Magento\Captcha\Model\Resource\LogFactory', ['create'], [], '', false),`
`75`	`75`	`'user_create'`
`76`	`76`	`)`
`77`	`77`	`)`