test failure fixes

civicrm · Jul 4, 2017 · f5e1054 · f5e1054
1 parent 81a7f7b
commit f5e1054
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 7 deletions.
diff --git a/api/v3/examples/Contribution/ContributionCreateWithHonoreeContact.php b/api/v3/examples/Contribution/ContributionCreateWithHonoreeContact.php
@@ -67,6 +67,7 @@ function contribution_create_expectedresult() {
         'net_amount' => '95',
         'trxn_id' => '',
         'invoice_id' => '',
+        'invoice_number' => '',
         'currency' => 'USD',
         'cancel_date' => '',
         'cancel_reason' => '',

diff --git a/api/v3/examples/Contribution/ContributionCreateWithNote.php b/api/v3/examples/Contribution/ContributionCreateWithNote.php
@@ -70,6 +70,7 @@ function contribution_create_expectedresult() {
         'net_amount' => '90',
         'trxn_id' => '12345',
         'invoice_id' => '67890',
+        'invoice_number' => '',
         'currency' => 'USD',
         'cancel_date' => '',
         'cancel_reason' => '',

diff --git a/api/v3/examples/Contribution/ContributionCreateWithSoftCredit.php b/api/v3/examples/Contribution/ContributionCreateWithSoftCredit.php
@@ -73,6 +73,7 @@ function contribution_create_expectedresult() {
         'net_amount' => '95',
         'trxn_id' => '',
         'invoice_id' => '',
+        'invoice_number' => '',
         'currency' => 'USD',
         'cancel_date' => '',
         'cancel_reason' => '',

diff --git a/api/v3/examples/Contribution/ContributionCreateWithSoftCreditDefaults.php b/api/v3/examples/Contribution/ContributionCreateWithSoftCreditDefaults.php
@@ -67,6 +67,7 @@ function contribution_create_expectedresult() {
         'net_amount' => '95',
         'trxn_id' => '',
         'invoice_id' => '',
+        'invoice_number' => '',
         'currency' => 'USD',
         'cancel_date' => '',
         'cancel_reason' => '',

diff --git a/api/v3/examples/Contribution/Create.php b/api/v3/examples/Contribution/Create.php
@@ -7,7 +7,7 @@
  */
 function contribution_create_example() {
   $params = array(
-    'contact_id' => 1,
+    'contact_id' => 35,
     'receive_date' => '20120511',
     'total_amount' => '100',
     'financial_type_id' => 1,
@@ -54,7 +54,7 @@ function contribution_create_expectedresult() {
     'values' => array(
       '1' => array(
         'id' => '1',
-        'contact_id' => '1',
+        'contact_id' => '35',
         'financial_type_id' => '1',
         'contribution_page_id' => '1',
         'payment_instrument_id' => '4',
@@ -65,6 +65,7 @@ function contribution_create_expectedresult() {
         'net_amount' => '100',
         'trxn_id' => '12345',
         'invoice_id' => '67890',
+        'invoice_number' => '',
         'currency' => 'USD',
         'cancel_date' => '',
         'cancel_reason' => '',
@@ -83,7 +84,6 @@ function contribution_create_expectedresult() {
         'tax_amount' => '',
         'revenue_recognition_date' => '',
         'contribution_type_id' => '1',
-        'invoice_number' => '',
       ),
     ),
   );

diff --git a/api/v3/examples/Contribution/CreateWithNestedLineItems.php b/api/v3/examples/Contribution/CreateWithNestedLineItems.php
@@ -84,6 +84,7 @@ function contribution_create_expectedresult() {
         'net_amount' => '90',
         'trxn_id' => '12345',
         'invoice_id' => '67890',
+        'invoice_number' => '',
         'currency' => 'USD',
         'cancel_date' => '',
         'cancel_reason' => '',

diff --git a/api/v3/examples/Contribution/Get.php b/api/v3/examples/Contribution/Get.php
@@ -51,6 +51,8 @@ function contribution_get_expectedresult() {
         'display_name' => 'Mr. Anthony Anderson II',
         'contribution_id' => '1',
         'currency' => 'USD',
+        'payment_instrument' => 'Check',
+        'payment_instrument_id' => '4',
         'receive_date' => '2010-01-20 00:00:00',
         'non_deductible_amount' => '10.00',
         'total_amount' => '100.00',
@@ -67,6 +69,7 @@ function contribution_get_expectedresult() {
         'contribution_recur_id' => '',
         'is_test' => 0,
         'is_pay_later' => 0,
+        'contribution_status' => 'Completed',
         'contribution_status_id' => '1',
         'contribution_check_number' => '',
         'contribution_campaign_id' => '',
@@ -86,11 +89,8 @@ function contribution_get_expectedresult() {
         'contribution_campaign_title' => '',
         'contribution_note' => '',
         'contribution_batch' => '',
-        'contribution_status' => 'Completed',
-        'payment_instrument' => 'Check',
-        'payment_instrument_id' => '4',
-        'instrument_id' => '4',
         'check_number' => '',
+        'instrument_id' => '4',
         'id' => '1',
         'contribution_type_id' => '1',
       ),

diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
@@ -1148,6 +1148,9 @@ public function testCreateUpdateContributionPaymentInstrument() {
     $contribution = $this->callAPISuccess('contribution', 'create', $newParams);
     $this->assertAPISuccess($contribution);
     $this->_checkFinancialTrxn($contribution, 'paymentInstrument', $instrumentId);
+
+    // cleanup - delete created payment instrument
+    $this->_deletedAddedPaymentInstrument();
   }
 
   /**
@@ -1173,6 +1176,9 @@ public function testCreateUpdateNegativeContributionPaymentInstrument() {
     $contribution = $this->callAPISuccess('contribution', 'create', $newParams);
     $this->assertAPISuccess($contribution);
     $this->_checkFinancialTrxn($contribution, 'paymentInstrument', $instrumentId, array('total_amount' => '-100.00'));
+
+    // cleanup - delete created payment instrument
+    $this->_deletedAddedPaymentInstrument();
   }
 
   /**
@@ -3428,6 +3434,18 @@ public function _addPaymentInstrument() {
     return $optionValue['values'][$optionValue['id']]['value'];
   }
 
+  public function _deletedAddedPaymentInstrument() {
+    $result = $this->callAPISuccess('OptionValue', 'get', array(
+      'option_group_id' => 'payment_instrument',
+      'name' => 'Test Card',
+      'value' => '6',
+      'is_active' => 1,
+    ));
+    if ($id = CRM_Utils_Array::value('id', $result)) {
+      $this->callAPISuccess('OptionValue', 'delete', array('id' => $id));
+    }
+  }
+
   /**
    * Set up the basic recurring contribution for tests.
    *