From 604b5046d20b431a5a9ef58fb4f59c20f36837a1 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 3 Jun 2020 20:46:08 +0300
Subject: [PATCH] refactoring customer fixtures

---
 .../_files/import_export/customer.php         |  72 ++++----
 .../import_export/customer_with_addresses.php | 171 +++++++-----------
 .../_files/import_export/customers.php        | 136 ++++++--------
 .../customers_for_address_import.php          |  72 ++++----
 4 files changed, 191 insertions(+), 260 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customer.php b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customer.php
index 3a39e62af0ccb..9c24e4b5ff3bd 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customer.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customer.php
@@ -3,39 +3,41 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-//Create customer
-$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Customer::class
-);
-$customer->setWebsiteId(
-    1
-)->setEntityId(
-    1
-)->setEntityTypeId(
-    1
-)->setAttributeSetId(
-    0
-)->setEmail(
-    'CharlesTAlston@teleworm.us'
-)->setPassword(
-    'password'
-)->setGroupId(
-    1
-)->setStoreId(
-    1
-)->setIsActive(
-    1
-)->setFirstname(
-    'Charles'
-)->setLastname(
-    'Alston'
-)->setGender(
-    '2'
-);
+
+declare(strict_types=1);
+
+use Magento\Customer\Model\Address;
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/**
+ * @var $customer Customer
+ * @var $customerResource CustomerResource
+ */
+$customer = $objectManager->create(Customer::class);
+$customerResource = $objectManager->create(CustomerResource::class);
+
+$customer->setWebsiteId(1)
+    ->setEntityId(1)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('CharlesTAlston@teleworm.us')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Charles')
+    ->setLastname('Alston')
+    ->setGender('2');
+
 $customer->isObjectNew(true);
 
 // Create address
