From 11a56cfe5f918a54284b7614a9489d53c9c41208 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Fri, 19 Jun 2020 16:16:53 +1000 Subject: [PATCH] [NFC] Fix tests in prepartion for phpunit7 --- CRM/Core/BAO/Country.php | 2 +- Civi/Test/DbTestTrait.php | 2 +- tests/phpunit/CRM/Campaign/Form/CampaignTest.php | 2 +- tests/phpunit/CRM/Contribute/Form/ContributionTest.php | 4 ++-- tests/phpunit/CRM/Core/PseudoConstantTest.php | 2 +- tests/phpunit/api/v3/ContributionRecurTest.php | 2 +- tests/phpunit/api/v3/ContributionSoftTest.php | 2 +- tests/phpunit/api/v3/GrantTest.php | 2 +- tests/phpunit/api/v3/LoggingTest.php | 2 +- tests/phpunit/api/v3/SyntaxConformanceTest.php | 5 +++++ 10 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CRM/Core/BAO/Country.php b/CRM/Core/BAO/Country.php index 10934d932c..49413ba891 100644 --- a/CRM/Core/BAO/Country.php +++ b/CRM/Core/BAO/Country.php @@ -57,7 +57,7 @@ class CRM_Core_BAO_Country extends CRM_Core_DAO_Country { if (!isset(Civi::$statics[__CLASS__]['countryLimit'])) { $countryIsoCodes = CRM_Core_PseudoConstant::countryIsoCode(); $country = []; - $countryLimit = Civi::settings()->get('countryLimit'); + $countryLimit = Civi::settings()->get('countryLimit') ?? []; if (is_array($countryLimit)) { foreach ($countryLimit as $val) { // CRM-12007 diff --git a/Civi/Test/DbTestTrait.php b/Civi/Test/DbTestTrait.php index 866984566f..b664edd84a 100644 --- a/Civi/Test/DbTestTrait.php +++ b/Civi/Test/DbTestTrait.php @@ -143,7 +143,7 @@ trait DbTestTrait { $expectedValue, $message ) { $value = \CRM_Core_DAO::getFieldValue($daoName, $searchValue, $returnColumn, $searchColumn, TRUE); - $this->assertEquals($expectedValue, $value, $message); + $this->assertEquals(trim($expectedValue), trim($value), $message); } /** diff --git a/tests/phpunit/CRM/Campaign/Form/CampaignTest.php b/tests/phpunit/CRM/Campaign/Form/CampaignTest.php index 6bd3aa253e..137feedac7 100644 --- a/tests/phpunit/CRM/Campaign/Form/CampaignTest.php +++ b/tests/phpunit/CRM/Campaign/Form/CampaignTest.php @@ -40,7 +40,7 @@ class CRM_Campaign_Form_CampaignTest extends CiviUnitTestCase { 'campaign_type_id' => 1, ], $form); $campaign = $this->callAPISuccess('campaign', 'get', ['id' => $result['id']]); - $this->assertEquals('10000', $campaign['values'][$campaign['id']]['goal_revenue']); + $this->assertEquals('10000.00', $campaign['values'][$campaign['id']]['goal_revenue']); } } diff --git a/tests/phpunit/CRM/Contribute/Form/ContributionTest.php b/tests/phpunit/CRM/Contribute/Form/ContributionTest.php index 4d0cc8c03d..358a8bf486 100644 --- a/tests/phpunit/CRM/Contribute/Form/ContributionTest.php +++ b/tests/phpunit/CRM/Contribute/Form/ContributionTest.php @@ -413,7 +413,7 @@ class CRM_Contribute_Form_ContributionTest extends CiviUnitTestCase { 'contact_id' => $this->_individualId, 'contribution_status_id' => 'Completed', ]); - $this->assertEquals('50', $contribution['total_amount']); + $this->assertEquals('50.00', $contribution['total_amount']); $this->assertEquals(.08, $contribution['fee_amount']); $this->assertEquals(49.92, $contribution['net_amount']); $this->assertEquals('tx', $contribution['trxn_id']); @@ -464,7 +464,7 @@ class CRM_Contribute_Form_ContributionTest extends CiviUnitTestCase { 'contact_id' => $this->_individualId, 'contribution_status_id' => 'Completed', ]); - $this->assertEquals('50', $contribution['total_amount']); + $this->assertEquals('50.00', $contribution['total_amount']); $this->assertEquals(0, $contribution['non_deductible_amount']); } diff --git a/tests/phpunit/CRM/Core/PseudoConstantTest.php b/tests/phpunit/CRM/Core/PseudoConstantTest.php index ad76024aee..d83d48f28f 100644 --- a/tests/phpunit/CRM/Core/PseudoConstantTest.php +++ b/tests/phpunit/CRM/Core/PseudoConstantTest.php @@ -1102,7 +1102,7 @@ class CRM_Core_PseudoConstantTest extends CiviUnitTestCase { ]; CRM_Financial_BAO_FinancialTypeAccount::add($financialAccountParams); $taxRates = CRM_Core_PseudoConstant::getTaxRates(); - $this->assertEquals('5.00', $taxRates[$financialType['id']]); + $this->assertEquals('5.00', round($taxRates[$financialType['id']], 2)); } } diff --git a/tests/phpunit/api/v3/ContributionRecurTest.php b/tests/phpunit/api/v3/ContributionRecurTest.php index 33a4005a71..551f43ec11 100644 --- a/tests/phpunit/api/v3/ContributionRecurTest.php +++ b/tests/phpunit/api/v3/ContributionRecurTest.php @@ -33,7 +33,7 @@ class api_v3_ContributionRecurTest extends CiviUnitTestCase { 'contact_id' => $this->ids['contact'][0], 'installments' => '12', 'frequency_interval' => '1', - 'amount' => '500', + 'amount' => '500.00', 'contribution_status_id' => 1, 'start_date' => '2012-01-01 00:00:00', 'currency' => 'USD', diff --git a/tests/phpunit/api/v3/ContributionSoftTest.php b/tests/phpunit/api/v3/ContributionSoftTest.php index 84bb7ad644..6880605e79 100644 --- a/tests/phpunit/api/v3/ContributionSoftTest.php +++ b/tests/phpunit/api/v3/ContributionSoftTest.php @@ -206,7 +206,7 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { $softcontribution = $this->callAPIAndDocument('contribution_soft', 'create', $params, __FUNCTION__, __FILE__); $this->assertEquals($softcontribution['values'][$softcontribution['id']]['contribution_id'], $this->_contributionId); $this->assertEquals($softcontribution['values'][$softcontribution['id']]['contact_id'], $this->_softIndividual1Id); - $this->assertEquals($softcontribution['values'][$softcontribution['id']]['amount'], '10.00'); + $this->assertEquals($softcontribution['values'][$softcontribution['id']]['amount'], '10'); $this->assertEquals($softcontribution['values'][$softcontribution['id']]['currency'], 'USD'); $this->assertEquals($softcontribution['values'][$softcontribution['id']]['soft_credit_type_id'], 5); } diff --git a/tests/phpunit/api/v3/GrantTest.php b/tests/phpunit/api/v3/GrantTest.php index 5ff8841050..d0c3707606 100644 --- a/tests/phpunit/api/v3/GrantTest.php +++ b/tests/phpunit/api/v3/GrantTest.php @@ -31,7 +31,7 @@ class api_v3_GrantTest extends CiviUnitTestCase { 'contact_id' => $this->ids['contact'][0], 'application_received_date' => 'now', 'decision_date' => 'next Monday', - 'amount_total' => '500', + 'amount_total' => '500.00', 'status_id' => 1, 'rationale' => 'Just Because', 'currency' => 'USD', diff --git a/tests/phpunit/api/v3/LoggingTest.php b/tests/phpunit/api/v3/LoggingTest.php index fb0195d35e..dd41b4e102 100644 --- a/tests/phpunit/api/v3/LoggingTest.php +++ b/tests/phpunit/api/v3/LoggingTest.php @@ -355,7 +355,7 @@ class api_v3_LoggingTest extends CiviUnitTestCase { // To protect against the modified date not changing due to the updates being too close together. sleep(1); $loggings = $this->callAPISuccess('Logging', 'get', ['log_conn_id' => 'bitty bot bot', 'tables' => ['civicrm_address']]); - $this->assertEquals('civicrm_address', $loggings['values'][0]['table'], CRM_Core_DAO::executeQuery('SELECT * FROM log_civicrm_address')->toArray()); + $this->assertEquals('civicrm_address', $loggings['values'][0]['table'], json_encode(CRM_Core_DAO::executeQuery('SELECT * FROM log_civicrm_address')->toArray())); $this->assertEquals(1, $loggings['count'], CRM_Core_DAO::executeQuery('SELECT * FROM log_civicrm_address')->toArray()); $this->assertEquals('27 Cool way', $loggings['values'][0]['from']); $this->assertEquals('25 Dorky way', $loggings['values'][0]['to']); diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php index 63d54bd375..05819b0d2f 100644 --- a/tests/phpunit/api/v3/SyntaxConformanceTest.php +++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php @@ -1317,6 +1317,7 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase { return; } + $floatFields = []; $baoString = _civicrm_api3_get_BAO($entityName); $this->assertNotEmpty($baoString, $entityName); $this->assertNotEmpty($entityName, $entityName); @@ -1438,6 +1439,7 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase { case CRM_Utils_Type::T_FLOAT: case CRM_Utils_Type::T_MONEY: + $floatFields[] = $field; $entity[$field] = '22.75'; break; @@ -1505,6 +1507,9 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase { $entity[$field] = CRM_Core_DAO::serializeField($checkEntity[$field], $specs['serialize']); } + foreach ($floatFields as $floatField) { + $checkEntity[$floatField] = rtrim($checkEntity[$floatField], "0"); + } $this->assertAPIArrayComparison($entity, $checkEntity, [], "checking if $fieldName was correctly updated\n" . print_r([ 'update-params' => $updateParams, 'update-result' => $update, -- 2.25.1