MAGETWO-81532: Support for Registered customers

- added additional validations

Author: dthampy

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAuthenticationTest.php

@@ -6,7 +6,9 @@
 
 namespace Magento\GraphQl\Customer;
 
+use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -18,6 +20,7 @@ class CustomerAuthenticationTest extends GraphQlAbstract
      * Verify customers with valid credentials with a customer bearer token
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
 
@@ -28,12 +31,28 @@ public function testRegisteredCustomerWithValidCredentials()
 {
   customer 
   {
-    id
-    website_id
-    store_id
+    created_at
+    group_id
+    prefix
+    firstname
+    middlename
     lastname
+    suffix
+    email
     default_billing
-    default_shipping    
+    default_shipping
+    id
+      addresses{
+      id
+      customer_id
+      region_id
+      country_id
+      telephone
+      postcode
+      city      
+      firstname
+      lastname
+    }
    }
 }
 QUERY;
@@ -49,9 +68,16 @@ public function testRegisteredCustomerWithValidCredentials()
         /** @var CustomerRepositoryInterface $customerRepository */
         $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
         $customer = $customerRepository->get('[email protected]');
+
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('customer', $response);
+        $this->assertArrayHasKey('addresses', $response['customer']);
+        $this->assertTrue(
+            is_array([$response['customer']['addresses']]),
+            " Addresses field must be of an array type."
+        );
         $this->assertCustomerFields($customer, $response['customer']);
+       $this->assertCustomerAddressesFields($customer, $response);
     }
 
     /**
@@ -87,12 +113,17 @@ public function testCustomerWithValidCredentialsWithoutToken()
 {
   customer 
   {
-    id
-    website_id
-    store_id
+    created_at
+    group_id
+    prefix
+    firstname
+    middlename
     lastname
+    suffix
+    email
     default_billing
-    default_shipping    
+    default_shipping
+    id   
    }
 }
 QUERY;
@@ -115,16 +146,54 @@ public function assertCustomerFields($customer, $actualResponse)
          */
         $assertionMap = [
             ['response_field' => 'id', 'expected_value' => $customer->getId()],
-            ['response_field' => 'website_id', 'expected_value' => $customer->getWebsiteId()],
-            ['response_field' => 'store_id', 'expected_value' => $customer->getStoreId()],
+            ['response_field' => 'created_at', 'expected_value' => $customer->getCreatedAt()],
+            ['response_field' => 'group_id', 'expected_value' => $customer->getGroupId()],
+            ['response_field' => 'prefix', 'expected_value' => $customer->getPrefix()],
+            ['response_field' => 'firstname', 'expected_value' => $customer->getFirstname()],
+            ['response_field' => 'middlename', 'expected_value' => $customer->getMiddlename()],
             ['response_field' => 'lastname', 'expected_value' => $customer->getLastname()],
-            ['response_field' => 'default_shipping', 'expected_value' => $customer->getDefaultShipping()],
-            ['response_field' => 'default_billing', 'expected_value' => $customer->getDefaultBilling()]
+            ['response_field' => 'suffix', 'expected_value' => $customer->getSuffix()],
+            ['response_field' => 'email', 'expected_value' => $customer->getEmail()],
+            ['response_field' => 'default_shipping', 'expected_value' => (bool)$customer->getDefaultShipping()],
+            ['response_field' => 'default_billing', 'expected_value' => (bool)$customer->getDefaultBilling()],
+            ['response_field' => 'id', 'expected_value' => $customer->getId()]
         ];
 
         $this->assertResponseFields($actualResponse, $assertionMap);
     }
 
+    /**
+     * @param CustomerInterface $customer
+     * @param array $actualResponse
+     */
+
+    public function assertCustomerAddressesFields($customer, $actualResponse)
+    {
+        /** @var AddressInterface $addresses */
+        $addresses = $customer->getAddresses();
+
+        foreach( $addresses as $addressKey => $addressValue) {
+            $this->assertNotEmpty($addressValue);
+            $assertionMap = [
+                ['response_field' => 'id', 'expected_value' => $addresses[$addressKey]->getId()],
+                ['response_field' => 'customer_id', 'expected_value' => $addresses[$addressKey]->getCustomerId()],
+                ['response_field' => 'region_id', 'expected_value' => $addresses[$addressKey]->getRegionId()],
+                ['response_field' => 'country_id', 'expected_value' => $addresses[$addressKey]->getCountryId()],
+                ['response_field' => 'telephone', 'expected_value' => $addresses[$addressKey]->getTelephone()],
+                ['response_field' => 'postcode', 'expected_value' => $addresses[$addressKey]->getPostcode()],
+                ['response_field' => 'city', 'expected_value' => $addresses[$addressKey]->getCity()],
+                ['response_field' => 'firstname', 'expected_value' => $addresses[$addressKey]->getFirstname()],
+                ['response_field' => 'lastname', 'expected_value' => $addresses[$addressKey]->getLastname()]
+            ];
+            $this->assertResponseFields($actualResponse['customer']['addresses'][$addressKey], $assertionMap);
+        }
+
+       // $addressId = $actualResponse['customer']['addresses']['id'][0];
+      //  $addressRepository = ObjectManager::getInstance()->get(\Magento\Customer\Api\AddressRepositoryInterface::class);
+      //  $customerAddress = $addressRepository->getById(1);
+    }
+
+
     /**
      * @param array $actualResponse
      * @param array $assertionMap ['response_field_name' => 'response_field_value', ...]