-$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
+$address = $objectManager->create(Address::class);
 //  default_billing and default_shipping information would not be saved, it is needed only for simple check
 $address->addData(
     [
@@ -54,14 +56,12 @@
 
 // Assign customer and address
 $customer->addAddress($address);
-$customer->save();
+$customerResource->save($customer);
 
 // Mark last address as default billing and default shipping for current customer
 $customer->setDefaultBilling($address->getId());
 $customer->setDefaultShipping($address->getId());
-$customer->save();
+$customerResource->save($customer);
 
-/** @var $objectManager \Magento\TestFramework\ObjectManager */
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-$objectManager->get(\Magento\Framework\Registry::class)->unregister('_fixture/Magento_ImportExport_Customer');
-$objectManager->get(\Magento\Framework\Registry::class)->register('_fixture/Magento_ImportExport_Customer', $customer);
+$objectManager->get(Registry::class)->unregister('_fixture/Magento_ImportExport_Customer');
+$objectManager->get(Registry::class)->register('_fixture/Magento_ImportExport_Customer', $customer);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customer_with_addresses.php b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customer_with_addresses.php
index b8a69def69d6b..46086e00244ee 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customer_with_addresses.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customer_with_addresses.php
@@ -3,41 +3,44 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
+use Magento\Customer\Model\Address;
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var $objectManager ObjectManager */
+$objectManager = Bootstrap::getObjectManager();
+
 $customers = [];
 
-//Create customer
-$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Customer::class
-);
-$customer->setWebsiteId(
-    1
-)->setEntityId(
-    1
-)->setEntityTypeId(
-    1
-)->setAttributeSetId(
-    0
-)->setEmail(
-    'BetsyParker@example.com'
-)->setPassword(
-    'password'
-)->setGroupId(
-    1
-)->setStoreId(
-    1
-)->setIsActive(
-    1
-)->setFirstname(
-    'Betsy'
-)->setLastname(
-    'Parker'
-)->setGender(
-    2
-);
+/**
+ * @var $customer Customer
+ * @var $customerResource CustomerResource
+ */
+$customer = $objectManager->create(Customer::class);
+$customerResource = $objectManager->create(CustomerResource::class);
+
+$customer->setWebsiteId(1)
+    ->setEntityId(1)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('BetsyParker@example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Betsy')
+    ->setLastname('Parker')
+    ->setGender(2);
 $customer->isObjectNew(true);
 
 // Create address
-$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
+$address = $objectManager->create(Address::class);
 //  default_billing and default_shipping information would not be saved, it is needed only for simple check
 $address->addData(
     [
@@ -56,46 +59,31 @@
 
 // Assign customer and address
 $customer->addAddress($address);
-$customer->save();
+$customerResource->save($customer);
 
 // Mark last address as default billing and default shipping for current customer
 $customer->setDefaultBilling($address->getId());
 $customer->setDefaultShipping($address->getId());
-$customer->save();
+$customerResource->save($customer);
 
 $customers[] = $customer;
 
-$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Customer::class
-);
-$customer->setWebsiteId(
-    1
-)->setEntityId(
-    2
-)->setEntityTypeId(
-    1
-)->setAttributeSetId(
-    0
-)->setEmail(
-    'AnthonyNealy@example.com'
-)->setPassword(
-    'password'
-)->setGroupId(
-    1
-)->setStoreId(
-    1
-)->setIsActive(
-    1
-)->setFirstname(
-    'Anthony'
-)->setLastname(
-    'Nealy'
-)->setGender(
-    1
-);
+$customer = $objectManager->create(Customer::class);
+$customer->setWebsiteId(1)
+    ->setEntityId(2)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('AnthonyNealy@example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Anthony')
+    ->setLastname('Nealy')
+    ->setGender(1);
 $customer->isObjectNew(true);
 
-$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
+$address = $objectManager->create(Address::class);
 $address->addData(
     [
         'firstname' => 'Anthony',
@@ -112,7 +100,7 @@
 );
 $customer->addAddress($address);
 
-$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
+$address = $objectManager->create(Address::class);
 $address->addData(
     [
         'firstname' => 'Anthony',
@@ -129,45 +117,30 @@
 );
 $customer->addAddress($address);
 
-$customer->save();
+$customerResource->save($customer);
 
 $customer->setDefaultBilling($address->getId());
 $customer->setDefaultShipping($address->getId());
-$customer->save();
+$customerResource->save($customer);
 
 $customers[] = $customer;
 
-$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Customer::class
-);
-$customer->setWebsiteId(
-    1
-)->setEntityId(
-    3
-)->setEntityTypeId(
-    1
-)->setAttributeSetId(
-    0
-)->setEmail(
-    'LoriBanks@example.com'
-)->setPassword(
-    'password'
-)->setGroupId(
-    1
-)->setStoreId(
-    1
-)->setIsActive(
-    1
-)->setFirstname(
-    'Lori'
-)->setLastname(
-    'Banks'
-)->setGender(
-    2
-);
+$customer = $objectManager->create(Customer::class);
+$customer->setWebsiteId(1)
+    ->setEntityId(3)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('LoriBanks@example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Lori')
+    ->setLastname('Banks')
+    ->setGender(2);
 $customer->isObjectNew(true);
 
-$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
+$address = $objectManager->create(Address::class);
 $address->addData(
     [
         'firstname' => 'Lori',
@@ -183,17 +156,13 @@
     ]
 );
 $customer->addAddress($address);
-$customer->save();
+$customerResource->save($customer);
 
 $customer->setDefaultBilling($address->getId());
 $customer->setDefaultShipping($address->getId());
-$customer->save();
+$customerResource->save($customer);
 
 $customers[] = $customer;
 
-/** @var $objectManager \Magento\TestFramework\ObjectManager */
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-$objectManager->get(\Magento\Framework\Registry::class)
-    ->unregister('_fixture/Magento_ImportExport_Customers_Array');
-$objectManager->get(\Magento\Framework\Registry::class)
-    ->register('_fixture/Magento_ImportExport_Customers_Array', $customers);
+$objectManager->get(Registry::class)->unregister('_fixture/Magento_ImportExport_Customers_Array');
+$objectManager->get(Registry::class)->register('_fixture/Magento_ImportExport_Customers_Array', $customers);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers.php b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers.php
index 9b989779e4cbd..302ac055f61ca 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers.php
@@ -4,107 +4,75 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Framework\ObjectManagerInterface;
+declare(strict_types=1);
+
 use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /** @var $objectManager ObjectManagerInterface */
 $objectManager = Bootstrap::getObjectManager();
 
 $customers = [];
+
+/**
+ * @var $customer Customer
+ * @var $customerResource CustomerResource
+ */
 $customer = $objectManager->create(Customer::class);
+$customerResource = $objectManager->create(CustomerResource::class);
 
-$customer->setWebsiteId(
-    1
-)->setEntityTypeId(
-    1
-)->setAttributeSetId(
-    0
-)->setEmail(
-    'customer@example.com'
-)->setPassword(
-    'password'
-)->setGroupId(
-    1
-)->setStoreId(
-    1
-)->setIsActive(
-    1
-)->setFirstname(
-    'Firstname'
-)->setLastname(
-    'Lastname'
-)->setDefaultBilling(
-    1
-)->setDefaultShipping(
-    1
-);
+$customer->setWebsiteId(1)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer@example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname')
+    ->setLastname('Lastname')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1);
 $customer->isObjectNew(true);
-$customer->save();
+$customerResource->save($customer);
 $customers[] = $customer;
 
 $customer = $objectManager->create(Customer::class);
-$customer->setWebsiteId(
-    1
-)->setEntityTypeId(
-    1
-)->setAttributeSetId(
-    0
-)->setEmail(
-    'julie.worrell@example.com'
-)->setPassword(
-    'password'
-)->setGroupId(
-    1
-)->setStoreId(
-    1
-)->setIsActive(
-    1
-)->setFirstname(
-    'Julie'
-)->setLastname(
-    'Worrell'
-)->setDefaultBilling(
-    1
-)->setDefaultShipping(
-    1
-);
+$customer->setWebsiteId(1)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('julie.worrell@example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Julie')
+    ->setLastname('Worrell')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1);
 $customer->isObjectNew(true);
-$customer->save();
+$customerResource->save($customer);
 $customers[] = $customer;
 
 $customer = $objectManager->create(Customer::class);
-$customer->setWebsiteId(
-    1
-)->setEntityTypeId(
-    1
-)->setAttributeSetId(
-    0
-)->setEmail(
-    'david.lamar@example.com'
-)->setPassword(
-    'password'
-)->setGroupId(
-    1
-)->setStoreId(
-    1
-)->setIsActive(
-    1
-)->setFirstname(
-    'David'
-)->setLastname(
-    'Lamar'
-)->setDefaultBilling(
-    1
-)->setDefaultShipping(
-    1
-);
+$customer->setWebsiteId(1)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('david.lamar@example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('David')
+    ->setLastname('Lamar')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1);
 $customer->isObjectNew(true);
-$customer->save();
+$customerResource->save($customer);
 $customers[] = $customer;
 
-$objectManager->get(Registry::class)
-    ->unregister('_fixture/Magento_ImportExport_Customer_Collection');
-$objectManager->get(Registry::class)
-    ->register('_fixture/Magento_ImportExport_Customer_Collection', $customers);
+$objectManager->get(Registry::class)->unregister('_fixture/Magento_ImportExport_Customer_Collection');
+$objectManager->get(Registry::class)->register('_fixture/Magento_ImportExport_Customer_Collection', $customers);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers_for_address_import.php b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers_for_address_import.php
index 9a90061a6de76..ca32958e66639 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers_for_address_import.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers_for_address_import.php
@@ -3,43 +3,39 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-//Create customer
-/** @var Magento\Customer\Model\Customer $customer */
-$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Customer::class
-);
-$customer->setWebsiteId(
-    0
-)->setEntityId(
-    1
-)->setEntityTypeId(
-    1
-)->setAttributeSetId(
-    0
-)->setEmail(
-    'BetsyParker@example.com'
-)->setPassword(
-    'password'
-)->setGroupId(
-    0
-)->setStoreId(
-    0
-)->setIsActive(
-    1
-)->setFirstname(
-    'Betsy'
-)->setLastname(
-    'Parker'
-)->setGender(
-    2
-);
+
+declare(strict_types=1);
+
+use Magento\Customer\Model\Address;
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/**
+ * @var Customer $customer
+ * @var CustomerResource $customerResource
+ */
+$customer = Bootstrap::getObjectManager()->create(Customer::class);
+$customerResource = $objectManager->create(CustomerResource::class);
+
+$customer->setWebsiteId(0)
+    ->setEntityId(1)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('BetsyParker@example.com')
+    ->setPassword('password')
+    ->setGroupId(0)
+    ->setStoreId(0)
+    ->setIsActive(1)
+    ->setFirstname('Betsy')
+    ->setLastname('Parker')
+    ->setGender(2);
 $customer->isObjectNew(true);
-$customer->save();
+$customerResource->save($customer);
 
-// Create and set addresses
-$addressFirst = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Address::class
-);
+$addressFirst = $objectManager->create(Address::class);
 $addressFirst->addData(
     [
         'entity_id' => 1,
@@ -57,9 +53,7 @@
 $customer->addAddress($addressFirst);
 $customer->setDefaultBilling($addressFirst->getId());
 
-$addressSecond = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Address::class
-);
+$addressSecond = $objectManager->create(Address::class);
 $addressSecond->addData(
     [
         'entity_id' => 2,
@@ -76,4 +70,4 @@
 $addressSecond->isObjectNew(true);
 $customer->addAddress($addressSecond);
 $customer->setDefaultShipping($addressSecond->getId());
-$customer->save();
+$customerResource->save($customer);