Merge pull request #17253 from mattwire/utf8convertblocksize

[civicrm-core.git] / tests / phpunit / CRM / Core / BAO / AddressTest.php

diff --git a/tests/phpunit/CRM/Core/BAO/AddressTest.php b/tests/phpunit/CRM/Core/BAO/AddressTest.php
index 3b4dc3a6f7fcb0267577301b4764165eb4266650..b8264bbb7dab17364f265dcc71b91231ee2d6853 100644 (file)
--- a/tests/phpunit/CRM/Core/BAO/AddressTest.php
+++ b/tests/phpunit/CRM/Core/BAO/AddressTest.php
@@ -261,6 +261,9 @@ class CRM_Core_BAO_AddressTest extends CiviUnitTestCase {
     $address = CRM_Core_BAO_Address::getValues($entityBlock);
     $this->assertEquals($address[1]['id'], $addressId);
     $this->assertEquals($address[1]['contact_id'], $contactId);
+    $this->assertEquals($address[1]['state_province_abbreviation'], 'AL');
+    $this->assertEquals($address[1]['state_province'], 'Alabama');
+    $this->assertEquals($address[1]['country'], 'United States');
     $this->assertEquals($address[1]['street_address'], 'Oberoi Garden');
     $this->contactDelete($contactId);
   }
@@ -309,14 +312,14 @@ class CRM_Core_BAO_AddressTest extends CiviUnitTestCase {
 
     $result = civicrm_api3('Address', 'create', $params);
     $value = array_pop($result['values']);
-    $street_number = CRM_Utils_Array::value('street_number', $value);
+    $street_number = $value['street_number'] ?? NULL;
     $this->assertEquals($street_number, '54');
 
     // Ensure street parsing does not happen if disabled.
     $this->setStreetAddressParsing(FALSE);
     $result = civicrm_api3('Address', 'create', $params);
     $value = array_pop($result['values']);
-    $street_number = CRM_Utils_Array::value('street_number', $value);
+    $street_number = $value['street_number'] ?? NULL;
     $this->assertEmpty($street_number);
 
   }