MAGETWO-56206: API - inconsistency in the Magento response data types

- Moved unit test and test objects to correct location
- Cleaned up unused imports, methods, and parameters
- Added logic to test functionality added to DataObjectProcessor

Author: tjwiebell

app/code/Magento/Webapi/Test/Unit/Model/DataObjectProcessorTest.php renamed to lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php

@@ -3,26 +3,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-namespace Magento\Webapi\Test\Unit\Model;
+namespace Magento\Framework\Reflection\Test\Unit;
 
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Reflection\DataObjectProcessor;
-use Magento\Webapi\Model\Config as ModelConfig;
+use Magento\Framework\Reflection\ExtensionAttributesProcessor;
 
 class DataObjectProcessorTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var DataObjectProcessor
      */
-    protected $dataObjectProcessor;
+    private $dataObjectProcessor;
 
     /**
-     * @var ModelConfig
+     * @var ExtensionAttributesProcessor|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $config;
+    private $extensionAttributesProcessorMock;
 
-    protected function setup()
+    protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $methodsMapProcessor = $objectManager->getObject(
@@ -43,32 +42,68 @@ protected function setup()
             'serializer',
             $serializerMock
         );
+
+        $this->extensionAttributesProcessorMock = $this->getMockBuilder(ExtensionAttributesProcessor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->dataObjectProcessor = $objectManager->getObject(
             \Magento\Framework\Reflection\DataObjectProcessor::class,
             [
                 'methodsMapProcessor' => $methodsMapProcessor,
                 'typeCaster' => $objectManager->getObject(\Magento\Framework\Reflection\TypeCaster::class),
                 'fieldNamer' => $objectManager->getObject(\Magento\Framework\Reflection\FieldNamer::class),
+                'extensionAttributesProcessor' => $this->extensionAttributesProcessorMock
             ]
         );
-        parent::setUp();
     }
 
-    public function testDataObjectProcessor()
+    /**
+     * @param array $extensionAttributes
+     * @param array $expectedOutputDataArray
+     *
+     * @dataProvider buildOutputDataArrayDataProvider
+     */
+    public function testBuildOutputDataArray($extensionAttributes, $expectedOutputDataArray)
     {
         $objectManager =  new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        /** @var \Magento\Webapi\Test\Unit\Model\Files\TestDataObject $testDataObject */
-        $testDataObject = $objectManager->getObject(\Magento\Webapi\Test\Unit\Model\Files\TestDataObject::class);
+        /** @var \Magento\Framework\Reflection\Test\Unit\_files\TestDataObject $testDataObject */
+        $testDataObject = $objectManager->getObject(_files\TestDataObject::class, [
+            'extensionAttributes' => $this->getMockForAbstractClass(
+                \Magento\Framework\Api\ExtensionAttributesInterface::class
+            )
+        ]);
+
+        $this->extensionAttributesProcessorMock->expects($this->once())
+            ->method('buildOutputDataArray')
+            ->willReturn($extensionAttributes);
+
+        $outputData = $this->dataObjectProcessor
+            ->buildOutputDataArray($testDataObject, _files\TestDataInterface::class);
+        $this->assertEquals($expectedOutputDataArray, $outputData);
+    }
 
+    public function buildOutputDataArrayDataProvider()
+    {
         $expectedOutputDataArray = [
             'id' => '1',
             'address' => 'someAddress',
             'default_shipping' => 'true',
             'required_billing' => 'false',
         ];
+        $extensionAttributeArray = [
+            'attribute1' => 'value1',
+            'attribute2' => 'value2'
+        ];
 
-        $testDataObjectType = \Magento\Webapi\Test\Unit\Model\Files\TestDataInterface::class;
-        $outputData = $this->dataObjectProcessor->buildOutputDataArray($testDataObject, $testDataObjectType);
-        $this->assertEquals($expectedOutputDataArray, $outputData);
+        return [
+            'No Attributes' => [[], $expectedOutputDataArray],
+            'With Attributes' => [
+                $extensionAttributeArray,
+                array_merge($expectedOutputDataArray, [
+                    'extension_attributes' => $extensionAttributeArray
+                ])
+            ]
+        ];
     }
 }

app/code/Magento/Webapi/Test/Unit/Model/Files/TestDataInterface.php renamed to lib/internal/Magento/Framework/Reflection/Test/Unit/_files/TestDataInterface.php

@@ -3,8 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-namespace Magento\Webapi\Test\Unit\Model\Files;
+namespace Magento\Framework\Reflection\Test\Unit\_files;
 
 interface TestDataInterface
 {
@@ -27,4 +26,9 @@ public function isDefaultShipping();
      * @return string
      */
     public function isRequiredBilling();
+
+    /**
+     * @return \Magento\Framework\Api\ExtensionAttributesInterface|null
+     */
+    public function getExtensionAttributes();
 }

app/code/Magento/Webapi/Test/Unit/Model/Files/TestDataObject.php renamed to lib/internal/Magento/Framework/Reflection/Test/Unit/_files/TestDataObject.php

@@ -3,11 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-namespace Magento\Webapi\Test\Unit\Model\Files;
+namespace Magento\Framework\Reflection\Test\Unit\_files;
 
 class TestDataObject implements TestDataInterface
 {
+    private $extensionAttributes;
+
+    public function __construct($extensionAttributes = null)
+    {
+        $this->extensionAttributes = $extensionAttributes;
+    }
+
     public function getId()
     {
         return '1';
@@ -27,4 +33,9 @@ public function isRequiredBilling()
     {
         return 'false';
     }
+
+    public function getExtensionAttributes()
+    {
+        return $this->extensionAttributes;
+    }
 }