From 830b8b108064cfbc61ddd8521972016a43c111dd Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Fri, 26 Jun 2015 10:08:32 -0500
Subject: [PATCH] MAGETWO-37948: Order does not store tax information
- Fix unit test failure
---
.../Test/Unit/Model/Plugin/OrderSaveTest.php | 21 +++++-----
.../Unit/Model/Quote/ToOrderConverterTest.php | 38 +++++++++----------
2 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
index accfc07301c..f50e79c9658 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -51,9 +51,7 @@ class OrderSaveTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->setMethods(['create'])
->getMock();
- $this->subjectMock = $this->getMockBuilder('\Magento\Sales\Api\Data\Order\Repository')
- ->disableOriginalConstructor()
- ->getMock();
+ $this->subjectMock = $this->getMockForAbstractClass('\Magento\Sales\Api\OrderRepositoryInterface');
$this->objectManagerHelper = new ObjectManager($this);
$this->model = $this->objectManagerHelper->getObject(
@@ -84,14 +82,15 @@ class OrderSaveTest extends \PHPUnit_Framework_TestCase
protected function setupExtensionAttributeMock()
{
- $orderExtensionAttributeMock = $this->getMockForAbstractClass(
- '\Magento\Sales\Api\Data\OrderExtensionInterface',
- [
- 'getAppliedTaxes',
- 'getConvertingFromQuote',
- 'getItemAppliedTaxes'
- ]
- );
+ $orderExtensionAttributeMock = $this->getMockBuilder('\Magento\Sales\Api\Data\OrderExtensionInterface')
+ ->disableOriginalConstructor()
+ ->setMethods(
+ [
+ 'getAppliedTaxes',
+ 'getConvertingFromQuote',
+ 'getItemAppliedTaxes',
+ ]
+ )->getMock();
return $orderExtensionAttributeMock;
}
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php b/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
index 7a091267bae..cc72250a496 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
@@ -60,6 +60,20 @@ class ToOrderConverterTest extends \PHPUnit_Framework_TestCase
);
}
+ protected function setupOrderExtensionAttributeMock()
+ {
+ $orderExtensionAttributeMock = $this->getMockBuilder('\Magento\Sales\Api\Data\OrderExtensionInterface')
+ ->setMethods(
+ [
+ 'setAppliedTaxes',
+ 'setConvertingFromQuote',
+ 'setItemAppliedTaxes'
+ ]
+ )->getMock();
+
+ return $orderExtensionAttributeMock;
+ }
+
/**
* @dataProvider afterConvertDataProvider
*/
@@ -74,20 +88,12 @@ class ToOrderConverterTest extends \PHPUnit_Framework_TestCase
->method('getItemsAppliedTaxes')
->willReturn($itemsAppliedTaxes);
- $orderExtensionAttributeMock = $this->getMockForAbstractClass(
- '\Magento\Sales\Api\Data\OrderExtensionInterface',
- [
- 'setAppliedTaxes',
- 'setConvertingFromQuote',
- 'setItemAppliedTaxes'
- ]
- );
-
-
$orderMock = $this->getMockBuilder('\Magento\Sales\Model\Order')
->disableOriginalConstructor()
->getMock();
+ $orderExtensionAttributeMock = $this->setupOrderExtensionAttributeMock();
+
$orderMock->expects($this->once())
->method('getExtensionAttributes')
->willReturn($orderExtensionAttributeMock);
@@ -122,16 +128,8 @@ class ToOrderConverterTest extends \PHPUnit_Framework_TestCase
->method('getItemsAppliedTaxes')
->willReturn($itemsAppliedTaxes);
- $orderExtensionAttributeMock = $this->getMockForAbstractClass(
- '\Magento\Sales\Api\Data\OrderExtensionInterface',
- [
- 'setAppliedTaxes',
- 'setConvertingFromQuote',
- 'setItemAppliedTaxes'
- ]
- );
-
-
+ $orderExtensionAttributeMock = $this->setupOrderExtensionAttributeMock();
+
$orderMock = $this->getMockBuilder('\Magento\Sales\Model\Order')
->disableOriginalConstructor()
->getMock();
--
GitLab