MAGETWO-44741: Bugfixes PR preparation and processing

Dmytro Voskoboinikov · Dmytro Voskoboinikov · commit e952481b1ad4 · 2015-10-30T18:32:28.000+02:00
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ResourceModel/Billing/AgreementTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ResourceModel/Billing/AgreementTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Paypal\Test\Unit\Model\ResourceModel;
+namespace Magento\Paypal\Test\Unit\Model\ResourceModel\Billing;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
@@ -96,7 +96,7 @@ public function testAddOrdersFilter()
             ->withConsecutive(
                 ['pbao.agreement_id IN(?)', [100]],
                 ['main_table.entity_id IN (?)', [500]]
-                )
+            )
             ->willReturnSelf();
         $this->connectionMock->expects($this->once())
             ->method('fetchCol')
diff --git a/app/code/Magento/Sales/Test/Unit/Model/InvoiceRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/InvoiceRepositoryTest.php
@@ -51,23 +51,18 @@ public function testGet()
         $entity = $this->getMockBuilder('Magento\Sales\Model\Order\Invoice')
             ->disableOriginalConstructor()
             ->getMock();
+        $entity->expects($this->once())
+            ->method('load')
+            ->with($id)
+            ->willReturn($entity);
         $entity->expects($this->once())
             ->method('getEntityId')
             ->willReturn($id);
+
         $this->invoiceMetadata->expects($this->once())
             ->method('getNewInstance')
             ->willReturn($entity);
 
-        $mapper = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Invoice')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $mapper->expects($this->once())
-            ->method('load')
-            ->with($entity, $id);
-
-        $this->invoiceMetadata->expects($this->any())
-            ->method('getMapper')
-            ->willReturn($mapper);
         $this->assertEquals($entity, $this->invoice->get($id));
     }
 
@@ -91,23 +86,18 @@ public function testGetEntityNoId()
         $entity = $this->getMockBuilder('Magento\Sales\Model\Order\Invoice')
             ->disableOriginalConstructor()
             ->getMock();
+        $entity->expects($this->once())
+            ->method('load')
+            ->with($id)
+            ->willReturn($entity);
         $entity->expects($this->once())
             ->method('getEntityId')
             ->willReturn(null);
+
         $this->invoiceMetadata->expects($this->once())
             ->method('getNewInstance')
             ->willReturn($entity);
 
-        $mapper = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Invoice')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $mapper->expects($this->once())
-            ->method('load')
-            ->with($entity, $id);
-
-        $this->invoiceMetadata->expects($this->any())
-            ->method('getMapper')
-            ->willReturn($mapper);
         $this->assertNull($entity, $this->invoice->get($id));
     }
 
@@ -199,24 +189,21 @@ public function testDeleteById()
         $entity = $this->getMockBuilder('Magento\Sales\Model\Order\Invoice')
             ->disableOriginalConstructor()
             ->getMock();
+        $entity->expects($this->once())
+            ->method('load')
+            ->with($id)
+            ->willReturn($entity);
         $entity->expects($this->any())
             ->method('getEntityId')
             ->willReturn($id);
+
         $this->invoiceMetadata->expects($this->once())
             ->method('getNewInstance')
             ->willReturn($entity);
 
         $mapper = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Invoice')
             ->disableOriginalConstructor()
             ->getMock();
-        $mapper->expects($this->once())
-            ->method('load')
-            ->with($entity, $id);
-
-        $this->invoiceMetadata->expects($this->any())
-            ->method('getMapper')
-            ->willReturn($mapper);
-
         $mapper->expects($this->once())
             ->method('delete')
             ->with($entity);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/AddressRepositoryTest.php
