Skip to content

Commit b0ca9ca

Browse files
arkadiycharkadiych
committed
MAGETWO-35610: Merge and Fix Tests
- removed changes related to api-functional tests for gift messages, due to https://jira.corp.x.com/browse/MAGETWO-35644
1 parent 8c60a0e commit b0ca9ca

File tree

2 files changed

+14
-98
lines changed

2 files changed

+14
-98
lines changed

‎dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderCreateTest.php

Lines changed: 13 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace Magento\Sales\Service\V1;
77

8+
use Magento\Sales\Api\Data\OrderInterface;
89
use Magento\TestFramework\TestCase\WebapiAbstract;
910

1011
class OrderCreateTest extends WebapiAbstract
@@ -38,30 +39,11 @@ protected function prepareOrder()
3839
/** @var \Magento\Sales\Api\Data\OrderAddressFactory $orderAddressFactory */
3940
$orderAddressFactory = $this->objectManager->get('Magento\Sales\Model\Order\AddressFactory');
4041

41-
$orderExtensionAttributes = [
42-
'gift_message' => [
43-
'sender' => 'testSender',
44-
'recipient' => 'testRecipient',
45-
'message' => 'testMessage'
46-
]
47-
];
48-
$orderItemExtensionAttributes = [
49-
'gift_message' => [
50-
'sender' => 'testSenderForOrderItem',
51-
'recipient' => 'testRecipientForOrderItem',
52-
'message' => 'testMessageForOrderItem'
53-
]
54-
];
5542
$order = $orderFactory->create(
56-
['data' => $this->getDataStructure('Magento\Sales\Api\Data\OrderInterface', $orderExtensionAttributes)]
43+
['data' => $this->getDataStructure('Magento\Sales\Api\Data\OrderInterface')]
5744
);
5845
$orderItem = $orderItemFactory->create(
59-
[
60-
'data' => $this->getDataStructure(
61-
'Magento\Sales\Api\Data\OrderItemInterface',
62-
$orderItemExtensionAttributes
63-
)
64-
]
46+
['data' => $this->getDataStructure('Magento\Sales\Api\Data\OrderItemInterface')]
6547
);
6648
$orderPayment = $orderPaymentFactory->create(
6749
['data' => $this->getDataStructure('Magento\Sales\Api\Data\OrderPaymentInterface')]
@@ -116,19 +98,18 @@ protected function prepareOrder()
11698
return $orderData;
11799
}
118100

119-
protected function getDataStructure($className, array $extensionAttributes = null)
101+
protected function getDataStructure($className)
120102
{
121103
$refClass = new \ReflectionClass($className);
122104
$constants = $refClass->getConstants();
123105
$data = array_fill_keys($constants, null);
124106
unset($data['custom_attributes']);
125-
$data['extension_attributes'] = $extensionAttributes;
126107
return $data;
127108
}
128109

