adamsaghy commented on PR #6311:
URL: https://github.com/apache/fineract/pull/6311#issuecomment-6591527544
@oluexpert99 Thanks, this is approved. Could you please rebase it onto the
latest `develop`? It conflicts now, and I can't push to your fork because it's
owned by an organization.
The conflict is in `FinancialActivityAccountsTest`: on `develop` it was
moved to the Feign client (`FeignIntegrationTest`,
`FeignFinancialActivityAccountHelper`), so the new test needs the Feign
helpers. Something like this works:
```java
@Test
public void testTellerFinancialActivityAccountCanBeUpdated() {
Account tellerCashAccount = accountHelper.createAssetAccount();
Account replacementTellerCashAccount =
accountHelper.createAssetAccount();
Assertions.assertNotNull(tellerCashAccount);
Assertions.assertNotNull(replacementTellerCashAccount);
Long financialActivityAccountId = financialActivityAccountHelper
.createMapping(CASH_AT_TELLER_FINANCIAL_ACTIVITY_ID,
tellerCashAccount).getResourceId();
Assertions.assertNotNull(financialActivityAccountId);
assertFinancialActivityAccountCreation(financialActivityAccountId,
CASH_AT_TELLER_FINANCIAL_ACTIVITY_ID, tellerCashAccount);
PutFinancialActivityAccountsChanges changes =
financialActivityAccountHelper
.updateMapping(financialActivityAccountId,
CASH_AT_TELLER_FINANCIAL_ACTIVITY_ID,
replacementTellerCashAccount).getChanges();
Assertions.assertEquals(replacementTellerCashAccount.getAccountID().longValue(),
changes.getGlAccountId());
assertFinancialActivityAccountCreation(financialActivityAccountId,
CASH_AT_TELLER_FINANCIAL_ACTIVITY_ID,
replacementTellerCashAccount);
}
```
Please keep `develop`'s version of the rest of the file, and run `./gradlew
spotlessApply` before you push.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