@@ -76,35 +76,22 @@ public function testGet($id, $entityId)
         } else {
             $address = $this->getMock(
                 'Magento\Sales\Model\Order\Address',
-                ['getEntityId'],
+                ['load', 'getEntityId'],
                 [],
                 '',
                 false
             );
+            $address->expects($this->once())
+                ->method('load')
+                ->with($id)
+                ->willReturn($address);
             $address->expects($this->once())
                 ->method('getEntityId')
                 ->willReturn($entityId);
 
-            $mapper = $this->getMockForAbstractClass(
-                'Magento\Framework\Model\ResourceModel\Db\AbstractDb',
-                [],
-                '',
-                false,
-                true,
-                true,
-                ['load']
-            );
-            $mapper->expects($this->once())
-                ->method('load')
-                ->with($address, $id)
-                ->willReturnSelf();
-
             $this->metadata->expects($this->once())
                 ->method('getNewInstance')
                 ->willReturn($address);
-            $this->metadata->expects($this->once())
-                ->method('getMapper')
-                ->willReturn($mapper);
 
             if (!$entityId) {
                 $this->setExpectedException(
@@ -115,14 +102,19 @@ public function testGet($id, $entityId)
             } else {
                 $this->assertEquals($address, $this->subject->get($id));
 
-                $mapper->expects($this->never())
-                    ->method('load');
+                $address->expects($this->never())
+                    ->method('load')
+                    ->with($id)
+                    ->willReturn($address);
+                $address->expects($this->never())
+                    ->method('getEntityId')
+                    ->willReturn($entityId);
 
                 $this->metadata->expects($this->never())
-                    ->method('getNewInstance');
-                $this->metadata->expects($this->never())
-                    ->method('getMapper');
+                    ->method('getNewInstance')
+                    ->willReturn($address);
 
+                // Retrieve Address from registry.
                 $this->assertEquals($address, $this->subject->get($id));
             }
         }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoRepositoryTest.php
@@ -55,23 +55,18 @@ public function testGet()
         $entity = $this->getMockBuilder('Magento\Sales\Model\Order\Creditmemo')
             ->disableOriginalConstructor()
             ->getMock();
+        $entity->expects($this->once())
+            ->method('load')
+            ->with($id)
+            ->willReturn($entity);
         $entity->expects($this->once())
             ->method('getEntityId')
             ->willReturn($id);
+
         $this->metadataMock->expects($this->once())
             ->method('getNewInstance')
             ->willReturn($entity);
 
-        $mapper = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Creditmemo')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $mapper->expects($this->once())
-            ->method('load')
-            ->with($entity, $id);
-
-        $this->metadataMock->expects($this->any())
-            ->method('getMapper')
-            ->willReturn($mapper);
         $this->assertEquals($entity, $this->creditmemo->get($id));
         //retrieve entity from registry
         $this->assertEquals($entity, $this->creditmemo->get($id));
@@ -96,23 +91,18 @@ public function testGetEntityNoId()
         $entity = $this->getMockBuilder('Magento\Sales\Model\Order\Creditmemo')
             ->disableOriginalConstructor()
             ->getMock();
+        $entity->expects($this->once())
+            ->method('load')
+            ->with($id)
+            ->willReturn($entity);
         $entity->expects($this->once())
             ->method('getEntityId')
             ->willReturn(null);
+
         $this->metadataMock->expects($this->once())
             ->method('getNewInstance')
             ->willReturn($entity);
 
-        $mapper = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Creditmemo')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $mapper->expects($this->once())
-            ->method('load')
-            ->with($entity, $id);
-
-        $this->metadataMock->expects($this->any())
-            ->method('getMapper')
-            ->willReturn($mapper);
         $this->assertNull($entity, $this->creditmemo->get($id));
     }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemRepositoryTest.php
@@ -105,24 +105,17 @@ public function testGetEmptyEntity()
         $orderItemMock = $this->getMockBuilder('Magento\Sales\Model\Order\Item')
             ->disableOriginalConstructor()
             ->getMock();
+        $orderItemMock->expects($this->once())
+            ->method('load')
+            ->with($orderItemId)
+            ->willReturn($orderItemMock);
         $orderItemMock->expects($this->once())
             ->method('getItemId')
             ->willReturn(null);
 
