From 3e607ed6d9f7f2f73ab07d40a2d115f409edfa44 Mon Sep 17 00:00:00 2001 From: eileenmcnaugton Date: Thu, 26 Nov 2015 10:24:36 +1300 Subject: [PATCH] Synchronize test classes from master Add extra functions & change contributionCreate signature in 4.6 to match master --- .../CRM/Core/BAO/FinancialTrxnTest.php | 2 +- .../CRM/Core/Payment/AuthorizeNetIPNTest.php | 20 ++-- tests/phpunit/CRM/Financial/Page/AjaxTest.php | 2 +- tests/phpunit/CiviTest/CiviUnitTestCase.php | 104 ++++++++++++++---- tests/phpunit/api/v3/ContributionSoftTest.php | 64 +++++------ tests/phpunit/api/v3/ContributionTest.php | 10 +- .../phpunit/api/v3/ParticipantPaymentTest.php | 41 +++---- tests/phpunit/api/v3/PledgePaymentTest.php | 5 +- .../api/v3/TaxContributionPageTest.php | 50 ++++----- 9 files changed, 180 insertions(+), 118 deletions(-) diff --git a/tests/phpunit/CRM/Core/BAO/FinancialTrxnTest.php b/tests/phpunit/CRM/Core/BAO/FinancialTrxnTest.php index 299d6db6cc..d22a2ea6c6 100644 --- a/tests/phpunit/CRM/Core/BAO/FinancialTrxnTest.php +++ b/tests/phpunit/CRM/Core/BAO/FinancialTrxnTest.php @@ -41,7 +41,7 @@ class CRM_Core_BAO_FinancialTrxnTest extends CiviUnitTestCase { public function testCreate() { $contactId = $this->individualCreate(); $financialTypeId = 1; - $contributionId = $this->contributionCreate($contactId, $financialTypeId); + $this->contributionCreate(array('contact_id' => $contactId), $financialTypeId); $params = array( 'contribution_id' => $financialTypeId, 'to_financial_account_id' => 1, diff --git a/tests/phpunit/CRM/Core/Payment/AuthorizeNetIPNTest.php b/tests/phpunit/CRM/Core/Payment/AuthorizeNetIPNTest.php index 20997d1628..b8c1a1ff1a 100644 --- a/tests/phpunit/CRM/Core/Payment/AuthorizeNetIPNTest.php +++ b/tests/phpunit/CRM/Core/Payment/AuthorizeNetIPNTest.php @@ -16,9 +16,7 @@ class CRM_Core_Payment_AuthorizeNetIPNTest extends CiviUnitTestCase { public function setUp() { parent::setUp(); - $this->_paymentProcessorID = $this->paymentProcessorCreate(array( - 'payment_processor_type_id' => 'AuthNet', - )); + $this->_paymentProcessorID = $this->paymentProcessorAuthorizeNetCreate(array('is_test' => 0)); $this->_contactID = $this->individualCreate(); $contributionPage = $this->callAPISuccess('contribution_page', 'create', array( 'title' => "Test Contribution Page", @@ -38,8 +36,8 @@ class CRM_Core_Payment_AuthorizeNetIPNTest extends CiviUnitTestCase { */ public function testIPNPaymentRecurSuccess() { $this->setupRecurringPaymentProcessorTransaction(); - $paypalIPN = new CRM_Core_Payment_AuthorizeNetIPN($this->getRecurTransaction()); - $paypalIPN->main(); + $IPN = new CRM_Core_Payment_AuthorizeNetIPN($this->getRecurTransaction()); + $IPN->main(); $contribution = $this->callAPISuccess('contribution', 'getsingle', array('id' => $this->_contributionID)); $this->assertEquals(1, $contribution['contribution_status_id']); $this->assertEquals('6511143069', $contribution['trxn_id']); @@ -47,8 +45,8 @@ class CRM_Core_Payment_AuthorizeNetIPNTest extends CiviUnitTestCase { $this->assertTrue(substr($contribution['contribution_source'], 0, 20) == "Online Contribution:"); $contributionRecur = $this->callAPISuccess('contribution_recur', 'getsingle', array('id' => $this->_contributionRecurID)); $this->assertEquals(5, $contributionRecur['contribution_status_id']); - $paypalIPN = new CRM_Core_Payment_AuthorizeNetIPN($this->getRecurSubsequentTransaction()); - $paypalIPN->main(); + $IPN = new CRM_Core_Payment_AuthorizeNetIPN($this->getRecurSubsequentTransaction()); + $IPN->main(); $contribution = $this->callAPISuccess('contribution', 'get', array( 'contribution_recur_id' => $this->_contributionRecurID, 'sequential' => 1, @@ -62,8 +60,8 @@ class CRM_Core_Payment_AuthorizeNetIPNTest extends CiviUnitTestCase { */ public function testIPNPaymentMembershipRecurSuccess() { $this->setupMembershipRecurringPaymentProcessorTransaction(); - $paypalIPN = new CRM_Core_Payment_AuthorizeNetIPN($this->getRecurTransaction()); - $paypalIPN->main(); + $IPN = new CRM_Core_Payment_AuthorizeNetIPN($this->getRecurTransaction()); + $IPN->main(); $contribution = $this->callAPISuccess('contribution', 'getsingle', array('id' => $this->_contributionID)); $this->assertEquals(1, $contribution['contribution_status_id']); $this->assertEquals('6511143069', $contribution['trxn_id']); @@ -71,8 +69,8 @@ class CRM_Core_Payment_AuthorizeNetIPNTest extends CiviUnitTestCase { $this->assertTrue(substr($contribution['contribution_source'], 0, 20) == "Online Contribution:"); $contributionRecur = $this->callAPISuccess('contribution_recur', 'getsingle', array('id' => $this->_contributionRecurID)); $this->assertEquals(5, $contributionRecur['contribution_status_id']); - $paypalIPN = new CRM_Core_Payment_AuthorizeNetIPN($this->getRecurSubsequentTransaction()); - $paypalIPN->main(); + $IPN = new CRM_Core_Payment_AuthorizeNetIPN($this->getRecurSubsequentTransaction()); + $IPN->main(); $contribution = $this->callAPISuccess('contribution', 'get', array( 'contribution_recur_id' => $this->_contributionRecurID, 'sequential' => 1, diff --git a/tests/phpunit/CRM/Financial/Page/AjaxTest.php b/tests/phpunit/CRM/Financial/Page/AjaxTest.php index 645d1736ad..30735b2225 100644 --- a/tests/phpunit/CRM/Financial/Page/AjaxTest.php +++ b/tests/phpunit/CRM/Financial/Page/AjaxTest.php @@ -38,7 +38,7 @@ class CRM_Financial_Page_AjaxTest extends CiviUnitTestCase { */ public function testGetFinancialTransactionsList() { $individualID = $this->individualCreate(); - $this->contributionCreate($individualID); + $this->contributionCreate(array('contact_id' => $individualID)); $batch = $this->callAPISuccess('Batch', 'create', array('title' => 'test', 'status_id' => 'Open')); CRM_Core_DAO::executeQuery(" INSERT INTO civicrm_entity_batch (entity_table, entity_id, batch_id) diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php index bb9fe05020..66a45add0b 100755 --- a/tests/phpunit/CiviTest/CiviUnitTestCase.php +++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php @@ -1439,6 +1439,35 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase { return $result['id']; } + /** + * Create test Authorize.net instance. + * + * @param array $params + * + * @return mixed + */ + public function paymentProcessorAuthorizeNetCreate($params = array()) { + $params = array_merge(array( + 'name' => 'Authorize', + 'domain_id' => CRM_Core_Config::domainID(), + 'payment_processor_type_id' => 'AuthNet', + 'title' => 'AuthNet', + 'is_active' => 1, + 'is_default' => 0, + 'is_test' => 1, + 'is_recur' => 1, + 'user_name' => '4y5BfuW7jm', + 'password' => '4cAmW927n8uLf5J8', + 'url_site' => 'https://test.authorize.net/gateway/transact.dll', + 'url_recur' => 'https://apitest.authorize.net/xml/v1/request.api', + 'class_name' => 'Payment_AuthorizeNet', + 'billing_mode' => 1, + ), $params); + + $result = $this->callAPISuccess('PaymentProcessor', 'create', $params); + return $result['id']; + } + /** * Create Participant. * @@ -1474,7 +1503,7 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase { * Create Payment Processor. * * @return CRM_Financial_DAO_PaymentProcessor - * instance of Payment Processsor + * instance of Payment Processor */ public function processorCreate() { $processorParams = array( @@ -1492,6 +1521,20 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase { return $paymentProcessor; } + + /** + * Create Payment Processor. + * + * @param array $processorParams + * + * @return \CRM_Core_Payment_Dummy + * Instance of Dummy Payment Processor + */ + public function dummyProcessorCreate($processorParams = array()) { + $paymentProcessorID = $this->processorCreate($processorParams); + return Civi\Payment\System::singleton()->getById($paymentProcessorID); + } + /** * Create contribution page. * @@ -1515,6 +1558,17 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase { return $contributionPage; } + /** + * Create a sample batch. + */ + public function batchCreate() { + $params = $this->_params; + $params['name'] = $params['title'] = 'Batch_433397'; + $params['status_id'] = 1; + $result = $this->callAPISuccess('batch', 'create', $params); + return $result['id']; + } + /** * Create Tag. * @@ -1606,38 +1660,34 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase { /** * Create contribution. * - * @param int $cID - * Contact_id. + * @param array $params + * Array of parameters. * @param int $cTypeID * Id of financial type. * @param int $invoiceID * @param int $trxnID * @param int $paymentInstrumentID - * @param bool $isFee * * @return int * id of created contribution */ - public function contributionCreate($cID, $cTypeID = 1, $invoiceID = 67890, $trxnID = 12345, $paymentInstrumentID = 1, $isFee = TRUE) { - $params = array( + public function contributionCreate($params, $cTypeID = 1, $invoiceID = 67890, $trxnID = 12345, + $paymentInstrumentID = 1) { + + $params = array_merge(array( 'domain_id' => 1, - 'contact_id' => $cID, 'receive_date' => date('Ymd'), 'total_amount' => 100.00, - 'financial_type_id' => empty($cTypeID) ? 1 : $cTypeID, + 'fee_amount' => 5.00, + 'net_ammount' => 95.00, + 'financial_type_id' => $cTypeID, 'payment_instrument_id' => empty($paymentInstrumentID) ? 1 : $paymentInstrumentID, 'non_deductible_amount' => 10.00, 'trxn_id' => $trxnID, 'invoice_id' => $invoiceID, 'source' => 'SSF', 'contribution_status_id' => 1, - // 'note' => 'Donating for Nobel Cause', *Fixme - ); - - if ($isFee) { - $params['fee_amount'] = 5.00; - $params['net_amount'] = 95.00; - } + ), $params); $result = $this->callAPISuccess('contribution', 'create', $params); return $result['id']; @@ -1719,7 +1769,7 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase { 'registration_end_date' => 20081015, 'max_participants' => 100, 'event_full_text' => 'Sorry! We are already full', - 'is_monetory' => 0, + 'is_monetary' => 0, 'is_active' => 1, 'is_show_location' => 0, ), $params); @@ -2322,7 +2372,7 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase { * @param string $description * Descriptive text for the example file. * @param string $exampleName - * Name for this example file (CamelCase) - if ommitted the action name will be substituted. + * Name for this example file (CamelCase) - if omitted the action name will be substituted. */ private function documentMe($entity, $action, $params, $result, $testFunction, $testFile, $description = "", $exampleName = NULL) { if (defined('DONT_DOCUMENT_TEST_CONFIG') && DONT_DOCUMENT_TEST_CONFIG) { @@ -2571,8 +2621,11 @@ AND ( TABLE_NAME LIKE 'civicrm_value_%' ) */ public function quickCleanUpFinancialEntities() { $tablesToTruncate = array( + 'civicrm_activity', + 'civicrm_activity_contact', 'civicrm_contribution', 'civicrm_contribution_soft', + 'civicrm_contribution_product', 'civicrm_financial_trxn', 'civicrm_financial_item', 'civicrm_contribution_recur', @@ -2602,6 +2655,7 @@ AND ( TABLE_NAME LIKE 'civicrm_value_%' ) } public function restoreDefaultPriceSetConfig() { + CRM_Core_DAO::executeQuery('DELETE FROM civicrm_price_set WHERE id > 2'); CRM_Core_DAO::executeQuery("INSERT INTO `civicrm_price_field` (`id`, `price_set_id`, `name`, `label`, `html_type`, `is_enter_qty`, `help_pre`, `help_post`, `weight`, `is_display_amounts`, `options_per_line`, `is_active`, `is_required`, `active_on`, `expire_on`, `javascript`, `visibility_id`) VALUES (1, 1, 'contribution_amount', 'Contribution Amount', 'Text', 0, NULL, NULL, 1, 1, 1, 1, 1, NULL, NULL, NULL, 1)"); CRM_Core_DAO::executeQuery("INSERT INTO `civicrm_price_field_value` (`id`, `price_field_id`, `name`, `label`, `description`, `amount`, `count`, `max_value`, `weight`, `membership_type_id`, `membership_num_terms`, `is_default`, `is_active`, `financial_type_id`, `deductible_amount`) VALUES (1, 1, 'contribution_amount', 'Contribution Amount', NULL, '1', NULL, NULL, 1, NULL, NULL, 0, 1, 1, 0.00)"); } @@ -2609,7 +2663,7 @@ AND ( TABLE_NAME LIKE 'civicrm_value_%' ) * Function does a 'Get' on the entity & compares the fields in the Params with those returned * Default behaviour is to also delete the entity * @param array $params - * Params array to check agains. + * Params array to check against. * @param int $id * Id of the entity concerned. * @param string $entity @@ -3024,6 +3078,8 @@ AND ( TABLE_NAME LIKE 'civicrm_value_%' ) * $this->createLoggedInUser(); * $this->_permissionedDisabledGroup = $this->groupCreate(array('title' => 'pick-me-disabled', 'is_active' => 0, 'name' => 'pick-me-disabled')); * $this->_permissionedGroup = $this->groupCreate(array('title' => 'pick-me-active', 'is_active' => 1, 'name' => 'pick-me-active')); + * + * @param bool $isProfile */ public function setupACL($isProfile = FALSE) { global $_REQUEST; @@ -3133,7 +3189,7 @@ AND ( TABLE_NAME LIKE 'civicrm_value_%' ) * @todo this isn't a great place to put it - but really it belongs on a class that extends * this parent class & we don't have a structure for that yet * There is another function to this effect on the PaypalPro test but it appears to be silently failing - * & the best protection agains that is the functions this class affords + * & the best protection against that is the functions this class affords * @param array $params * @return int $result['id'] payment processor id */ @@ -3190,6 +3246,7 @@ AND ( TABLE_NAME LIKE 'civicrm_value_%' ) 'contact_id' => $this->_contactID, 'contribution_page_id' => $this->_contributionPageID, 'payment_processor_id' => $this->_paymentProcessorID, + 'is_test' => 0, ), )); $this->_contributionRecurID = $contributionRecur['id']; @@ -3202,7 +3259,10 @@ AND ( TABLE_NAME LIKE 'civicrm_value_%' ) public function setupMembershipRecurringPaymentProcessorTransaction() { $this->ids['membership_type'] = $this->membershipTypeCreate(); //create a contribution so our membership & contribution don't both have id = 1 - $this->contributionCreate($this->_contactID, 1, 'abcd', '345j'); + $this->contributionCreate(array( + 'contact_id' => $this->_contactID, + 'is_test' => 1), + 1, 'abcd', '345j'); $this->setupRecurringPaymentProcessorTransaction(); $this->ids['membership'] = $this->callAPISuccess('membership', 'create', array( @@ -3305,7 +3365,9 @@ AND ( TABLE_NAME LIKE 'civicrm_value_%' ) } /** - * @param $exists + * Assert the attachment exists. + * + * @param bool $exists * @param array $apiResult */ protected function assertAttachmentExistence($exists, $apiResult) { diff --git a/tests/phpunit/api/v3/ContributionSoftTest.php b/tests/phpunit/api/v3/ContributionSoftTest.php index bbe03ca813..fe374aafbd 100644 --- a/tests/phpunit/api/v3/ContributionSoftTest.php +++ b/tests/phpunit/api/v3/ContributionSoftTest.php @@ -56,7 +56,7 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { $this->_individualId = $this->individualCreate(); $this->_softIndividual1Id = $this->individualCreate(); $this->_softIndividual2Id = $this->individualCreate(); - $this->_contributionId = $this->contributionCreate($this->_individualId); + $this->_contributionId = $this->contributionCreate(array('contact_id' => $this->_individualId)); $paymentProcessor = $this->processorCreate(); $this->_params = array( @@ -103,11 +103,11 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { ); $softcontribution = $this->callAPIAndDocument('contribution_soft', 'get', $params, __FUNCTION__, __FILE__); $this->assertEquals(1, $softcontribution['count']); - $this->assertEquals($softcontribution['values'][$this->_softcontribution['id']]['contribution_id'], $this->_contributionId, 'In line ' . __LINE__); - $this->assertEquals($softcontribution['values'][$this->_softcontribution['id']]['contact_id'], $this->_softIndividual1Id, 'In line ' . __LINE__); - $this->assertEquals($softcontribution['values'][$this->_softcontribution['id']]['amount'], '10.00', 'In line ' . __LINE__); - $this->assertEquals($softcontribution['values'][$this->_softcontribution['id']]['currency'], 'USD', 'In line ' . __LINE__); - $this->assertEquals($softcontribution['values'][$this->_softcontribution['id']]['soft_credit_type_id'], 4, 'In line ' . __LINE__); + $this->assertEquals($softcontribution['values'][$this->_softcontribution['id']]['contribution_id'], $this->_contributionId); + $this->assertEquals($softcontribution['values'][$this->_softcontribution['id']]['contact_id'], $this->_softIndividual1Id); + $this->assertEquals($softcontribution['values'][$this->_softcontribution['id']]['amount'], '10.00'); + $this->assertEquals($softcontribution['values'][$this->_softcontribution['id']]['currency'], 'USD'); + $this->assertEquals($softcontribution['values'][$this->_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; @@ -121,7 +121,7 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { $result = $this->callAPISuccess('contribution_soft', 'get', array( 'id' => $this->_softcontribution['id'], )); - $this->assertEquals(1, $result['count'], 'In line ' . __LINE__); + $this->assertEquals(1, $result['count']); $this->assertEquals($this->_softcontribution['id'], $result['id']); $this->assertEquals($this->_softcontribution['id'], $result['id'], print_r($softcontribution, TRUE)); @@ -137,7 +137,7 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { 'contact_id' => $this->_softIndividual2Id, ) ); - $this->assertEquals(1, $result['count'], 'In line ' . __LINE__); + $this->assertEquals(1, $result['count']); $this->callAPISuccess('contribution_soft', 'Delete', array( 'id' => $this->_softcontribution['id'], @@ -209,11 +209,11 @@ 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, 'In line ' . __LINE__); - $this->assertEquals($softcontribution['values'][$softcontribution['id']]['contact_id'], $this->_softIndividual1Id, 'In line ' . __LINE__); - $this->assertEquals($softcontribution['values'][$softcontribution['id']]['amount'], '10.00', 'In line ' . __LINE__); - $this->assertEquals($softcontribution['values'][$softcontribution['id']]['currency'], 'USD', 'In line ' . __LINE__); - $this->assertEquals($softcontribution['values'][$softcontribution['id']]['soft_credit_type_id'], 5, 'In line ' . __LINE__); + $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'], 5); } /** @@ -238,7 +238,7 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { ); $original = $this->callAPISuccess('contribution_soft', 'get', $old_params); //Make sure it came back - $this->assertEquals($original['id'], $softcontributionID, 'In line ' . __LINE__); + $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']; @@ -247,11 +247,11 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { $old_soft_credit_type_id = $original['values'][$softcontributionID]['soft_credit_type_id']; //check against original values - $this->assertEquals($old_contribution_id, $this->_contributionId, 'In line ' . __LINE__); - $this->assertEquals($old_contact_id, $this->_softIndividual1Id, 'In line ' . __LINE__); - $this->assertEquals($old_amount, 10.00, 'In line ' . __LINE__); - $this->assertEquals($old_currency, 'USD', 'In line ' . __LINE__); - $this->assertEquals($old_soft_credit_type_id, 6, 'In line ' . __LINE__); + $this->assertEquals($old_contribution_id, $this->_contributionId); + $this->assertEquals($old_contact_id, $this->_softIndividual1Id); + $this->assertEquals($old_amount, 10.00); + $this->assertEquals($old_currency, 'USD'); + $this->assertEquals($old_soft_credit_type_id, 6); $params = array( 'id' => $softcontributionID, 'contribution_id' => $this->_contributionId, @@ -268,11 +268,11 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { ); $softcontribution = $this->callAPISuccess('contribution_soft', 'get', $new_params); //check against original values - $this->assertEquals($softcontribution['values'][$softcontributionID]['contribution_id'], $this->_contributionId, 'In line ' . __LINE__); - $this->assertEquals($softcontribution['values'][$softcontributionID]['contact_id'], $this->_softIndividual1Id, 'In line ' . __LINE__); - $this->assertEquals($softcontribution['values'][$softcontributionID]['amount'], 7.00, 'In line ' . __LINE__); - $this->assertEquals($softcontribution['values'][$softcontributionID]['currency'], 'CAD', 'In line ' . __LINE__); - $this->assertEquals($softcontribution['values'][$softcontributionID]['soft_credit_type_id'], 7, 'In line ' . __LINE__); + $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 = array( 'id' => $softcontributionID, @@ -332,10 +332,10 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { // We're taking the first element. $res = $result['values'][$softcontribution['id']]; - $this->assertEquals($p['contribution_id'], $res['contribution_id'], 'In line ' . __LINE__); - $this->assertEquals($p['contact_id'], $res['contact_id'], 'In line ' . __LINE__); - $this->assertEquals($p['amount'], $res['amount'], 'In line ' . __LINE__); - $this->assertEquals($p['currency'], $res['currency'], 'In line ' . __LINE__); + $this->assertEquals($p['contribution_id'], $res['contribution_id']); + $this->assertEquals($p['contact_id'], $res['contact_id']); + $this->assertEquals($p['amount'], $res['amount']); + $this->assertEquals($p['currency'], $res['currency']); } /** @@ -364,10 +364,10 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { $result = $this->callAPISuccess('contribution_soft', 'get', $params); $res = $result['values'][$softcontribution2['id']]; - $this->assertEquals($p2['contribution_id'], $res['contribution_id'], 'In line ' . __LINE__); - $this->assertEquals($p2['contact_id'], $res['contact_id'], 'In line ' . __LINE__); - $this->assertEquals($p2['amount'], $res['amount'], 'In line ' . __LINE__); - $this->assertEquals($p2['currency'], $res['currency'], 'In line ' . __LINE__); + $this->assertEquals($p2['contribution_id'], $res['contribution_id']); + $this->assertEquals($p2['contact_id'], $res['contact_id']); + $this->assertEquals($p2['amount'], $res['amount']); + $this->assertEquals($p2['currency'], $res['currency']); } } diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php index 6f1b5e4c6e..81cef9fc56 100644 --- a/tests/phpunit/api/v3/ContributionTest.php +++ b/tests/phpunit/api/v3/ContributionTest.php @@ -214,7 +214,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { 'source' => 'SSF', 'contribution_status_id' => 1, ); - $this->_contribution = $this->callAPISuccess('contribution', 'create', $p); + $this->_contribution = $this->callAPISuccess('Contribution', 'create', $p); $params = array( 'contribution_id' => $this->_contribution['id'], @@ -1142,7 +1142,8 @@ class api_v3_ContributionTest extends CiviUnitTestCase { */ public function testCreateUpdateContribution() { - $contributionID = $this->contributionCreate($this->_individualId, $this->_financialTypeId, 'idofsh', 212355); + $contributionID = $this->contributionCreate(array('contact_id' => $this->_individualId), $this->_financialTypeId, + 'idofsh', 212355); $old_params = array( 'contribution_id' => $contributionID, @@ -1233,7 +1234,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { public function testDeleteContribution() { - $contributionID = $this->contributionCreate($this->_individualId, $this->_financialTypeId, 'dfsdf', 12389); + $contributionID = $this->contributionCreate(array('contact_id' => $this->_individualId), $this->_financialTypeId, 'dfsdf', 12389); $params = array( 'id' => $contributionID, ); @@ -1511,7 +1512,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { $this->createLoggedInUser(); $params = array_merge($this->_params, array('contribution_status_id' => 2, 'receipt_date' => 'now')); $contribution = $this->callAPISuccess('contribution', 'create', $params); - $this->callAPISuccess('contribution', 'completetransaction', array('id' => $contribution['id'])); + $this->callAPISuccess('contribution', 'completetransaction', array('id' => $contribution['id'], 'trxn_date' => date('Y-m-d'))); $contribution = $this->callAPISuccess('contribution', 'get', array('id' => $contribution['id'], 'sequential' => 1)); $this->assertEquals('Completed', $contribution['values'][0]['contribution_status']); $mut->checkMailLog(array( @@ -1576,7 +1577,6 @@ class api_v3_ContributionTest extends CiviUnitTestCase { public function cleanUpAfterPriceSets() { $this->quickCleanUpFinancialEntities(); $this->contactDelete($this->_ids['contact']); - $this->callAPISuccess('price_set', 'delete', array('id' => $this->_ids['price_set'])); } diff --git a/tests/phpunit/api/v3/ParticipantPaymentTest.php b/tests/phpunit/api/v3/ParticipantPaymentTest.php index 573e2df435..27cd82b560 100644 --- a/tests/phpunit/api/v3/ParticipantPaymentTest.php +++ b/tests/phpunit/api/v3/ParticipantPaymentTest.php @@ -42,7 +42,7 @@ class api_v3_ParticipantPaymentTest extends CiviUnitTestCase { protected $_participantID; protected $_eventID; protected $_participantPaymentID; - protected $_contributionTypeId; + protected $_financialTypeId; public function setUp() { parent::setUp(); @@ -52,6 +52,7 @@ class api_v3_ParticipantPaymentTest extends CiviUnitTestCase { $this->_contactID = $this->individualCreate(); $this->_createdParticipants = array(); $this->_individualId = $this->individualCreate(); + $this->_financialTypeId = 1; $this->_participantID = $this->participantCreate(array( 'contactID' => $this->_contactID, @@ -74,14 +75,12 @@ class api_v3_ParticipantPaymentTest extends CiviUnitTestCase { )); } - ///////////////// civicrm_participant_payment_create methods - /** * Test civicrm_participant_payment_create with wrong params type. */ public function testPaymentCreateWrongParamsType() { $params = 'a string'; - $result = $this->callAPIFailure('participant_payment', 'create', $params); + $this->callAPIFailure('participant_payment', 'create', $params); } /** @@ -89,7 +88,7 @@ class api_v3_ParticipantPaymentTest extends CiviUnitTestCase { */ public function testPaymentCreateEmptyParams() { $params = array(); - $result = $this->callAPIFailure('participant_payment', 'create', $params); + $this->callAPIFailure('participant_payment', 'create', $params); } /** @@ -100,8 +99,7 @@ class api_v3_ParticipantPaymentTest extends CiviUnitTestCase { $params = array( 'participant_id' => $this->_participantID, ); - - $participantPayment = $this->callAPIFailure('participant_payment', 'create', $params); + $this->callAPIFailure('participant_payment', 'create', $params); } /** @@ -109,7 +107,7 @@ class api_v3_ParticipantPaymentTest extends CiviUnitTestCase { */ public function testPaymentCreate() { //Create Contribution & get contribution ID - $contributionID = $this->contributionCreate($this->_contactID); + $contributionID = $this->contributionCreate(array('contact_id' => $this->_contactID)); //Create Participant Payment record With Values $params = array( @@ -118,7 +116,7 @@ class api_v3_ParticipantPaymentTest extends CiviUnitTestCase { ); $result = $this->callAPIAndDocument('participant_payment', 'create', $params, __FUNCTION__, __FILE__); - $this->assertTrue(array_key_exists('id', $result), 'in line ' . __LINE__); + $this->assertTrue(array_key_exists('id', $result)); //delete created contribution $this->contributionDelete($contributionID); @@ -133,7 +131,7 @@ class api_v3_ParticipantPaymentTest extends CiviUnitTestCase { public function testPaymentUpdateWrongParamsType() { $params = 'a string'; $result = $this->callAPIFailure('participant_payment', 'create', $params); - $this->assertEquals('Input variable `params` is not an array', $result['error_message'], 'In line ' . __LINE__); + $this->assertEquals('Input variable `params` is not an array', $result['error_message']); } /** @@ -169,7 +167,13 @@ class api_v3_ParticipantPaymentTest extends CiviUnitTestCase { public function testPaymentOffline() { // create contribution w/o fee - $contributionID = $this->contributionCreate($this->_contactID, $this->_contributionTypeId, NULL, NULL, 4, FALSE); + $contributionID = $this->contributionCreate(array( + 'contact_id' => $this->_contactID, + 'financial_type_id' => $this->_financialTypeId, + 'payment_instrument_id' => 4, + 'fee_amount' => 0, + 'net_amount' => 100, + )); $this->_participantPaymentID = $this->participantPaymentCreate($this->_participantID, $contributionID); $params = array( @@ -293,27 +297,24 @@ class api_v3_ParticipantPaymentTest extends CiviUnitTestCase { * Check with valid array. */ public function testPaymentDelete() { - - // create contribution - $contributionID = $this->contributionCreate($this->_contactID, $this->_contributionTypeId); + $contributionID = $this->contributionCreate(array( + 'contact_id' => $this->_contactID, + )); $this->_participantPaymentID = $this->participantPaymentCreate($this->_participantID, $contributionID); $params = array( 'id' => $this->_participantPaymentID, ); - - $result = $this->callAPIAndDocument('participant_payment', 'delete', $params, __FUNCTION__, __FILE__); + $this->callAPIAndDocument('participant_payment', 'delete', $params, __FUNCTION__, __FILE__); } - ///////////////// civicrm_participantPayment_get methods /** * Test civicrm_participantPayment_get - success expected. */ public function testGet() { - //Create Contribution & get contribution ID - $contributionID = $this->contributionCreate($this->_contactID3, $this->_contributionTypeId); - $participantPaymentID = $this->participantPaymentCreate($this->_participantID4, $contributionID); + $contributionID = $this->contributionCreate(array('contact_id' => $this->_contactID3)); + $this->participantPaymentCreate($this->_participantID4, $contributionID); //Create Participant Payment record With Values $params = array( diff --git a/tests/phpunit/api/v3/PledgePaymentTest.php b/tests/phpunit/api/v3/PledgePaymentTest.php index 53210584f3..80106ff2cf 100644 --- a/tests/phpunit/api/v3/PledgePaymentTest.php +++ b/tests/phpunit/api/v3/PledgePaymentTest.php @@ -49,7 +49,7 @@ class api_v3_PledgePaymentTest extends CiviUnitTestCase { parent::setUp(); $this->_individualId = $this->individualCreate(); $this->_pledgeID = $this->pledgeCreate($this->_individualId); - $this->_contributionID = $this->contributionCreate($this->_individualId); + $this->_contributionID = $this->contributionCreate(array('contact_id' => $this->_individualId)); } public function tearDown() { @@ -214,7 +214,8 @@ class api_v3_PledgePaymentTest extends CiviUnitTestCase { 'sequential' => 1, ); - $contributionID = $this->contributionCreate($this->_individualId, $this->_financialTypeId, 45, 45); + $contributionID = $this->contributionCreate(array('contact_id' => $this->_individualId), $this->_financialTypeId, + 45, 45); $pledge = $this->callAPISuccess('Pledge', 'Create', $pledgeParams); //test the pledge_payment_create function diff --git a/tests/phpunit/api/v3/TaxContributionPageTest.php b/tests/phpunit/api/v3/TaxContributionPageTest.php index 15fcd9702f..01c8333209 100644 --- a/tests/phpunit/api/v3/TaxContributionPageTest.php +++ b/tests/phpunit/api/v3/TaxContributionPageTest.php @@ -255,14 +255,14 @@ class api_v3_TaxContributionPageTest extends CiviUnitTestCase { $contribution = $this->callAPIAndDocument('contribution', 'create', $params, __FUNCTION__, __FILE__); $this->_ids['contributionId'] = $contribution['id']; - $this->assertEquals($contribution['values'][$contribution['id']]['contact_id'], $this->_individualId, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['total_amount'], 120.00, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['financial_type_id'], $this->financialtypeID, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['trxn_id'], 12345, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['invoice_id'], 67890, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['source'], 'SSF', 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['tax_amount'], 20, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['contribution_status_id'], 1, 'In line ' . __LINE__); + $this->assertEquals($contribution['values'][$contribution['id']]['contact_id'], $this->_individualId); + $this->assertEquals($contribution['values'][$contribution['id']]['total_amount'], 120.00); + $this->assertEquals($contribution['values'][$contribution['id']]['financial_type_id'], $this->financialtypeID); + $this->assertEquals($contribution['values'][$contribution['id']]['trxn_id'], 12345); + $this->assertEquals($contribution['values'][$contribution['id']]['invoice_id'], 67890); + $this->assertEquals($contribution['values'][$contribution['id']]['source'], 'SSF'); + $this->assertEquals($contribution['values'][$contribution['id']]['tax_amount'], 20); + $this->assertEquals($contribution['values'][$contribution['id']]['contribution_status_id'], 1); $this->_checkFinancialRecords($contribution, 'online'); } @@ -324,14 +324,14 @@ class api_v3_TaxContributionPageTest extends CiviUnitTestCase { 'contribution_status_id' => 2, ); $contribution = $this->callAPIAndDocument('contribution', 'create', $params, __FUNCTION__, __FILE__); - $this->assertEquals($contribution['values'][$contribution['id']]['contact_id'], $this->_individualId, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['total_amount'], 120.00, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['financial_type_id'], $this->financialtypeID, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['trxn_id'], 12345, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['invoice_id'], 67890, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['source'], 'SSF', 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['tax_amount'], 20, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['contribution_status_id'], 2, 'In line ' . __LINE__); + $this->assertEquals($contribution['values'][$contribution['id']]['contact_id'], $this->_individualId); + $this->assertEquals($contribution['values'][$contribution['id']]['total_amount'], 120.00); + $this->assertEquals($contribution['values'][$contribution['id']]['financial_type_id'], $this->financialtypeID); + $this->assertEquals($contribution['values'][$contribution['id']]['trxn_id'], 12345); + $this->assertEquals($contribution['values'][$contribution['id']]['invoice_id'], 67890); + $this->assertEquals($contribution['values'][$contribution['id']]['source'], 'SSF'); + $this->assertEquals($contribution['values'][$contribution['id']]['tax_amount'], 20); + $this->assertEquals($contribution['values'][$contribution['id']]['contribution_status_id'], 2); $this->_checkFinancialRecords($contribution, 'payLater'); } @@ -350,14 +350,14 @@ class api_v3_TaxContributionPageTest extends CiviUnitTestCase { ); $contribution = $this->callAPIAndDocument('contribution', 'create', $params, __FUNCTION__, __FILE__); - $this->assertEquals($contribution['values'][$contribution['id']]['contact_id'], $this->_individualId, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['total_amount'], 120.00, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['financial_type_id'], $this->financialtypeID, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['trxn_id'], 12345, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['invoice_id'], 67890, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['source'], 'SSF', 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['tax_amount'], 20, 'In line ' . __LINE__); - $this->assertEquals($contribution['values'][$contribution['id']]['contribution_status_id'], 2, 'In line ' . __LINE__); + $this->assertEquals($contribution['values'][$contribution['id']]['contact_id'], $this->_individualId); + $this->assertEquals($contribution['values'][$contribution['id']]['total_amount'], 120.00); + $this->assertEquals($contribution['values'][$contribution['id']]['financial_type_id'], $this->financialtypeID); + $this->assertEquals($contribution['values'][$contribution['id']]['trxn_id'], 12345); + $this->assertEquals($contribution['values'][$contribution['id']]['invoice_id'], 67890); + $this->assertEquals($contribution['values'][$contribution['id']]['source'], 'SSF'); + $this->assertEquals($contribution['values'][$contribution['id']]['tax_amount'], 20); + $this->assertEquals($contribution['values'][$contribution['id']]['contribution_status_id'], 2); $this->_checkFinancialRecords($contribution, 'pending'); } @@ -523,7 +523,7 @@ class api_v3_TaxContributionPageTest extends CiviUnitTestCase { * */ public function testDeleteContribution() { - $contributionID = $this->contributionCreate($this->_individualId, $this->financialtypeID, 'dfsdf', 12389); + $contributionID = $this->contributionCreate(array('contact_id' => $this->_individualId), $this->financialtypeID, 'dfsdf', 12389); $params = array( 'id' => $contributionID, ); -- 2.25.1