From c1265fe76a0e25260feb91acf4143ad11fef7691 Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 16 Apr 2020 18:04:27 +1200 Subject: [PATCH] [NFC] Remove all the places where tests unnecessarily pass to Membership::create The param is deprecated - no reasonn to pass in the tests --- .../phpunit/CRM/Member/BAO/MembershipTest.php | 44 +++++++++---------- .../CRM/Member/BAO/MembershipTypeTest.php | 4 +- tests/phpunit/api/v3/MembershipTest.php | 6 +-- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/tests/phpunit/CRM/Member/BAO/MembershipTest.php b/tests/phpunit/CRM/Member/BAO/MembershipTest.php index f8b57375eb66..8e0307e799d6 100644 --- a/tests/phpunit/CRM/Member/BAO/MembershipTest.php +++ b/tests/phpunit/CRM/Member/BAO/MembershipTest.php @@ -131,6 +131,7 @@ public function testCreate() { // Now call create() to modify an existing Membership $params = [ + 'id' => $membershipId, 'contact_id' => $contactId, 'membership_type_id' => $this->_membershipTypeID, 'join_date' => date('Ymd', strtotime('2006-01-21')), @@ -140,10 +141,7 @@ public function testCreate() { 'is_override' => 1, 'status_id' => $this->_membershipStatusID, ]; - $ids = [ - 'membership' => $membershipId, - ]; - CRM_Member_BAO_Membership::create($params, $ids); + CRM_Member_BAO_Membership::create($params); $membershipTypeId = $this->assertDBNotNull('CRM_Member_BAO_Membership', $contactId, 'membership_type_id', 'contact_id', @@ -176,8 +174,7 @@ public function testGetValues() { 'status_id' => $this->_membershipStatusID, ]; - $ids = []; - CRM_Member_BAO_Membership::create($params, $ids); + CRM_Member_BAO_Membership::create($params); $membershipId1 = $this->assertDBNotNull('CRM_Member_BAO_Membership', $contactId, 'id', 'contact_id', 'Database check for created membership.' @@ -193,8 +190,8 @@ public function testGetValues() { 'is_override' => 0, 'status_id' => $this->_membershipStatusID, ]; - $ids = []; - CRM_Member_BAO_Membership::create($params, $ids); + + CRM_Member_BAO_Membership::create($params); $membershipId2 = $this->assertDBNotNull('CRM_Member_BAO_Membership', 'source123', 'id', 'source', 'Database check for created membership.' @@ -237,8 +234,8 @@ public function testActiveMembers() { 'is_override' => 1, 'status_id' => $this->_membershipStatusID, ]; - $ids = []; - CRM_Member_BAO_Membership::create($params, $ids); + + CRM_Member_BAO_Membership::create($params); $membershipId1 = $this->assertDBNotNull('CRM_Member_BAO_Membership', $contactId, 'id', 'contact_id', 'Database check for created membership.' @@ -259,8 +256,8 @@ public function testActiveMembers() { 'is_override' => 1, 'status_id' => $this->_membershipStatusID, ]; - $ids = []; - CRM_Member_BAO_Membership::create($params, $ids); + + CRM_Member_BAO_Membership::create($params); $membershipId2 = $this->assertDBNotNull('CRM_Member_BAO_Membership', 'PaySource', 'id', 'source', 'Database check for created membership.' @@ -410,8 +407,8 @@ public function testRenewMembership() { 'is_override' => 1, 'status_id' => $this->_membershipStatusID, ]; - $ids = []; - $membership = CRM_Member_BAO_Membership::create($params, $ids); + + $membership = CRM_Member_BAO_Membership::create($params); $membershipId = $this->assertDBNotNull('CRM_Member_BAO_Membership', $contactId, 'id', 'contact_id', 'Database check for created membership.' ); @@ -480,8 +477,7 @@ public function testStaleMembership() { 'status_id' => $statusId, ]; - $ids = []; - $membership = CRM_Member_BAO_Membership::create($params, $ids); + $membership = CRM_Member_BAO_Membership::create($params); $membershipId = $this->assertDBNotNull('CRM_Member_BAO_Membership', $contactId, 'id', 'contact_id', 'Database check for created membership.' @@ -551,8 +547,8 @@ public function testUpdateAllMembershipStatusConvertExpiredOverriddenStatusToNor 'status_override_end_date' => date('Ymd', strtotime('-1 day')), 'status_id' => $this->_membershipStatusID, ]; - $ids = []; - $createdMembership = CRM_Member_BAO_Membership::create($params, $ids); + + $createdMembership = CRM_Member_BAO_Membership::create($params); CRM_Member_BAO_Membership::updateAllMembershipStatus(); @@ -579,8 +575,8 @@ public function testUpdateAllMembershipStatusHandleOverriddenWithEndOverrideDate 'status_override_end_date' => date('Ymd', time()), 'status_id' => $this->_membershipStatusID, ]; - $ids = []; - $createdMembership = CRM_Member_BAO_Membership::create($params, $ids); + + $createdMembership = CRM_Member_BAO_Membership::create($params); CRM_Member_BAO_Membership::updateAllMembershipStatus(); @@ -606,8 +602,8 @@ public function testUpdateAllMembershipStatusDoesNotConvertOverridenMembershipWi 'is_override' => 1, 'status_id' => $this->_membershipStatusID, ]; - $ids = []; - $createdMembership = CRM_Member_BAO_Membership::create($params, $ids); + + $createdMembership = CRM_Member_BAO_Membership::create($params); CRM_Member_BAO_Membership::updateAllMembershipStatus(); @@ -821,8 +817,8 @@ protected function setupMembership(): array { 'is_override' => 1, 'status_id' => $this->_membershipStatusID, ]; - $ids = []; - CRM_Member_BAO_Membership::create($params, $ids); + + CRM_Member_BAO_Membership::create($params); $membershipId = $this->assertDBNotNull('CRM_Member_BAO_Membership', $contactId, 'id', 'contact_id', 'Database check for created membership.' diff --git a/tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php b/tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php index ab848b86512c..45f9178dbf1a 100644 --- a/tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php +++ b/tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php @@ -308,8 +308,8 @@ public function testGetRenewalDatesForMembershipType() { 'is_override' => 1, 'status_id' => $this->_membershipStatusID, ]; - $ids = []; - $membership = CRM_Member_BAO_Membership::create($params, $ids); + + $membership = CRM_Member_BAO_Membership::create($params); $membershipRenewDates = CRM_Member_BAO_MembershipType::getRenewalDatesForMembershipType($membership->id); diff --git a/tests/phpunit/api/v3/MembershipTest.php b/tests/phpunit/api/v3/MembershipTest.php index 2cb970ff0d53..5d0bc095107f 100644 --- a/tests/phpunit/api/v3/MembershipTest.php +++ b/tests/phpunit/api/v3/MembershipTest.php @@ -1169,6 +1169,8 @@ public function testEmptyStartEndDateFixedMultiYear() { /** * CRM-18503 - Test membership join date is correctly set for fixed memberships. + * + * @throws \CRM_Core_Exception */ public function testMembershipJoinDateFixed() { $memStatus = CRM_Member_PseudoConstant::membershipStatus(); @@ -1185,9 +1187,7 @@ public function testMembershipJoinDateFixed() { 'skipStatusCal' => 1, 'is_for_organization' => 1, ]; - // @todo stop passing empty $ids - $ids = []; - $membership = CRM_Member_BAO_Membership::create($params, $ids); + $membership = CRM_Member_BAO_Membership::create($params); // Update membership to 'Completed' and check the dates. $memParams = [