From 2b8cc4194130e88f359b571b449f88acdbf22696 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 1 Mar 2023 07:48:22 +1300 Subject: [PATCH] Remove deprecated functions from tests --- tests/phpunit/CRM/Activity/Form/ActivityTest.php | 2 +- .../Contact/BAO/ContactType/ContactTypeTest.php | 12 ++---------- .../CRM/Contribute/BAO/ContributionTest.php | 2 +- .../CRM/Contribute/BAO/ContributionTypeTest.php | 6 ++---- tests/phpunit/CRM/Contribute/BAO/ProductTest.php | 2 +- tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php | 6 +++--- .../phpunit/CRM/Core/BAO/RecurringEntityTest.php | 2 +- tests/phpunit/CRM/Core/BAO/UFGroupTest.php | 4 ++-- .../CRM/Financial/BAO/FinancialAccountTest.php | 15 ++++++--------- .../CRM/Financial/BAO/FinancialItemTest.php | 2 +- .../Financial/BAO/FinancialTypeAccountTest.php | 4 ++-- .../phpunit/CRM/Member/BAO/MembershipLogTest.php | 2 +- .../CRM/Member/BAO/MembershipStatusTest.php | 2 +- tests/phpunit/CiviTest/CiviUnitTestCase.php | 12 ------------ 14 files changed, 24 insertions(+), 49 deletions(-) diff --git a/tests/phpunit/CRM/Activity/Form/ActivityTest.php b/tests/phpunit/CRM/Activity/Form/ActivityTest.php index 9a2b84ca75..a9c0e912db 100644 --- a/tests/phpunit/CRM/Activity/Form/ActivityTest.php +++ b/tests/phpunit/CRM/Activity/Form/ActivityTest.php @@ -106,7 +106,7 @@ class CRM_Activity_Form_ActivityTest extends CiviUnitTestCase { 'repetition_frequency_interval' => 1, 'start_action_offset' => $numberOfRepeatingActivitiesToCreate - 1, ]; - $actionScheduleBao = CRM_Core_BAO_ActionSchedule::add($actionScheduleParams); + $actionScheduleBao = CRM_Core_BAO_ActionSchedule::writeRecord($actionScheduleParams); // Create the activity's repeats. $recurringEntityBao = new CRM_Core_BAO_RecurringEntity(); diff --git a/tests/phpunit/CRM/Contact/BAO/ContactType/ContactTypeTest.php b/tests/phpunit/CRM/Contact/BAO/ContactType/ContactTypeTest.php index 6c266845b9..59642a2122 100644 --- a/tests/phpunit/CRM/Contact/BAO/ContactType/ContactTypeTest.php +++ b/tests/phpunit/CRM/Contact/BAO/ContactType/ContactTypeTest.php @@ -353,7 +353,7 @@ class CRM_Contact_BAO_ContactType_ContactTypeTest extends CiviUnitTestCase { $this->assertEquals($result->name, $params['name']); $this->assertEquals($result->parent_id, $params['parent_id']); $this->assertEquals($result->is_active, $params['is_active']); - CRM_Contact_BAO_ContactType::del($result->id); + CRM_Contact_BAO_ContactType::deleteRecord(['id' => $result->id]); $params = [ 'label' => 'householdSubType', @@ -366,7 +366,7 @@ class CRM_Contact_BAO_ContactType_ContactTypeTest extends CiviUnitTestCase { $this->assertEquals($result->name, $params['name']); $this->assertEquals($result->parent_id, $params['parent_id']); $this->assertEquals($result->is_active, $params['is_active']); - CRM_Contact_BAO_ContactType::del($result->id); + CRM_Contact_BAO_ContactType::deleteRecord(['id' => $result->id]); } /** @@ -429,12 +429,4 @@ class CRM_Contact_BAO_ContactType_ContactTypeTest extends CiviUnitTestCase { $this->assertEquals(FALSE, in_array($subtype->name, $result, TRUE)); } - /** - * Test del() with invalid data - */ - public function testDelInvalid() { - $del = CRM_Contact_BAO_ContactType::del(NULL); - $this->assertEquals($del, FALSE); - } - } diff --git a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php index 15cd1eb133..bd2d5eb9b7 100644 --- a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php +++ b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php @@ -397,7 +397,7 @@ class CRM_Contribute_BAO_ContributionTest extends CiviUnitTestCase { $this->assertEquals($contributionProduct->product_id, $premium->id, 'Check for Product id .'); //Delete Product - CRM_Contribute_BAO_Product::del($premium->id); + CRM_Contribute_BAO_Product::deleteRecord(['id' => $premium->id]); $this->assertDBNull('CRM_Contribute_DAO_Product', $premium->name, 'id', 'name', 'Database check for deleted Product.' ); diff --git a/tests/phpunit/CRM/Contribute/BAO/ContributionTypeTest.php b/tests/phpunit/CRM/Contribute/BAO/ContributionTypeTest.php index dd36ab2d65..fe9bce3f1c 100644 --- a/tests/phpunit/CRM/Contribute/BAO/ContributionTypeTest.php +++ b/tests/phpunit/CRM/Contribute/BAO/ContributionTypeTest.php @@ -34,8 +34,7 @@ class CRM_Contribute_BAO_ContributionTypeTest extends CiviUnitTestCase { 'is_deductible' => 0, 'is_active' => 1, ]; - $ids = []; - $contributionType = CRM_Financial_BAO_FinancialType::add($params, $ids); + $contributionType = CRM_Financial_BAO_FinancialType::writeRecord($params); $result = $this->assertDBNotNull('CRM_Financial_BAO_FinancialType', $contributionType->id, 'name', 'id', @@ -54,8 +53,7 @@ class CRM_Contribute_BAO_ContributionTypeTest extends CiviUnitTestCase { 'is_deductible' => 0, 'is_active' => 1, ]; - $ids = []; - $contributionType = CRM_Financial_BAO_FinancialType::add($params, $ids); + $contributionType = CRM_Financial_BAO_FinancialType::writeRecord($params); $result = CRM_Financial_BAO_FinancialType::setIsActive($contributionType->id, 0); $this->assertEquals($result, TRUE, 'Verify financial type record updation for is_active.'); diff --git a/tests/phpunit/CRM/Contribute/BAO/ProductTest.php b/tests/phpunit/CRM/Contribute/BAO/ProductTest.php index f242ed6085..e630e35706 100644 --- a/tests/phpunit/CRM/Contribute/BAO/ProductTest.php +++ b/tests/phpunit/CRM/Contribute/BAO/ProductTest.php @@ -99,7 +99,7 @@ class CRM_Contribute_BAO_ProductTest extends CiviUnitTestCase { ]; $product = CRM_Contribute_BAO_Product::create($params); - CRM_Contribute_BAO_Product::del($product->id); + CRM_Contribute_BAO_Product::deleteRecord(['id' => $product->id]); $params = ['id' => $product->id]; $defaults = []; diff --git a/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php b/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php index 83a9d47ccc..b9076c26cc 100644 --- a/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php +++ b/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php @@ -1896,7 +1896,7 @@ class CRM_Core_BAO_ActionScheduleTest extends CiviUnitTestCase { $modifiedDate = $this->callAPISuccess('Contact', 'getvalue', ['id' => $contact['id'], 'return' => 'modified_date']); $actionSchedule = $this->createScheduleFromFixtures('sched_contact_mod_anniversary'); $actionSchedule['effective_start_date'] = date('Y-m-d H:i:s', strtotime($contact['values'][$contact['id']]['modified_date'])); - $actionScheduleDao = CRM_Core_BAO_ActionSchedule::add($actionSchedule); + $actionScheduleDao = CRM_Core_BAO_ActionSchedule::writeRecord($actionSchedule); $this->assertCronRuns([ [ // On some random day, no email. @@ -2020,7 +2020,7 @@ class CRM_Core_BAO_ActionScheduleTest extends CiviUnitTestCase { $actionScheduleAfter['effective_end_date'] = '2012-06-16 02:00:00'; $actionScheduleBefore['entity_value'] = $actionScheduleOn['entity_value'] = $actionScheduleAfter['entity_value'] = $membership['membership_type_id']; foreach (['actionScheduleBefore', 'actionScheduleOn', 'actionScheduleAfter'] as $value) { - $$value = CRM_Core_BAO_ActionSchedule::add($$value); + $$value = CRM_Core_BAO_ActionSchedule::writeRecord($$value); } $this->assertCronRuns( @@ -2546,7 +2546,7 @@ class CRM_Core_BAO_ActionScheduleTest extends CiviUnitTestCase { $actionScheduleParams['entity_value'] = $membershipType->id; $actionScheduleParams['repetition_frequency_unit'] = $interval_unit; $actionScheduleParams['repetition_frequency_interval'] = 2; - $actionSchedule = CRM_Core_BAO_ActionSchedule::add($actionScheduleParams); + $actionSchedule = CRM_Core_BAO_ActionSchedule::writeRecord($actionScheduleParams); $beforeEndDate = $this->createModifiedDateTime($membershipEndDate, '-1 day'); $beforeFirstUnit = $this->createModifiedDateTime($membershipEndDate, "+1 $interval_unit"); $afterFirstUnit = $this->createModifiedDateTime($membershipEndDate, "+2 $interval_unit"); diff --git a/tests/phpunit/CRM/Core/BAO/RecurringEntityTest.php b/tests/phpunit/CRM/Core/BAO/RecurringEntityTest.php index effa449831..9b9ef44e34 100644 --- a/tests/phpunit/CRM/Core/BAO/RecurringEntityTest.php +++ b/tests/phpunit/CRM/Core/BAO/RecurringEntityTest.php @@ -87,7 +87,7 @@ class CRM_Core_BAO_RecurringEntityTest extends CiviUnitTestCase { "start_action_condition" => "monday,tuesday,wednesday,thursday,friday,saturday", "start_action_offset" => "2", ]; - $actionScheduleObj = CRM_Core_BAO_ActionSchedule::add($params); + $actionScheduleObj = CRM_Core_BAO_ActionSchedule::writeRecord($params); return $actionScheduleObj; } diff --git a/tests/phpunit/CRM/Core/BAO/UFGroupTest.php b/tests/phpunit/CRM/Core/BAO/UFGroupTest.php index d753b34072..d320f9f051 100644 --- a/tests/phpunit/CRM/Core/BAO/UFGroupTest.php +++ b/tests/phpunit/CRM/Core/BAO/UFGroupTest.php @@ -61,7 +61,7 @@ class CRM_Core_BAO_UFGroupTest extends CiviUnitTestCase { ]; $ufGroup = CRM_Core_BAO_UFGroup::add($params); $ufGroupID = $ufGroup->id; - $ufGroup = CRM_Core_BAO_UFGroup::del($ufGroupID); + $ufGroup = CRM_Core_BAO_UFGroup::deleteRecord(['id' => $ufGroupID]); // Assert that pre hook implemntation was called for delete op. $systemLogCount = $this->callAPISuccess('SystemLog', 'getcount', [ @@ -95,7 +95,7 @@ class CRM_Core_BAO_UFGroupTest extends CiviUnitTestCase { ]; $ufGroup = CRM_Core_BAO_UFGroup::add($params); $ufGroupID = $ufGroup->id; - $ufGroup = CRM_Core_BAO_UFGroup::del($ufGroupID); + $ufGroup = CRM_Core_BAO_UFGroup::deleteRecord(['id' => $ufGroupID]); // Assert that pre hook implemntation was called for delete op. $systemLogCount = $this->callAPISuccess('SystemLog', 'getcount', [ diff --git a/tests/phpunit/CRM/Financial/BAO/FinancialAccountTest.php b/tests/phpunit/CRM/Financial/BAO/FinancialAccountTest.php index 298415a094..699d07b6c7 100644 --- a/tests/phpunit/CRM/Financial/BAO/FinancialAccountTest.php +++ b/tests/phpunit/CRM/Financial/BAO/FinancialAccountTest.php @@ -33,8 +33,7 @@ class CRM_Financial_BAO_FinancialAccountTest extends CiviUnitTestCase { 'is_deductible' => 0, 'is_active' => 1, ]; - $ids = []; - $financialAccount = CRM_Financial_BAO_FinancialAccount::add($params, $ids); + $financialAccount = CRM_Financial_BAO_FinancialAccount::writeRecord($params); $result = $this->assertDBNotNull( 'CRM_Financial_BAO_FinancialAccount', @@ -56,8 +55,8 @@ class CRM_Financial_BAO_FinancialAccountTest extends CiviUnitTestCase { 'is_deductible' => 0, 'is_active' => 1, ]; - $ids = $defaults = []; - CRM_Financial_BAO_FinancialAccount::add($params); + $defaults = []; + CRM_Financial_BAO_FinancialAccount::writeRecord($params); $result = CRM_Financial_BAO_FinancialAccount::retrieve($params, $defaults); @@ -73,8 +72,7 @@ class CRM_Financial_BAO_FinancialAccountTest extends CiviUnitTestCase { 'is_deductible' => 0, 'is_active' => 1, ]; - $ids = []; - $financialAccount = CRM_Financial_BAO_FinancialAccount::add($params, $ids); + $financialAccount = CRM_Financial_BAO_FinancialAccount::writeRecord($params); $result = CRM_Financial_BAO_FinancialAccount::setIsActive($financialAccount->id, 0); $this->assertEquals($result, TRUE, 'Verify financial account record updation for is_active.'); @@ -99,7 +97,7 @@ class CRM_Financial_BAO_FinancialAccountTest extends CiviUnitTestCase { 'is_deductible' => 0, 'is_active' => 1, ]; - $financialAccount = CRM_Financial_BAO_FinancialAccount::add($params); + $financialAccount = CRM_Financial_BAO_FinancialAccount::writeRecord($params); CRM_Financial_BAO_FinancialAccount::del($financialAccount->id); $params = ['id' => $financialAccount->id]; @@ -149,8 +147,7 @@ class CRM_Financial_BAO_FinancialAccountTest extends CiviUnitTestCase { 'is_reserved' => 0, ]; - $ids = []; - $financialType = CRM_Financial_BAO_FinancialType::add($params, $ids); + $financialType = CRM_Financial_BAO_FinancialType::writeRecord($params); $financialAccountid = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialAccount', 'Donations', 'id', 'name'); CRM_Core_DAO::setFieldValue('CRM_Financial_DAO_FinancialAccount', $financialAccountid, 'accounting_code', '4800'); $accountingCode = CRM_Financial_BAO_FinancialAccount::getAccountingCode($financialType->id); diff --git a/tests/phpunit/CRM/Financial/BAO/FinancialItemTest.php b/tests/phpunit/CRM/Financial/BAO/FinancialItemTest.php index d39eeb58a7..86226a8509 100644 --- a/tests/phpunit/CRM/Financial/BAO/FinancialItemTest.php +++ b/tests/phpunit/CRM/Financial/BAO/FinancialItemTest.php @@ -185,7 +185,7 @@ class CRM_Financial_BAO_FinancialItemTest extends CiviUnitTestCase { ]; $amount = 200; - $financialAccount = CRM_Financial_BAO_FinancialAccount::add($fParams); + $financialAccount = CRM_Financial_BAO_FinancialAccount::writeRecord($fParams); $financialTrxn = new CRM_Financial_DAO_FinancialTrxn(); $financialTrxn->to_financial_account_id = $financialAccount->id; $financialTrxn->total_amount = $amount; diff --git a/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php b/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php index 29211640a4..43ded2fa23 100644 --- a/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php +++ b/tests/phpunit/CRM/Financial/BAO/FinancialTypeAccountTest.php @@ -132,11 +132,11 @@ class CRM_Financial_BAO_FinancialTypeAccountTest extends CiviUnitTestCase { 'is_reserved' => 0, 'financial_account_type_id' => array_search($financialAccountType, $financialAccountTypes), ]; - $financialAccount = CRM_Financial_BAO_FinancialAccount::add($params); + $financialAccount = CRM_Financial_BAO_FinancialAccount::writeRecord($params); $financialType = $financialAccountType = NULL; if ($relationType) { $params['name'] = 'test_financialType1'; - $financialType = CRM_Financial_BAO_FinancialType::add($params); + $financialType = CRM_Financial_BAO_FinancialType::writeRecord($params); $financialParams = [ 'entity_table' => 'civicrm_financial_type', 'entity_id' => $financialType->id, diff --git a/tests/phpunit/CRM/Member/BAO/MembershipLogTest.php b/tests/phpunit/CRM/Member/BAO/MembershipLogTest.php index 3f1aa6d8d4..d0ebb5479f 100644 --- a/tests/phpunit/CRM/Member/BAO/MembershipLogTest.php +++ b/tests/phpunit/CRM/Member/BAO/MembershipLogTest.php @@ -116,7 +116,7 @@ class CRM_Member_BAO_MembershipLogTest extends CiviUnitTestCase { */ public function testDel() { list($contactID, $membershipID) = $this->setupMembership(); - CRM_Member_BAO_MembershipLog::del($membershipID); + CRM_Member_BAO_MembershipLog::deleteRecord(['id' => $membershipID]); $this->assertDBNull('CRM_Member_BAO_MembershipLog', $membershipID, 'membership_id', 'id', 'Database check for deleted membership log.' ); diff --git a/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php b/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php index af78ef042b..cf1dd5b1f4 100644 --- a/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php +++ b/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php @@ -105,7 +105,7 @@ class CRM_Member_BAO_MembershipStatusTest extends CiviUnitTestCase { $params = ['name' => 'testStatus', 'is_active' => 1]; $membershipID = $this->callAPISuccess('MembershipStatus', 'create', $params)['id']; - CRM_Member_BAO_MembershipStatus::del($membershipID); + CRM_Member_BAO_MembershipStatus::deleteRecord(['id' => $membershipID]); $defaults = []; $result = CRM_Member_BAO_MembershipStatus::retrieve($params, $defaults); $this->assertEquals($result === NULL, TRUE, 'Verify membership status record deletion.'); diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php index ae87412c1d..b9a4a5ffa6 100644 --- a/tests/phpunit/CiviTest/CiviUnitTestCase.php +++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php @@ -556,18 +556,6 @@ class CiviUnitTestCase extends PHPUnit\Framework\TestCase { return $entity = $this->callAPISuccess($this->entity, 'create', $this->params); } - /** - * @param int $contactTypeId - * - * @throws Exception - */ - public function contactTypeDelete($contactTypeId) { - $result = CRM_Contact_BAO_ContactType::del($contactTypeId); - if (!$result) { - throw new Exception('Could not delete contact type'); - } - } - /** * @param array $params * -- 2.25.1