MAGETWO-31937: Exclude Extended Attributes from Custom Attributes List

- Fixed integration tests

Author: Alexander Paliarush

dev/tests/integration/testsuite/Magento/Customer/Model/AddressMetadataTest.php

@@ -31,18 +31,7 @@ protected function setUp()
     public function testGetCustomAttributesMetadata()
     {
         $customAttributesMetadata = $this->_service->getCustomAttributesMetadata();
-        $this->assertCount(2, $customAttributesMetadata, "Invalid number of attributes returned.");
-        $configAttributeCode = 'address_attribute_1';
-        $configAttributeFound = false;
-        foreach ($customAttributesMetadata as $attribute) {
-            if ($attribute->getAttributeCode() == $configAttributeCode) {
-                $configAttributeFound = true;
-                break;
-            }
-        }
-        if (!$configAttributeFound) {
-            $this->fail("Custom attribute declared in the config not found.");
-        }
+        $this->assertCount(0, $customAttributesMetadata, "Invalid number of attributes returned.");
     }
 
     /**
@@ -69,7 +58,7 @@ public function testGetCustomAttributesMetadataWithAttributeNamedCustomAttribute
         if (!$customAttributesFound) {
             $this->fail("Custom attributes declared in the config not found.");
         }
-        $this->assertCount(4, $customAttributesMetadata, "Invalid number of attributes returned.");
+        $this->assertCount(2, $customAttributesMetadata, "Invalid number of attributes returned.");
     }
 
     public function testGetAddressAttributeMetadata()

dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php

@@ -47,18 +47,7 @@ protected function setUp()
     public function testGetCustomAttributesMetadata()
     {
         $customAttributesMetadata = $this->_service->getCustomAttributesMetadata();
-        $this->assertCount(3, $customAttributesMetadata, "Invalid number of attributes returned.");
-        $configAttributeCode = 'customer_attribute_1';
-        $configAttributeFound = false;
-        foreach ($customAttributesMetadata as $attribute) {
-            if ($attribute->getAttributeCode() == $configAttributeCode) {
-                $configAttributeFound = true;
-                break;
-            }
-        }
-        if (!$configAttributeFound) {
-            $this->fail("Custom attribute declared in the config not found.");
-        }
+        $this->assertCount(1, $customAttributesMetadata, "Invalid number of attributes returned.");
     }
 
     public function testGetNestedOptionsCustomAttributesMetadata()
@@ -104,7 +93,7 @@ public function testGetCustomAttributesMetadataWithAttributeNamedCustomAttribute
         if (!$customAttributesFound) {
             $this->fail("Custom attributes declared in the config not found.");
         }
-        $this->assertCount(5, $customAttributesMetadata, "Invalid number of attributes returned.");
+        $this->assertCount(3, $customAttributesMetadata, "Invalid number of attributes returned.");
     }
 
     /**