MAGETWO-33118: Refactor code that uses customer builders in api-functional tests

Author: Manasa Potluri

Diff for: dev/tests/api-functional/framework/Magento/TestFramework/Helper/Customer.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\TestFramework\Helper;
 
-use Magento\Customer\Api\Data\AddressDataBuilder;
-use Magento\Customer\Api\Data\CustomerDataBuilder;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\Data\Customer as CustomerData;
 use Magento\Framework\Reflection\DataObjectProcessor;
@@ -43,11 +41,18 @@ class Customer extends WebapiAbstract
     const ADDRESS_REGION_CODE1 = 'AL';
     const ADDRESS_REGION_CODE2 = 'AL';
 
-    /** @var AddressDataBuilder */
-    private $addressBuilder;
-
-    /** @var CustomerDataBuilder */
-    private $customerBuilder;
+    /**
+     * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
+     */
+    private $customerAddressFactory;
+    /**
+     * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
+     */
+    private $customerDataFactory;
+    /**
+     * @var \Magento\Framework\Api\DataObjectHelper
+     */
+    private $dataObjectHelper;
 
     /** @var DataObjectProcessor */
     private $dataObjectProcessor;
@@ -56,12 +61,16 @@ public function __construct($name = null, array $data = [], $dataName = '')
     {
         parent::__construct($name, $data, $dataName);
 
-        $this->addressBuilder = Bootstrap::getObjectManager()->create(
-            'Magento\Customer\Api\Data\AddressDataBuilder'
+        $this->customerAddressFactory = Bootstrap::getObjectManager()->create(
+            'Magento\Customer\Api\Data\AddressInterfaceFactory'
+        );
+
+        $this->customerDataFactory = Bootstrap::getObjectManager()->create(
+            'Magento\Customer\Api\Data\CustomerInterfaceFactory'
         );
 
-        $this->customerBuilder = Bootstrap::getObjectManager()->create(
-            'Magento\Customer\Api\Data\CustomerDataBuilder'
+        $this->dataObjectHelper = Bootstrap::getObjectManager()->create(
+            'Magento\Framework\Api\DataObjectHelper'
         );
 
         $this->dataObjectProcessor = Bootstrap::getObjectManager()->create(
@@ -98,47 +107,47 @@ public function createSampleCustomer()
      */
     public function createSampleCustomerDataObject()
     {
-        $this->addressBuilder
-            ->setCountryId('US')
-            ->setDefaultBilling(true)
-            ->setDefaultShipping(true)
-            ->setPostcode('75477')
-            ->setRegion(
-                Bootstrap::getObjectManager()->create('Magento\Customer\Api\Data\RegionDataBuilder')
-                    ->setRegionCode(self::ADDRESS_REGION_CODE1)
-                    ->setRegion('Alabama')
-                    ->setRegionId(1)
-                    ->create()
-            )
-            ->setStreet(['Green str, 67'])
-            ->setTelephone('3468676')
-            ->setCity(self::ADDRESS_CITY1)
-            ->setFirstname('John')
-            ->setLastname('Smith');
+        $customerAddress1 = $this->customerAddressFactory->create();
+        $customerAddress1->setCountryId('US');
+        $customerAddress1->setIsDefaultBilling(true);
+        $customerAddress1->setIsDefaultShipping(true);
+        $customerAddress1->setPostcode('75477');
+        $customerAddress1->setRegion(
+            Bootstrap::getObjectManager()->create('Magento\Customer\Api\Data\RegionInterfaceFactory')
+                ->create()
+                ->setRegionCode(self::ADDRESS_REGION_CODE1)
+                ->setRegion('Alabama')
+                ->setRegionId(1)
+        );
+        $customerAddress1->setStreet(['Green str, 67']);
+        $customerAddress1->setTelephone('3468676');
+        $customerAddress1->setCity(self::ADDRESS_CITY1);
+        $customerAddress1->setFirstname('John');
+        $customerAddress1->setLastname('Smith');
         $address1 = $this->dataObjectProcessor->buildOutputDataArray(
-            $this->addressBuilder->create(),
+            $customerAddress1,
             'Magento\Customer\Api\Data\AddressInterface'
         );
 
-        $this->addressBuilder
-            ->setCountryId('US')
-            ->setDefaultBilling(false)
-            ->setDefaultShipping(false)
-            ->setPostcode('47676')
-            ->setRegion(
-                Bootstrap::getObjectManager()->create('Magento\Customer\Api\Data\RegionDataBuilder')
-                    ->setRegionCode(self::ADDRESS_REGION_CODE2)
-                    ->setRegion('Alabama')
-                    ->setRegionId(1)
-                    ->create()
-            )
-            ->setStreet(['Black str, 48', 'Building D'])
-            ->setCity(self::ADDRESS_CITY2)
-            ->setTelephone('3234676')
-            ->setFirstname('John')
-            ->setLastname('Smith');
+        $customerAddress2 = $this->customerAddressFactory->create();
+        $customerAddress2->setCountryId('US');
+        $customerAddress2->setIsDefaultBilling(false);
+        $customerAddress2->setIsDefaultShipping(false);
+        $customerAddress2->setPostcode('47676');
+        $customerAddress2->setRegion(
+            Bootstrap::getObjectManager()->create('Magento\Customer\Api\Data\RegionInterfaceFactory')
+                ->create()
+                ->setRegionCode(self::ADDRESS_REGION_CODE2)
+                ->setRegion('Alabama')
+                ->setRegionId(1)
+        );
+        $customerAddress2->setStreet(['Black str, 48', 'Building D']);
+        $customerAddress2->setTelephone('3234676');
+        $customerAddress2->setCity(self::ADDRESS_CITY2);
+        $customerAddress2->setFirstname('John');
+        $customerAddress2->setLastname('Smith');
         $address2 = $this->dataObjectProcessor->buildOutputDataArray(
-            $this->addressBuilder->create(),
+            $customerAddress2,
             'Magento\Customer\Api\Data\AddressInterface'
         );
 
@@ -166,6 +175,8 @@ public function createSampleCustomerDataObject()
                 ],
             ],
         ];
-        return $this->customerBuilder->populateWithArray($customerData)->create();
+        $customer = $this->customerDataFactory->create();
+        $this->dataObjectHelper->populateWithArray($customer, $customerData);
+        return $customer;
     }
 }