-        $orderItemResourceMock = $this->getMockBuilder('Magento\Framework\Model\ResourceModel\Db\AbstractDb')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orderItemResourceMock->expects($this->once())
-            ->method('load')
-            ->with($orderItemMock, $orderItemId)
-            ->willReturnSelf();
-
         $this->metadata->expects($this->once())
             ->method('getNewInstance')
             ->willReturn($orderItemMock);
-        $this->metadata->expects($this->once())
-            ->method('getMapper')
-            ->willReturn($orderItemResourceMock);
 
         $model = new ItemRepository(
             $this->objectFactory,
@@ -146,24 +139,17 @@ public function testGet()
         $productOption = $this->getProductOptionMock();
         $orderItemMock = $this->getOrderMock($productType, $productOption);
 
+        $orderItemMock->expects($this->once())
+            ->method('load')
+            ->with($orderItemId)
+            ->willReturn($orderItemMock);
         $orderItemMock->expects($this->once())
             ->method('getItemId')
             ->willReturn($orderItemId);
 
-        $orderItemResourceMock = $this->getMockBuilder('Magento\Framework\Model\ResourceModel\Db\AbstractDb')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orderItemResourceMock->expects($this->once())
-            ->method('load')
-            ->with($orderItemMock, $orderItemId)
-            ->willReturnSelf();
-
         $this->metadata->expects($this->once())
             ->method('getNewInstance')
             ->willReturn($orderItemMock);
-        $this->metadata->expects($this->once())
-            ->method('getMapper')
-            ->willReturn($orderItemResourceMock);
 
         $model = $this->getModel($orderItemMock, $productType);
         $this->assertSame($orderItemMock, $model->get($orderItemId));
@@ -245,6 +231,10 @@ public function testDeleteById()
         $orderItemMock = $this->getMockBuilder('Magento\Sales\Model\Order\Item')
             ->disableOriginalConstructor()
             ->getMock();
+        $orderItemMock->expects($this->once())
+            ->method('load')
+            ->with($orderItemId)
+            ->willReturn($orderItemMock);
         $orderItemMock->expects($this->once())
             ->method('getItemId')
             ->willReturn($orderItemId);
@@ -262,15 +252,11 @@ public function testDeleteById()
             ->method('delete')
             ->with($orderItemMock)
             ->willReturnSelf();
-        $orderItemResourceMock->expects($this->once())
-            ->method('load')
-            ->with($orderItemMock, $orderItemId)
-            ->willReturnSelf();
 
         $this->metadata->expects($this->once())
             ->method('getNewInstance')
             ->willReturn($orderItemMock);
-        $this->metadata->expects($this->exactly(2))
+        $this->metadata->expects($this->exactly(1))
             ->method('getMapper')
             ->willReturn($orderItemResourceMock);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/RepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/RepositoryTest.php
@@ -139,9 +139,8 @@ public function testGet()
     {
         $paymentId = 1;
         $payment = $this->mockPayment($paymentId);
+        $payment->expects($this->any())->method('load')->with($paymentId)->willReturn($payment);
         $this->metaData->expects($this->once())->method('getNewInstance')->willReturn($payment);
-        $this->metaData->expects($this->once())->method('getMapper')->willReturn($this->paymentResource);
-        $this->paymentResource->expects($this->once())->method('load')->with($payment, $paymentId);
         $this->assertSame($payment, $this->repository->get($paymentId));
     }
 
@@ -164,9 +163,8 @@ public function testGetNoSuchEntity()
     {
         $paymentId = 1;
         $payment = $this->mockPayment(null);
+        $payment->expects($this->any())->method('load')->with($paymentId)->willReturn($payment);
         $this->metaData->expects($this->once())->method('getNewInstance')->willReturn($payment);
-        $this->metaData->expects($this->once())->method('getMapper')->willReturn($this->paymentResource);
-        $this->paymentResource->expects($this->once())->method('load')->with($payment, $paymentId);
         $this->assertSame($payment, $this->repository->get($paymentId));
     }
 
@@ -187,6 +185,7 @@ protected function mockPayment($id = false)
             '',
             false
         );
