From 9e5757df2e1ebfc75e93c9d793473662ec0e761e Mon Sep 17 00:00:00 2001 From: Lorenzo Stramaccia Date: Sun, 10 Jun 2018 11:33:41 +0200 Subject: [PATCH 1/3] Fix Magento\Sales\Service\V1\ShipmentGetTest::testShipmentGet --- .../Magento/Sales/Service/V1/ShipmentGetTest.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php index aaa7a5a6d4436..2b7e76aee0751 100644 --- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php @@ -5,6 +5,8 @@ */ namespace Magento\Sales\Service\V1; +use Magento\Framework\Api\ExtensibleDataInterface; +use Magento\Framework\Api\SimpleDataObjectConverter; use Magento\TestFramework\TestCase\WebapiAbstract; /** @@ -57,7 +59,18 @@ public function testShipmentGet() unset($data['tracks']); foreach ($data as $key => $value) { if (!empty($value)) { - $this->assertEquals($shipment->getData($key), $value, $key); + if ($key === ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY) { + foreach ($value as $extensionAttributeKey => $extensionAttributeValue) { + $methodName = 'get' . + SimpleDataObjectConverter::snakeCaseToUpperCamelCase($extensionAttributeKey); + $this->assertEquals( + $shipment->getExtensionAttributes()->$methodName(), + $extensionAttributeValue + ); + } + } else { + $this->assertEquals($shipment->getData($key), $value, $key); + } } } $shipmentItem = $this->objectManager->get(\Magento\Sales\Model\Order\Shipment\Item::class); From 1555b967b865b6a31f21b68461a8516254627d6f Mon Sep 17 00:00:00 2001 From: Vishal Gelani Date: Mon, 11 Jun 2018 12:44:37 +0530 Subject: [PATCH 2/3] Fixed coding standard error --- .../testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php index 2b7e76aee0751..efcde4ab49e01 100644 --- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php @@ -60,12 +60,13 @@ public function testShipmentGet() foreach ($data as $key => $value) { if (!empty($value)) { if ($key === ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY) { - foreach ($value as $extensionAttributeKey => $extensionAttributeValue) { + foreach ($value as $key => $value) { + $simpleObject = $this->objectManager->get(Magento\Framework\Api\SimpleDataObjectConverter::class); $methodName = 'get' . - SimpleDataObjectConverter::snakeCaseToUpperCamelCase($extensionAttributeKey); + $simpleObject->snakeCaseToUpperCamelCase($key); $this->assertEquals( $shipment->getExtensionAttributes()->$methodName(), - $extensionAttributeValue + $value ); } } else { From 039e71c5ced19acad3ab4b287c75188d7b1f837e Mon Sep 17 00:00:00 2001 From: Lorenzo Stramaccia Date: Mon, 11 Jun 2018 11:00:41 +0200 Subject: [PATCH 3/3] Revert "Fixed coding standard error" This reverts commit 1555b967b865b6a31f21b68461a8516254627d6f. --- .../testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php index efcde4ab49e01..2b7e76aee0751 100644 --- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentGetTest.php @@ -60,13 +60,12 @@ public function testShipmentGet() foreach ($data as $key => $value) { if (!empty($value)) { if ($key === ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY) { - foreach ($value as $key => $value) { - $simpleObject = $this->objectManager->get(Magento\Framework\Api\SimpleDataObjectConverter::class); + foreach ($value as $extensionAttributeKey => $extensionAttributeValue) { $methodName = 'get' . - $simpleObject->snakeCaseToUpperCamelCase($key); + SimpleDataObjectConverter::snakeCaseToUpperCamelCase($extensionAttributeKey); $this->assertEquals( $shipment->getExtensionAttributes()->$methodName(), - $value + $extensionAttributeValue ); } } else {