Merge branch 'MAGETWO-99894' of https://github.com/magento-tango/magento2ce into pr_2019_06_11_ce

Author: vkolesny

app/code/Magento/CustomerImportExport/Model/Import/CustomerComposite.php

@@ -270,6 +270,10 @@ protected function _initAddressAttributes()
     protected function _importData()
     {
         $result = $this->_customerEntity->importData();
+        $this->countItemsCreated += $this->_customerEntity->getCreatedItemsCount();
+        $this->countItemsUpdated += $this->_customerEntity->getUpdatedItemsCount();
+        $this->countItemsDeleted += $this->_customerEntity->getDeletedItemsCount();
+
         if ($this->getBehavior() != \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE) {
             return $result && $this->_addressEntity->setCustomerAttributes($this->_customerAttributes)->importData();
         }

dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerCompositeTest.php

@@ -8,6 +8,9 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
+/**
+ * Test for CustomerComposite import class
+ */
 class CustomerCompositeTest extends \PHPUnit\Framework\TestCase
 {
     /**#@+
@@ -129,15 +132,26 @@ protected function _assertCustomerData(array $expectedData)
      * @param string $sourceFile
      * @param array $dataBefore
      * @param array $dataAfter
+     * @param int $updatedItemsCount
+     * @param int $createdItemsCount
+     * @param int $deletedItemsCount
      * @param array $errors
      *
      * @magentoDataFixture Magento/Customer/_files/import_export/customers_for_address_import.php
      * @magentoAppIsolation enabled
      *
      * @dataProvider importDataDataProvider
      */
-    public function testImportData($behavior, $sourceFile, array $dataBefore, array $dataAfter, array $errors = [])
-    {
+    public function testImportData(
+        $behavior,
+        $sourceFile,
+        array $dataBefore,
+        array $dataAfter,
+        $updatedItemsCount,
+        $createdItemsCount,
+        $deletedItemsCount,
+        array $errors = []
+    ) {
         \Magento\TestFramework\Helper\Bootstrap::getInstance()
             ->loadArea(\Magento\Framework\App\Area::AREA_FRONTEND);
         // set entity adapter parameters
@@ -173,6 +187,9 @@ public function testImportData($behavior, $sourceFile, array $dataBefore, array
 
         // import data
         $this->_entityAdapter->importData();
+        $this->assertSame($updatedItemsCount, $this->_entityAdapter->getUpdatedItemsCount());
+        $this->assertSame($createdItemsCount, $this->_entityAdapter->getCreatedItemsCount());
+        $this->assertSame($deletedItemsCount, $this->_entityAdapter->getDeletedItemsCount());
 
         // assert data after import
         $this->_assertCustomerData($dataAfter);
@@ -192,6 +209,10 @@ public function importDataDataProvider()
                 '$sourceFile' => $filesDirectory . self::DELETE_FILE_NAME,
                 '$dataBefore' => $this->_beforeImport,
                 '$dataAfter' => [],
+                '$updatedItemsCount' => 0,
+                '$createdItemsCount' => 0,
+                '$deletedItemsCount' => 1,
+                '$errors' => [],
             ],
         ];
 
@@ -200,6 +221,9 @@ public function importDataDataProvider()
             '$sourceFile' => $filesDirectory . self::UPDATE_FILE_NAME,
             '$dataBefore' => $this->_beforeImport,
             '$dataAfter' => $this->_afterImport,
+            '$updatedItemsCount' => 1,
+            '$createdItemsCount' => 3,
+            '$deletedItemsCount' => 0,
             '$errors' => [],
         ];