Merge remote-tracking branch '32904/import-export/entity-values-are-mixed' into comm_jul

Author: engcom-Charlie

app/code/Magento/ImportExport/Model/Import.php

@@ -721,11 +721,18 @@ private function validateSourceCallback(AbstractSource $source)
         $messages = $this->getOperationResultMessages($errorAggregator);
         $this->addLogComment($messages);
 
-        $result = !$errorAggregator->isErrorLimitExceeded();
-        if ($result) {
-            $this->addLogComment(__('Import data validation is complete.'));
+        if ($errorAggregator->isErrorLimitExceeded()) {
+            return false;
         }
-        return $result;
+
+        if ($this->getProcessedRowsCount() <= $errorAggregator->getInvalidRowsCount()) {
+            $this->addLogComment(__('There are no valid rows to import.'));
+            return false;
+        }
+
+        $this->addLogComment(__('Import data validation is complete.'));
+
+        return true;
     }
 
     /**

app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php

@@ -509,7 +509,7 @@ public function testValidateSource()
         $this->errorAggregatorMock->expects($this->once())
             ->method('initValidationStrategy')
             ->with($validationStrategy, $allowedErrorCount);
-        $this->errorAggregatorMock->expects($this->once())
+        $this->errorAggregatorMock->expects($this->atLeastOnce())
             ->method('getErrorsCount')
             ->willReturn(0);
 
@@ -527,7 +527,7 @@ public function testValidateSource()
         $this->import->expects($this->any())
             ->method('_getEntityAdapter')
             ->willReturn($this->_entityAdapter);
-        $this->import->expects($this->once())
+        $this->import->expects($this->atLeastOnce())
             ->method('getProcessedRowsCount')
             ->willReturn(0);
 
@@ -541,12 +541,12 @@ public function testValidateSource()
                 ]
             );
 
-        $this->assertTrue($this->import->validateSource($csvMock));
+        $this->assertFalse($this->import->validateSource($csvMock));
 
         $logTrace = $this->import->getFormatedLogTrace();
         $this->assertStringContainsString('Begin data validation', $logTrace);
         $this->assertStringContainsString('This file does not contain any data', $logTrace);
-        $this->assertStringContainsString('Import data validation is complete', $logTrace);
+        $this->assertStringContainsString('There are no valid rows to import', $logTrace);
     }
 
     public function testInvalidateIndex()

dev/tests/integration/testsuite/Magento/ImportExport/Model/ImportTest.php

@@ -142,7 +142,7 @@ public function testValidateSource()
             [['sku', 'name']]
         );
         $source->expects($this->any())->method('_getNextRow')->willReturn(false);
-        $this->assertTrue($this->_model->validateSource($source));
+        $this->assertFalse($this->_model->validateSource($source));
     }
 
     /**