From d42fd591a4b9fbba8e342448ff247c09431e6d8a Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Mon, 7 Nov 2022 14:49:30 -0500 Subject: [PATCH] add test for detecting failed county import by name. fix typo in county name in test. --- .../individual_country_state_county_with_related.csv | 10 +++++----- .../phpunit/CRM/Contact/Import/Parser/ContactTest.php | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/phpunit/CRM/Contact/Import/Form/data/individual_country_state_county_with_related.csv b/tests/phpunit/CRM/Contact/Import/Form/data/individual_country_state_county_with_related.csv index 203431d3a8..d5fda4619f 100644 --- a/tests/phpunit/CRM/Contact/Import/Form/data/individual_country_state_county_with_related.csv +++ b/tests/phpunit/CRM/Contact/Import/Form/data/individual_country_state_county_with_related.csv @@ -1,9 +1,9 @@ First Name,Last Name,Email,County,Country,State,Custom field state,Custom Field Country,Address Custom Field Country,Address Custom field state,Mum Name,Mum Last name,Mum email,Mum State,Mum Country,Mum County,Address Mum Custom Field Country,Address Mum Custom field state,Mum Custom Field Country,Mum Custom field State,expected,error_value Susie,Jones,susie@example.com,,ABC,,,,,,Mum,Jones,mum@example.com,,,,,,,,Invalid,ABC Susie,Jones,susie@example.com,,,,,,,,Mum,Jones,mum@example.com,NSW,ABC,,,,,,Invalid,ABC -Susie,Jones,susie@example.com,,Australia,NSW,NSW,Australia,Australia,NSW,Mum,Jones,mum@example.com,NSW,Australia,,Australia,NSW,Australia,NSW,Valid, -Susie,Jones,susie@example.com,,AU,New South Wales,New South Wales,AU,AU,New South Wales,Mum,Jones,mum@example.com,New South Wales,AU,,AU,New South Wales,Australia,New South Wales,Valid, -Susie,Jones,susie@example.com,,1013,New South Wales,,1013,1013,New South Wales,Mum,Jones,mum@example.com,New South Wales,1013,,1013,New South Wales,1013,New South Wales,Valid, -Susie,Jones,susie@example.com,,AUSTRALIA,,,,,,Mum,Jones,mum@example.com,,austRalia,,,,,,Valid, -Susie,Jones,susie@example.com,,AU,NEW South Wales,NEW South Wales,AU,AU,NEW South Wales,Mum,Jones,mum@example.com,NEW South Wales,AU,,AU,NEW South Wales,Australia,NEW South Wales,Valid, +Susie,Jones,susie@example.com,farnell,Australia,NSW,NSW,Australia,Australia,NSW,Mum,Jones,mum@example.com,NSW,Australia,,Australia,NSW,Australia,NSW,Valid, +Susie,Jones,susie@example.com,farnell,AU,New South Wales,New South Wales,AU,AU,New South Wales,Mum,Jones,mum@example.com,New South Wales,AU,,AU,New South Wales,Australia,New South Wales,Valid, +Susie,Jones,susie@example.com,FARNELL,1013,New South Wales,,1013,1013,New South Wales,Mum,Jones,mum@example.com,New South Wales,1013,,1013,New South Wales,1013,New South Wales,Valid, +Susie,Jones,susie@example.com,Farnell,AUSTRALIA,,,,,,Mum,Jones,mum@example.com,,austRalia,,,,,,Valid, +Susie,Jones,susie@example.com,Farnell,AU,NEW South Wales,NEW South Wales,AU,AU,NEW South Wales,Mum,Jones,mum@example.com,NEW South Wales,AU,,AU,NEW South Wales,Australia,NEW South Wales,Valid, Susie,Jones,susie@example.com,,AU,My own personal fiefdom,My own personal fiefdom,AU,AU,My own personal fiefdom,Mum,Jones,mum@example.com,My own personal fiefdom,AU,,AU,My own personal fiefdom,Australia,My own personal fiefdom,Invalid,rando diff --git a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php index 7d1f215ac8..5e20d951cd 100644 --- a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php +++ b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php @@ -1292,6 +1292,8 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase { * @throws \CRM_Core_Exception */ public function testImportCountryStateCounty(): void { + $sql = "INSERT INTO civicrm_county SET id = 999, name = 'Farnell', abbreviation = '', state_province_id = 1640, is_active = 1"; + \CRM_Core_DAO::executeQuery($sql); $childKey = $this->getRelationships()['Child of']['id'] . '_a_b'; $addressCustomGroupID = $this->createCustomGroup(['extends' => 'Address', 'name' => 'Address']); $contactCustomGroupID = $this->createCustomGroup(['extends' => 'Contact', 'name' => 'Contact']); @@ -1338,6 +1340,7 @@ class CRM_Contact_Import_Parser_ContactTest extends CiviUnitTestCase { $this->importCSV($csv, $mapper); $contacts = $this->getImportedContacts(); foreach ($contacts as $contact) { + $this->assertEquals(999, $contact['address'][0]['county_id']); $this->assertEquals(1013, $contact['address'][0]['country_id']); $this->assertEquals(1640, $contact['address'][0]['state_province_id']); } -- 2.25.1