From ecec407d81650a2baa8e1ac5c43b913580ae64e9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sat, 8 May 2021 15:52:45 +1200
Subject: [PATCH] Test fix - assertion fails when run with other tests
 (sometimes)

The assertion that invoice_number = INV_ + contribution_id is wrong. In fact
it is calculated as INV_ + (MAX(contribution_id)+1) prior to the contribution
being saved. This means that if the table has not been truncated the contribution
id might be 3 but the invoice_number would still be 0+1 - ie INV_1

- we could argue about whether the calculation method is flawed but this at least
makes the test more reliable and no-one has complained in practice about the
code behaviour
---
 tests/phpunit/api/v3/ContributionTest.php | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index fd9f77945c..12bc1ef0c5 100644
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -132,7 +132,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase {
    *
    * @throws \CRM_Core_Exception
    */
-  public function testGetContribution() {
+  public function testGetContribution(): void {
     $this->enableTaxAndInvoicing();
     $p = [
       'contact_id' => $this->_individualId,
@@ -161,19 +161,16 @@ class api_v3_ContributionTest extends CiviUnitTestCase {
     $this->assertEquals(1, $contributions['count']);
     $contribution = $contributions['values'][$contributions['id']];
     $this->assertEquals($contribution['contact_id'], $this->_individualId);
-    // Note there was an assertion converting financial_type_id to 'Donation' which wasn't working.
-    // Passing back a string rather than an id seems like an error/cruft.
-    // If it is to be introduced we should discuss.
-    $this->assertEquals($contribution['financial_type_id'], 1);
-    $this->assertEquals($contribution['total_amount'], 100.00);
-    $this->assertEquals($contribution['non_deductible_amount'], 10.00);
+    $this->assertEquals(1, $contribution['financial_type_id']);
+    $this->assertEquals(100.00, $contribution['total_amount']);
+    $this->assertEquals(10.00, $contribution['non_deductible_amount']);
     $this->assertEquals($contribution['fee_amount'], 5.00);
-    $this->assertEquals($contribution['net_amount'], 95.00);
-    $this->assertEquals($contribution['trxn_id'], 23456);
-    $this->assertEquals($contribution['invoice_id'], 78910);
-    $this->assertEquals($contribution['invoice_number'], 'INV_' . $contributions['id']);
-    $this->assertEquals($contribution['contribution_source'], 'SSF');
-    $this->assertEquals($contribution['contribution_status'], 'Completed');
+    $this->assertEquals(95.00, $contribution['net_amount']);
+    $this->assertEquals(23456, $contribution['trxn_id']);
+    $this->assertEquals(78910, $contribution['invoice_id']);
+    $this->assertRegExp('/INV_\d+/', $contribution['invoice_number']);
+    $this->assertEquals('SSF', $contribution['contribution_source']);
+    $this->assertEquals('Completed', $contribution['contribution_status']);
     // Create a second contribution - we are testing that 'id' gets the right contribution id (not the contact id).
     $p['trxn_id'] = '3847';
     $p['invoice_id'] = '3847';
-- 
2.25.1