Diff for: dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php

@@ -37,16 +37,6 @@ class AccountManagementTest extends WebapiAbstract
      */
     private $accountManagement;
 
-    /**
-     * @var \Magento\Customer\Api\Data\AddressDataBuilder
-     */
-    private $addressBuilder;
-
-    /**
-     * @var \Magento\Customer\Api\Data\CustomerDataBuilder
-     */
-    private $customerBuilder;
-
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
      */
@@ -85,12 +75,6 @@ public function setUp()
         $this->accountManagement = Bootstrap::getObjectManager()->get(
             'Magento\Customer\Api\AccountManagementInterface'
         );
-        $this->addressBuilder = Bootstrap::getObjectManager()->create(
-            'Magento\Customer\Api\Data\AddressDataBuilder'
-        );
-        $this->customerBuilder = Bootstrap::getObjectManager()->create(
-            'Magento\Customer\Api\Data\CustomerDataBuilder'
-        );
         $this->searchCriteriaBuilder = Bootstrap::getObjectManager()->create(
             'Magento\Framework\Api\SearchCriteriaBuilder'
         );
@@ -530,9 +514,8 @@ public function testResendConfirmationBadEmailOrWebsite()
     public function testValidateCustomerData()
     {
         $customerData = $this->customerHelper->createSampleCustomerDataObject();
-        $customerData = $this->customerBuilder->populate($customerData)
-            ->setFirstname(null)->setLastname(null)->create();
-
+        $customerData->setFirstname(null);
+        $customerData->setLastname(null);
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/validate',
@@ -636,21 +619,9 @@ public function testCustomAttributes()
         $customerCustomAttributeValue = 'value3';
 
         $addresses = $customerData->getAddresses();
-        $address1 = $this->addressBuilder
-            ->populate($addresses[0])
-            ->setCustomAttribute($fixtureAddressAttributeCode, $address1CustomAttributeValue)
-            ->create();
-        $address2 = $this->addressBuilder
-            ->populate($addresses[1])
-            ->setCustomAttribute($fixtureAddressAttributeCode, $address2CustomAttributeValue)
-            ->create();
-
-        $customer = $this->customerBuilder
-            ->populate($customerData)
-            ->setAddresses([$address1, $address2])
-            ->setCustomAttribute($fixtureCustomerAttributeCode, $customerCustomAttributeValue)
-            ->create();
-
+        $addresses[0]->setCustomAttribute($fixtureAddressAttributeCode, $address1CustomAttributeValue);
+        $addresses[1]->setCustomAttribute($fixtureAddressAttributeCode, $address2CustomAttributeValue);
+        $customerData->setCustomAttribute($fixtureCustomerAttributeCode, $customerCustomAttributeValue);
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH,
@@ -664,7 +635,7 @@ public function testCustomAttributes()
         ];
 
         $customerDataArray = $this->dataObjectProcessor->buildOutputDataArray(
-            $customer,
+            $customerData,
             '\Magento\Customer\Api\Data\CustomerInterface'
         );
         $requestData = ['customer' => $customerDataArray, 'password' => CustomerHelper::PASSWORD];

