From: eileen Date: Mon, 24 Jul 2017 12:52:55 +0000 (+1200) Subject: CRM-19888 update test to reflect change. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=599bbb8d06a90ea1cd1cf74ea5e17b8b1c82cbca;p=civicrm-core.git CRM-19888 update test to reflect change. In fact this test is a bit silly anyway as it tests the fn in a way it is never called in --- diff --git a/tests/phpunit/CRM/Contact/BAO/ContactTest.php b/tests/phpunit/CRM/Contact/BAO/ContactTest.php index 684ef0d194..d7250a6cd0 100644 --- a/tests/phpunit/CRM/Contact/BAO/ContactTest.php +++ b/tests/phpunit/CRM/Contact/BAO/ContactTest.php @@ -518,6 +518,7 @@ class CRM_Contact_BAO_ContactTest extends CiviUnitTestCase { 'country_id' => 1228, 'state_province_id' => 1004, ); + // @todo - we are testing this with $reverse = FALSE but it is never called that way! CRM_Contact_BAO_Contact::resolveDefaults($params); //check the resolve values. @@ -527,10 +528,7 @@ class CRM_Contact_BAO_ContactTest extends CiviUnitTestCase { $this->assertEquals($prefix[$params['prefix_id']], $params['prefix'], 'Check for prefix.'); $suffix = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'suffix_id'); $this->assertEquals($suffix[$params['suffix_id']], $params['suffix'], 'Check for suffix.'); - $this->assertEquals(CRM_Core_PseudoConstant::stateProvince($params['address'][1]['state_province_id']), - $params['address'][1]['state_province'], - 'Check for state province.' - ); + $this->assertEquals(1004, $params['address'][1]['state_province_id']); $this->assertEquals(CRM_Core_PseudoConstant::country($params['address'][1]['country_id']), $params['address'][1]['country'], 'Check for country.'