129110
public function testOrderCreate()
130111
{
131-
$expectedOrderArray = $this->prepareOrder();
112+
$order = $this->prepareOrder();
132113

133114
$serviceInfo = [
134115
'rest' => [
@@ -141,57 +122,13 @@ public function testOrderCreate()
141122
'operation' => self::SERVICE_READ_NAME . 'save',
142123
],
143124
];
144-
/** @var array $resultOrderArray */
145-
$resultOrderArray = $this->_webApiCall($serviceInfo, ['entity' => $expectedOrderArray]);
146-
$this->assertNotEmpty($resultOrderArray);
147-
$this->assertTrue((bool)$resultOrderArray['entity_id']);
148-
149-
/** @var \Magento\Sales\Api\Data\Order\Repository $repository */
150-
$repository = $this->objectManager->get('Magento\Sales\Api\Data\Order\Repository');
151-
/** @var \Magento\Sales\Api\Data\OrderInterface $actualOrder */
152-
$actualOrder = $repository->get($resultOrderArray['entity_id']);
153-
$this->assertInstanceOf('Magento\Sales\Api\Data\OrderInterface', $actualOrder);
154-
155-
$this->assertInstanceOf(
156-
'Magento\Sales\Api\Data\OrderExtensionInterface',
157-
$actualOrder->getExtensionAttributes()
158-
);
159-
$this->assertInstanceOf(
160-
'Magento\GiftMessage\Api\Data\MessageInterface',
161-
$actualOrder->getExtensionAttributes()->getGiftMessage()
162-
);
163-
164-
/** @var \Magento\GiftMessage\Api\Data\MessageInterface $orderGiftMessage */
165-
$orderGiftMessage = $actualOrder->getExtensionAttributes()->getGiftMessage();
166-
/** @var \Magento\Sales\Api\Data\OrderItemInterface $actualItemOrder */
167-
$actualOrderItem = $actualOrder->getItems();
168-
$this->assertTrue(is_array($actualOrderItem));
169-
$this->assertFalse(empty($actualOrderItem));
170-
$actualOrderItem = array_pop($actualOrderItem);
171-
172-
173-
$this->assertInstanceOf(
174-
'Magento\Sales\Api\Data\OrderItemExtensionInterface',
175-
$actualOrderItem->getExtensionAttributes()
176-
);
177-
$this->assertInstanceOf(
178-
'Magento\GiftMessage\Api\Data\MessageInterface',
179-
$actualOrderItem->getExtensionAttributes()->getGiftMessage()
180-
);
181-
/** @var \Magento\GiftMessage\Api\Data\MessageInterface $orderItemGiftMessage */
182-
$orderItemGiftMessage = $actualOrderItem->getExtensionAttributes()->getGiftMessage();
183-
184-
$this->assertEquals($expectedOrderArray['base_grand_total'], $actualOrder->getBaseGrandTotal());
185-
$this->assertEquals($expectedOrderArray['grand_total'], $actualOrder->getGrandTotal());
186-
187-
$expectedOrderGiftMessage = $expectedOrderArray['extension_attributes']['gift_message'];
188-
$this->assertEquals($expectedOrderGiftMessage['message'], $orderGiftMessage->getMessage());
189-
$this->assertEquals($expectedOrderGiftMessage['sender'], $orderGiftMessage->getSender());
190-
$this->assertEquals($expectedOrderGiftMessage['recipient'], $orderGiftMessage->getRecipient());
191-
192-
$expectedOrderItemGiftMessage = $expectedOrderArray['items'][0]['extension_attributes']['gift_message'];
193-
$this->assertEquals($expectedOrderItemGiftMessage['message'], $orderItemGiftMessage->getMessage());
194-
$this->assertEquals($expectedOrderItemGiftMessage['sender'], $orderItemGiftMessage->getSender());
195-
$this->assertEquals($expectedOrderItemGiftMessage['recipient'], $orderItemGiftMessage->getRecipient());
125+
$this->assertNotEmpty($this->_webApiCall($serviceInfo, ['entity' => $order]));
126+
127+
/** @var \Magento\Sales\Model\Order $model */
128+
$model = $this->objectManager->get('Magento\Sales\Model\Order');
129+
$model->load($order['customer_email'], 'customer_email');
130+
$this->assertTrue((bool)$model->getId());
131+
$this->assertEquals($order['base_grand_total'], $model->getBaseGrandTotal());
132+
$this->assertEquals($order['grand_total'], $model->getGrandTotal());
196133
}
197134
}

‎dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected function setUp()
2828
}
2929

3030
/**
31-
* @magentoApiDataFixture Magento/GiftMessage/_files/order_with_message.php
31+
* @magentoApiDataFixture Magento/Sales/_files/order.php
3232
*/
3333
public function testOrderGet()
3434
{
@@ -49,13 +49,6 @@ public function testOrderGet()
4949
'country_id',
5050
'firstname',
5151
];
52-
$expectedExtensionAttributes = [
53-
'gift_message' => [
54-
'sender' => 'Romeo',
55-
'recipient' => 'Mercutio',
56-
'message' => 'I thought all for the best.'
57-
]
58-
];
5952

6053
/** @var \Magento\Sales\Model\Order $order */
6154
$order = $this->objectManager->create('Magento\Sales\Model\Order');
@@ -92,19 +85,5 @@ public function testOrderGet()
9285
$this->assertArrayHasKey($field, $result['billing_address']);
9386
$this->assertArrayHasKey($field, $result['shipping_address']);
9487
}
95-
96-
$this->assertArrayHasKey('gift_message', $result['extension_attributes']);
97-
$expectedGiftMessage = $expectedExtensionAttributes['gift_message'];
98-
$actualGiftMessage = $result['extension_attributes']['gift_message'];
99-
$this->assertEquals($expectedGiftMessage['sender'], $actualGiftMessage['sender']);
100-
$this->assertEquals($expectedGiftMessage['recipient'], $actualGiftMessage['recipient']);
101-
$this->assertEquals($expectedGiftMessage['message'], $actualGiftMessage['message']);
102-
103-
$this->assertArrayHasKey('gift_message', $result['items'][0]['extension_attributes']);
104-
$expectedGiftMessage = $expectedExtensionAttributes['gift_message'];
105-
$actualGiftMessage = $result['items'][0]['extension_attributes']['gift_message'];
106-
$this->assertEquals($expectedGiftMessage['sender'], $actualGiftMessage['sender']);
107-
$this->assertEquals($expectedGiftMessage['recipient'], $actualGiftMessage['recipient']);
108-
$this->assertEquals($expectedGiftMessage['message'], $actualGiftMessage['message']);
10988
}
11089
}

0 commit comments

Comments
 (0)