Diff for: dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php

@@ -37,14 +37,14 @@ class CustomerRepositoryTest extends WebapiAbstract
     private $customerRepository;
 
     /**
-     * @var \Magento\Customer\Api\Data\AddressDataBuilder
+     * @var \Magento\Framework\Api\DataObjectHelper
      */
-    private $addressBuilder;
+    private $dataObjectHelper;
 
     /**
-     * @var \Magento\Customer\Api\Data\CustomerDataBuilder
+     * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
      */
-    private $customerBuilder;
+    private $customerDataFactory;
 
     /**
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
@@ -94,11 +94,11 @@ public function setUp()
             'Magento\Customer\Api\CustomerRepositoryInterface',
             ['customerRegistry' => $this->customerRegistry]
         );
-        $this->addressBuilder = Bootstrap::getObjectManager()->create(
-            'Magento\Customer\Api\Data\AddressDataBuilder'
+        $this->dataObjectHelper = Bootstrap::getObjectManager()->create(
+            'Magento\Framework\Api\DataObjectHelper'
         );
-        $this->customerBuilder = Bootstrap::getObjectManager()->create(
-            'Magento\Customer\Api\Data\CustomerDataBuilder'
+        $this->customerDataFactory = Bootstrap::getObjectManager()->create(
+            'Magento\Customer\Api\Data\CustomerInterfaceFactory'
         );
         $this->searchCriteriaBuilder = Bootstrap::getObjectManager()->create(
             'Magento\Framework\Api\SearchCriteriaBuilder'
@@ -213,7 +213,8 @@ public function testUpdateCustomer()
         $existingCustomerDataObject = $this->_getCustomerData($customerData[Customer::ID]);
         $lastName = $existingCustomerDataObject->getLastname();
         $customerData[Customer::LASTNAME] = $lastName . 'Updated';
-        $newCustomerDataObject = $this->customerBuilder->populateWithArray($customerData)->create();
+        $newCustomerDataObject = $this->customerDataFactory->create();
+        $this->dataObjectHelper->populateWithArray($newCustomerDataObject, $customerData);
 
         $serviceInfo = [
             'rest' => [
@@ -248,7 +249,8 @@ public function testUpdateCustomerNoWebsiteId()
         $existingCustomerDataObject = $this->_getCustomerData($customerData[Customer::ID]);
         $lastName = $existingCustomerDataObject->getLastname();
         $customerData[Customer::LASTNAME] = $lastName . 'Updated';
-        $newCustomerDataObject = $this->customerBuilder->populateWithArray($customerData)->create();
+        $newCustomerDataObject = $this->customerDataFactory->create();
+        $this->dataObjectHelper->populateWithArray($newCustomerDataObject, $customerData);
 
         $serviceInfo = [
             'rest' => [
@@ -294,8 +296,8 @@ public function testUpdateCustomerException()
         //Set non-existent id = -1
         $customerData[Customer::LASTNAME] = $lastName . 'Updated';
         $customerData[Customer::ID] = -1;
-
-        $newCustomerDataObject = $this->customerBuilder->populateWithArray($customerData)->create();
+        $newCustomerDataObject = $this->customerDataFactory->create();
+        $this->dataObjectHelper->populateWithArray($newCustomerDataObject, $customerData);
 
         $serviceInfo = [
             'rest' => [