Re-use code in test

diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php
index 43cd7dd9386aab88069b88b4a1f494d88d542e46..e8a6a74c3af1845c8cd226408f69d67579429a20 100644 (file)
--- a/CRM/Import/Parser.php
+++ b/CRM/Import/Parser.php
@@ -42,7 +42,6 @@ abstract class CRM_Import_Parser {
    */
   const CONTACT_INDIVIDUAL = 1, CONTACT_HOUSEHOLD = 2, CONTACT_ORGANIZATION = 4;
 
-
   /**
    * User job id.
    *

diff --git a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
index 0a63c0a6df5145b8b3af174ff8399b3782bbac76..3679bba2672983a87e0532036eed4dcad2de36cf 100644 (file)
--- a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
+++ b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
@@ -1014,22 +1014,7 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase {
       ['do_not_import'],
     ];
     $csv = 'individual_genders.csv';
-    /* @var CRM_Import_DataSource_CSV $dataSource */
-    /* @var \CRM_Contact_Import_Parser_Contact $parser */
-    [$dataSource, $parser] = $this->getDataSourceAndParser($csv, $mapper, []);
-    while ($values = $dataSource->getRow()) {
-      try {
-        $parser->validateValues(array_values($values));
-        if ($values['expected'] !== 'Valid') {
-          $this->fail($values['gender'] . ' should not have been valid');
-        }
-      }
-      catch (CRM_Core_Exception $e) {
-        if ($values['expected'] !== 'Invalid') {
-          $this->fail($values['gender'] . ' should have been valid');
-        }
-      }
-    }
+    $this->validateMultiRowCsv($csv, $mapper, 'gender');
 
     $this->importCSV($csv, $mapper);
     $contacts = Contact::get()
@@ -1562,10 +1547,13 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase {
   }
 
   /**
+   * Validate a csv with multiple rows in it.
+   *
    * @param string $csv
    * @param array $mapper Mapping as entered on MapField form.
    *   e.g [['first_name']['email', 1]].
    * @param string $field
+   *   Name of the field whose data should be output in the error message.
    * @param array $submittedValues
    *   Values submitted in the form process.
    *
@@ -1573,7 +1561,7 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase {
    * @throws \CRM_Core_Exception
    * @throws \Civi\API\Exception\UnauthorizedException
    */
-  private function validateMultiRowCsv(string $csv, array $mapper, string $field, $submittedValues): void {
+  private function validateMultiRowCsv(string $csv, array $mapper, string $field, $submittedValues = []): void {
     /* @var CRM_Import_DataSource_CSV $dataSource */
     /* @var \CRM_Contact_Import_Parser_Contact $parser */
     [$dataSource, $parser] = $this->getDataSourceAndParser($csv, $mapper, $submittedValues);