Merge pull request #23523 from eileenmcnaughton/import_little

Re-use code in test

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.
    *

tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php

@@ -1014,22 +1014,7 @@ public function testImportGenders(): void {
       ['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,18 +1547,21 @@ protected function importCSV(string $csv, array $mapper, array $submittedValues
   }
 
   /**
+   * 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.
    *
    * @throws \API_Exception
    * @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);