MTO-104: [Test] Export Customer Addresses

- Tests fixed.

Author: SiarheiAndreyeu

dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireSessionTest.php

@@ -13,7 +13,7 @@
 /**
  * Steps:
  *
- * 1. Login to backend.
+ * 1. Login to Admin.
  * 2. Create customer if needed.
  * 3. Apply configuration settings.
  * 4. Wait for session to expire.

dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ExpireSessionTest.xml

@@ -11,12 +11,12 @@
             <data name="configData" xsi:type="string">default_cookie_lifetime_60_seconds</data>
             <data name="customer/dataset" xsi:type="string">default</data>
             <data name="sessionLifetimeInSeconds" xsi:type="number">60</data>
-            <constraint name="Magento\Cms\Test\Constraint\AssertAuthorizationLinkIsVisibleOnStoreFront"/>
+            <constraint name="Magento\Cms\Test\Constraint\AssertAuthorizationLinkIsVisibleOnStoreFront" />
         </variation>
         <variation name="ExpireAdminSession" summary="Expire Admin Session" ticketId="MAGETWO-47723">
             <data name="configData" xsi:type="string">admin_session_lifetime_60_seconds</data>
             <data name="sessionLifetimeInSeconds" xsi:type="number">60</data>
-            <constraint name="Magento\Backend\Test\Constraint\AssertAdminLoginPageIsAvailable"/>
+            <constraint name="Magento\Backend\Test\Constraint\AssertAdminLoginPageIsAvailable" />
         </variation>
     </testCase>
 </config>

dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaEditCustomerTest.php

@@ -119,6 +119,7 @@ public function test(
         $data['captcha'] = $captcha;
         $data['group_id'] = [];
 
+        /** @var Customer $initCustomer */
         $initCustomer = $this->fixtureFactory->createByCode('customer', ['data' => $data]);
         $this->customerEdit($initCustomer, $attempts + 1);
     }

dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/Constraint/AssertImportCustomerAddresses.php

@@ -157,11 +157,8 @@ private function getResultCsv()
     private function deleteWasteData(array $csvData)
     {
         $necessaryData = array_flip($this->mappingKeys);
-        $wasteKeys = array_keys(array_diff_key($csvData, $necessaryData));
-        foreach ($wasteKeys as $key) {
-            unset($csvData[$key]);
-        };
-        return $csvData;
+
+        return array_intersect_key($csvData, $necessaryData);
     }
 
     /**
@@ -171,6 +168,6 @@ private function deleteWasteData(array $csvData)
      */
     public function toString()
     {
-        return 'Imported advanced prices are correct.';
+        return 'Imported customer addresses are correct.';
     }
 }

dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/TestCase/ExportCustomerAddressesTest.xml

@@ -19,7 +19,7 @@
                 <item name="5" xsi:type="string">postcode</item>
                 <item name="6" xsi:type="string">telephone</item>
             </data>
-            <constraint name="Magento\CustomerImportExport\Test\Constraint\AssertExportCustomerAddresses"/>
+            <constraint name="Magento\CustomerImportExport\Test\Constraint\AssertExportCustomerAddresses" />
         </variation>
     </testCase>
 </config>

dev/tests/functional/tests/app/Magento/CustomerImportExport/Test/TestCase/ImportCustomerAddressTest.xml

@@ -21,7 +21,7 @@
                     </item>
                     <item name="template" xsi:type="array">
                         <item name="filename"
-                              xsi:type="string">Magento/CustomerImportExport/Test/_files/template/pricing/customer_addresses_variation_1</item>
+                              xsi:type="string">Magento/CustomerImportExport/Test/_files/template/address/customer_addresses_variation_1</item>
                         <item name="count" xsi:type="number">1</item>
                     </item>
                 </item>
@@ -44,7 +44,7 @@
                     </item>
                     <item name="template" xsi:type="array">
                         <item name="filename"
-                              xsi:type="string">Magento/CustomerImportExport/Test/_files/template/pricing/customer_addresses_variation_2</item>
+                              xsi:type="string">Magento/CustomerImportExport/Test/_files/template/address/customer_addresses_variation_2</item>
                         <item name="count" xsi:type="number">2</item>
                     </item>
                 </item>