MAGETWO-33120: Refactor code that uses customer builders in integration tests

    - Fixed build errors and renamed method name

Author: Yu Tang

dev/tests/integration/testsuite/Magento/Customer/Api/AddressRepositoryTest.php

@@ -55,7 +55,8 @@ protected function setUp()
             ->setCity('CityM')
             ->setFirstname('John')
             ->setLastname('Smith')
-            ->setCompany('CompanyName');
+            ->setCompany('CompanyName')
+            ->setCustomAttributes([]);
 
         /* XXX: would it be better to have a clear method for this? */
         $address2 = $this->_addressFactory->create()
@@ -68,7 +69,8 @@ protected function setUp()
             ->setCity('CityX')
             ->setTelephone('3234676')
             ->setFirstname('John')
-            ->setLastname('Smith');
+            ->setLastname('Smith')
+            ->setCustomAttributes([]);
 
         $this->_expectedAddresses = [$address, $address2];
     }
@@ -111,7 +113,7 @@ public function testSaveAddressChanges()
      */
     public function testSaveAddressesIdSetButNotAlreadyExisting()
     {
-        $proposedAddress = $this->_createSecondAddressBuilder()->setId(4200);
+        $proposedAddress = $this->_createSecondAddress()->setId(4200);
         $this->repository->save($proposedAddress);
     }
 
@@ -145,7 +147,7 @@ public function testGetAddressByIdBadAddressId()
      */
     public function testSaveNewAddress()
     {
-        $proposedAddress = $this->_createSecondAddressBuilder()->setCustomerId(1);
+        $proposedAddress = $this->_createSecondAddress()->setCustomerId(1);
 
         $returnedAddress = $this->repository->save($proposedAddress);
         $this->assertNotNull($returnedAddress->getId());
@@ -209,7 +211,7 @@ public function testSaveNewInvalidAddress()
 
     public function testSaveAddressesCustomerIdNotExist()
     {
-        $proposedAddress = $this->_createSecondAddressBuilder()->setCustomerId(4200);
+        $proposedAddress = $this->_createSecondAddress()->setCustomerId(4200);
         try {
             $this->repository->save($proposedAddress);
             $this->fail('Expected exception not thrown');
@@ -220,7 +222,7 @@ public function testSaveAddressesCustomerIdNotExist()
 
     public function testSaveAddressesCustomerIdInvalid()
     {
-        $proposedAddress = $this->_createSecondAddressBuilder()->setCustomerId('this_is_not_a_valid_id');
+        $proposedAddress = $this->_createSecondAddress()->setCustomerId('this_is_not_a_valid_id');
         try {
             $this->repository->save($proposedAddress);
             $this->fail('Expected exception not thrown');
@@ -403,7 +405,7 @@ private function _createFirstAddress()
      *
      * @return \Magento\Customer\Api\Data\AddressInterface
      */
-    private function _createSecondAddressBuilder()
+    private function _createSecondAddress()
     {
         $address = $this->_addressFactory->create();
         $this->dataObjectHelper->mergeDataObjects(

dev/tests/integration/testsuite/Magento/Customer/Model/Resource/AddressRepositoryTest.php

@@ -56,7 +56,8 @@ protected function setUp()
             ->setCity('CityM')
             ->setFirstname('John')
             ->setLastname('Smith')
-            ->setCompany('CompanyName');
+            ->setCompany('CompanyName')
+            ->setCustomAttributes([]);
         $address2 = $this->_addressFactory->create()
             ->setId('2')
             ->setCountryId('US')
@@ -67,7 +68,8 @@ protected function setUp()
             ->setCity('CityX')
             ->setTelephone('3234676')
             ->setFirstname('John')
-            ->setLastname('Smith');
+            ->setLastname('Smith')
+            ->setCustomAttributes([]);
 
         $this->_expectedAddresses = [$address, $address2];
     }
@@ -111,7 +113,7 @@ public function testSaveAddressChanges()
      */
     public function testSaveAddressesIdSetButNotAlreadyExisting()
     {
-        $proposedAddress = $this->_createSecondAddressBuilder()->setId(4200);
+        $proposedAddress = $this->_createSecondAddress()->setId(4200);
         $this->repository->save($proposedAddress);
     }
 
@@ -145,7 +147,7 @@ public function testGetAddressByIdBadAddressId()
      */
     public function testSaveNewAddress()
     {
-        $proposedAddress = $this->_createSecondAddressBuilder()->setCustomerId(1);
+        $proposedAddress = $this->_createSecondAddress()->setCustomerId(1);
 
         $returnedAddress = $this->repository->save($proposedAddress);
         $this->assertNotNull($returnedAddress->getId());
@@ -209,7 +211,7 @@ public function testSaveNewInvalidAddress()
 
     public function testSaveAddressesCustomerIdNotExist()
     {
-        $proposedAddress = $this->_createSecondAddressBuilder()->setCustomerId(4200);
+        $proposedAddress = $this->_createSecondAddress()->setCustomerId(4200);
         try {
             $this->repository->save($proposedAddress);
             $this->fail('Expected exception not thrown');
@@ -220,7 +222,7 @@ public function testSaveAddressesCustomerIdNotExist()
 
     public function testSaveAddressesCustomerIdInvalid()
     {
-        $proposedAddress = $this->_createSecondAddressBuilder()->setCustomerId('this_is_not_a_valid_id');
+        $proposedAddress = $this->_createSecondAddress()->setCustomerId('this_is_not_a_valid_id');
         try {
             $this->repository->save($proposedAddress);
             $this->fail('Expected exception not thrown');
@@ -403,7 +405,7 @@ private function _createFirstAddress()
      *
      * @return \Magento\Customer\Api\Data\AddressInterface
      */
-    private function _createSecondAddressBuilder()
+    private function _createSecondAddress()
     {
         $address = $this->_addressFactory->create();
         $this->dataObjectHelper->mergeDataObjects(