From 9f73e72e43f3ee9e160d59bb06d68410355f3ff2 Mon Sep 17 00:00:00 2001 From: Bradley Taylor Date: Thu, 12 Jan 2023 19:20:02 +0000 Subject: [PATCH] Improve capitalisation of softContribution variables --- tests/phpunit/api/v3/ContributionSoftTest.php | 106 +++++++++--------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/tests/phpunit/api/v3/ContributionSoftTest.php b/tests/phpunit/api/v3/ContributionSoftTest.php index 4b49bcde60..f8c8892a80 100644 --- a/tests/phpunit/api/v3/ContributionSoftTest.php +++ b/tests/phpunit/api/v3/ContributionSoftTest.php @@ -83,39 +83,39 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { 'soft_credit_type_id' => 4, ]; - $softcontribution = $this->callAPISuccess('contribution_soft', 'create', $p); + $softContribution = $this->callAPISuccess('contribution_soft', 'create', $p); $params = [ - 'id' => $softcontribution['id'], + 'id' => $softContribution['id'], ]; - $softcontribution = $this->callAPIAndDocument('contribution_soft', 'get', $params, __FUNCTION__, __FILE__); - $this->assertEquals(1, $softcontribution['count']); - $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']]['currency'], 'USD'); - $this->assertEquals($softcontribution['values'][$softcontribution['id']]['soft_credit_type_id'], 4); + $softContribution = $this->callAPIAndDocument('contribution_soft', 'get', $params, __FUNCTION__, __FILE__); + $this->assertEquals(1, $softContribution['count']); + $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']]['currency'], 'USD'); + $this->assertEquals($softContribution['values'][$softContribution['id']]['soft_credit_type_id'], 4); //create a second soft contribution on the same hard contribution - we are testing that 'id' gets the right soft contribution id (not the contribution id) $p['contact_id'] = $this->_softIndividual2Id; - $softcontribution2 = $this->callAPISuccess('contribution_soft', 'create', $p); + $softContribution2 = $this->callAPISuccess('contribution_soft', 'create', $p); // now we have 2 - test getcount - $softcontributionCount = $this->callAPISuccess('contribution_soft', 'getcount', []); - $this->assertEquals(2, $softcontributionCount); + $softContributionCount = $this->callAPISuccess('contribution_soft', 'getcount', []); + $this->assertEquals(2, $softContributionCount); //check first contribution $result = $this->callAPISuccess('contribution_soft', 'get', [ - 'id' => $softcontribution['id'], + 'id' => $softContribution['id'], ]); $this->assertEquals(1, $result['count']); - $this->assertEquals($softcontribution['id'], $result['id']); + $this->assertEquals($softContribution['id'], $result['id']); //test id only format - second soft credit $resultID2 = $this->callAPISuccess('contribution_soft', 'get', [ - 'id' => $softcontribution2['id'], + 'id' => $softContribution2['id'], 'format.only_id' => 1, ]); - $this->assertEquals($softcontribution2['id'], $resultID2); + $this->assertEquals($softContribution2['id'], $resultID2); //test get by contact id works $result = $this->callAPISuccess('contribution_soft', 'get', [ @@ -124,17 +124,17 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { $this->assertEquals(1, $result['count']); $this->callAPISuccess('contribution_soft', 'Delete', [ - 'id' => $softcontribution['id'], + 'id' => $softContribution['id'], ]); // check one soft credit remains $expectedCount = 1; $this->callAPISuccess('contribution_soft', 'getcount', [], $expectedCount); //check id is same as 2 - $this->assertEquals($softcontribution2['id'], $this->callAPISuccess('contribution_soft', 'getvalue', ['return' => 'id'])); + $this->assertEquals($softContribution2['id'], $this->callAPISuccess('contribution_soft', 'getvalue', ['return' => 'id'])); $this->callAPISuccess('ContributionSoft', 'Delete', [ - 'id' => $softcontribution2['id'], + 'id' => $softContribution2['id'], ]); } @@ -191,12 +191,12 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { 'soft_credit_type_id' => 5, ]; - $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'); - $this->assertEquals($softcontribution['values'][$softcontribution['id']]['currency'], 'USD'); - $this->assertEquals($softcontribution['values'][$softcontribution['id']]['soft_credit_type_id'], 5); + $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'); + $this->assertEquals($softContribution['values'][$softContribution['id']]['currency'], 'USD'); + $this->assertEquals($softContribution['values'][$softContribution['id']]['soft_credit_type_id'], 5); } /** @@ -213,21 +213,21 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { 'soft_credit_type_id' => 6, ]; - $softcontribution = $this->callAPISuccess('contribution_soft', 'create', $params); - $softcontributionID = $softcontribution['id']; + $softContribution = $this->callAPISuccess('contribution_soft', 'create', $params); + $softContributionID = $softContribution['id']; $old_params = [ - 'contribution_soft_id' => $softcontributionID, + 'contribution_soft_id' => $softContributionID, ]; $original = $this->callAPISuccess('contribution_soft', 'get', $old_params); //Make sure it came back - $this->assertEquals($original['id'], $softcontributionID); + $this->assertEquals($original['id'], $softContributionID); //set up list of old params, verify - $old_contribution_id = $original['values'][$softcontributionID]['contribution_id']; - $old_contact_id = $original['values'][$softcontributionID]['contact_id']; - $old_amount = $original['values'][$softcontributionID]['amount']; - $old_currency = $original['values'][$softcontributionID]['currency']; - $old_soft_credit_type_id = $original['values'][$softcontributionID]['soft_credit_type_id']; + $old_contribution_id = $original['values'][$softContributionID]['contribution_id']; + $old_contact_id = $original['values'][$softContributionID]['contact_id']; + $old_amount = $original['values'][$softContributionID]['amount']; + $old_currency = $original['values'][$softContributionID]['currency']; + $old_soft_credit_type_id = $original['values'][$softContributionID]['soft_credit_type_id']; //check against original values $this->assertEquals($old_contribution_id, $this->_contributionId); @@ -236,7 +236,7 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { $this->assertEquals($old_currency, 'USD'); $this->assertEquals($old_soft_credit_type_id, 6); $params = [ - 'id' => $softcontributionID, + 'id' => $softContributionID, 'contribution_id' => $this->_contributionId, 'contact_id' => $this->_softIndividual1Id, 'amount' => 7.00, @@ -244,21 +244,21 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { 'soft_credit_type_id' => 7, ]; - $softcontribution = $this->callAPISuccess('contribution_soft', 'create', $params); + $softContribution = $this->callAPISuccess('contribution_soft', 'create', $params); $new_params = [ - 'id' => $softcontribution['id'], + 'id' => $softContribution['id'], ]; - $softcontribution = $this->callAPISuccess('contribution_soft', 'get', $new_params); + $softContribution = $this->callAPISuccess('contribution_soft', 'get', $new_params); //check against original values - $this->assertEquals($softcontribution['values'][$softcontributionID]['contribution_id'], $this->_contributionId); - $this->assertEquals($softcontribution['values'][$softcontributionID]['contact_id'], $this->_softIndividual1Id); - $this->assertEquals($softcontribution['values'][$softcontributionID]['amount'], 7.00); - $this->assertEquals($softcontribution['values'][$softcontributionID]['currency'], 'CAD'); - $this->assertEquals($softcontribution['values'][$softcontributionID]['soft_credit_type_id'], 7); + $this->assertEquals($softContribution['values'][$softContributionID]['contribution_id'], $this->_contributionId); + $this->assertEquals($softContribution['values'][$softContributionID]['contact_id'], $this->_softIndividual1Id); + $this->assertEquals($softContribution['values'][$softContributionID]['amount'], 7.00); + $this->assertEquals($softContribution['values'][$softContributionID]['currency'], 'CAD'); + $this->assertEquals($softContribution['values'][$softContributionID]['soft_credit_type_id'], 7); $params = [ - 'id' => $softcontributionID, + 'id' => $softContributionID, ]; $this->callAPISuccess('contribution_soft', 'delete', $params); } @@ -288,10 +288,10 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { 'currency' => 'USD', ]; - $softcontribution = $this->callAPISuccess('contribution_soft', 'create', $params); - $softcontributionID = $softcontribution['id']; + $softContribution = $this->callAPISuccess('contribution_soft', 'create', $params); + $softContributionID = $softContribution['id']; $params = [ - 'id' => $softcontributionID, + 'id' => $softContributionID, ]; $this->callAPIAndDocument('contribution_soft', 'delete', $params, __FUNCTION__, __FILE__); } @@ -309,11 +309,11 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { 'amount' => 10.00, 'currency' => 'USD', ]; - $softcontribution = $this->callAPISuccess('contribution_soft', 'create', $p); + $softContribution = $this->callAPISuccess('contribution_soft', 'create', $p); $result = $this->callAPISuccess('contribution_soft', 'get', []); // We're taking the first element. - $res = $result['values'][$softcontribution['id']]; + $res = $result['values'][$softContribution['id']]; $this->assertEquals($p['contribution_id'], $res['contribution_id']); $this->assertEquals($p['contact_id'], $res['contact_id']); @@ -331,7 +331,7 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { 'amount' => 10.00, 'currency' => 'USD', ]; - $softcontribution1 = $this->callAPISuccess('contribution_soft', 'create', $p1); + $softContribution1 = $this->callAPISuccess('contribution_soft', 'create', $p1); $p2 = [ 'contribution_id' => $this->_contributionId, @@ -339,13 +339,13 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { 'amount' => 25.00, 'currency' => 'CAD', ]; - $softcontribution2 = $this->callAPISuccess('contribution_soft', 'create', $p2); + $softContribution2 = $this->callAPISuccess('contribution_soft', 'create', $p2); $params = [ - 'id' => $softcontribution2['id'], + 'id' => $softContribution2['id'], ]; $result = $this->callAPISuccess('contribution_soft', 'get', $params); - $res = $result['values'][$softcontribution2['id']]; + $res = $result['values'][$softContribution2['id']]; $this->assertEquals($p2['contribution_id'], $res['contribution_id']); $this->assertEquals($p2['contact_id'], $res['contact_id']); -- 2.25.1