From 66e83bf5ce1e33c2f43ae55f5308615892274809 Mon Sep 17 00:00:00 2001 From: eileenmcnaughton Date: Wed, 8 Jul 2015 08:39:58 +0000 Subject: [PATCH] test fix, reflect changed BAO function in test, note this function is also tested through form submit functions - e.g CRM_Member_Form_MembershipTest --- .../phpunit/CRM/Member/BAO/MembershipTest.php | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/phpunit/CRM/Member/BAO/MembershipTest.php b/tests/phpunit/CRM/Member/BAO/MembershipTest.php index 0b81f4f9e6..216af39945 100644 --- a/tests/phpunit/CRM/Member/BAO/MembershipTest.php +++ b/tests/phpunit/CRM/Member/BAO/MembershipTest.php @@ -519,20 +519,21 @@ class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase { $config = CRM_Core_Config::singleton(); $config->keyDisable = TRUE; - $membershipRenewal = new CRM_Core_Form(); - $membershipRenewal->controller = new CRM_Core_Controller(); $isTestMembership = 0; - $MembershipRenew = CRM_Member_BAO_Membership::renewMembership( + list($MembershipRenew) = CRM_Member_BAO_Membership::renewMembership( $contactId, $this->_membershipTypeID, $isTestMembership, - $membershipRenewal, NULL, NULL, NULL, 1, + FALSE, + NULL, + NULL, + FALSE, NULL, - FALSE + NULL ); $endDate = date("Y-m-d", strtotime($membership->end_date . " +1 year")); @@ -606,7 +607,7 @@ class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase { $membershipRenewal = new CRM_Core_Form(); $membershipRenewal->controller = new CRM_Core_Controller(); - $MembershipRenew = CRM_Member_BAO_Membership::renewMembership( + list($MembershipRenew) = CRM_Member_BAO_Membership::renewMembership( $contactId, $this->_membershipTypeID, FALSE, @@ -616,8 +617,11 @@ class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase { NULL, 1, NULL, - FALSE - ); + NULL, + NULL, + FALSE, + NULL + ); $this->assertDBNotNull('CRM_Member_BAO_MembershipLog', $MembershipRenew->id, -- 2.25.1