+
         if ($id !== false) {
             $payment->expects($this->once())->method('getId')->willReturn($id);
         }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php
@@ -210,10 +210,9 @@ public function testGet()
     {
         $transactionId = 12;
         $transaction = $this->mockTransaction($transactionId);
+        $transaction->expects($this->any())->method('load')->with($transactionId)->willReturn($transaction);
         $this->entityStorage->method('has')->with($transactionId)->willReturn(false);
         $this->metaData->expects($this->once())->method('getNewInstance')->willReturn($transaction);
-        $this->metaData->expects($this->once())->method('getMapper')->willReturn($this->transactionResource);
-        $this->transactionResource->expects($this->once())->method('load')->with($transaction, $transactionId);
         $this->entityStorage->expects($this->once())->method('add')->with($transaction);
         $this->entityStorage->expects($this->once())->method('get')->with($transactionId)->willReturn($transaction);
         $this->assertSame($transaction, $this->repository->get($transactionId));
@@ -240,13 +239,9 @@ public function testGetNoSuchEntity()
         $transactionId = null;
         $transactionIdFromArgument = 12;
         $transaction = $this->mockTransaction($transactionId);
+        $transaction->expects($this->any())->method('load')->with(12)->willReturn($transaction);
         $this->entityStorage->method('has')->with($transactionIdFromArgument)->willReturn(false);
         $this->metaData->expects($this->once())->method('getNewInstance')->willReturn($transaction);
-        $this->metaData->expects($this->once())->method('getMapper')->willReturn($this->transactionResource);
-        $this->transactionResource->expects($this->once())->method('load')->with(
-            $transaction,
-            $transactionIdFromArgument
-        );
         $this->entityStorage->expects($this->never())->method('add');
         $this->entityStorage->expects($this->never())->method('get');
         $this->assertSame($transaction, $this->repository->get(12));
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentRepositoryTest.php

Original file line number	Diff line number	Diff line change
`@@ -139,9 +139,8 @@ public function testGet()`
`139`	`139`	`{`
`140`	`140`	`$paymentId = 1;`
`141`	`141`	`$payment = $this->mockPayment($paymentId);`
	`142`	`+ $payment->expects($this->any())->method('load')->with($paymentId)->willReturn($payment);`
`142`	`143`	`$this->metaData->expects($this->once())->method('getNewInstance')->willReturn($payment);`
`143`		`- $this->metaData->expects($this->once())->method('getMapper')->willReturn($this->paymentResource);`
`144`		`- $this->paymentResource->expects($this->once())->method('load')->with($payment, $paymentId);`
`145`	`144`	`$this->assertSame($payment, $this->repository->get($paymentId));`
`146`	`145`	`}`
`147`	`146`
`@@ -164,9 +163,8 @@ public function testGetNoSuchEntity()`
`164`	`163`	`{`
`165`	`164`	`$paymentId = 1;`
`166`	`165`	`$payment = $this->mockPayment(null);`
	`166`	`+ $payment->expects($this->any())->method('load')->with($paymentId)->willReturn($payment);`
`167`	`167`	`$this->metaData->expects($this->once())->method('getNewInstance')->willReturn($payment);`
`168`		`- $this->metaData->expects($this->once())->method('getMapper')->willReturn($this->paymentResource);`
`169`		`- $this->paymentResource->expects($this->once())->method('load')->with($payment, $paymentId);`
`170`	`168`	`$this->assertSame($payment, $this->repository->get($paymentId));`
`171`	`169`	`}`
`172`	`170`
`@@ -187,6 +185,7 @@ protected function mockPayment($id = false)`
`187`	`185`	`'',`
`188`	`186`	`false`
`189`	`187`	`);`
	`188`	`+`
`190`	`189`	`if ($id !== false) {`
`191`	`190`	`$payment->expects($this->once())->method('getId')->willReturn($id);`
`192`	`191`	`}`