diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountTransferTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountTransferTest.java index f50fb8af4..1c72843fa 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountTransferTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountTransferTest.java @@ -185,10 +185,10 @@ public class AccountTransferTest { final JournalEntry[] office2LiabilityEntries = { new JournalEntry(new Float(ACCOUNT_TRANSFER_AMOUNT), JournalEntry.TransactionType.DEBIT) }; - this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityTransferAccount, AccountTransferHelper.ACCOUNT_TRANSFER_DATE, - office1LiabilityEntries); - this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityTransferAccount, AccountTransferHelper.ACCOUNT_TRANSFER_DATE, - office2LiabilityEntries); + this.journalEntryHelper.checkJournalEntryForLiabilityAccount(fromOfficeId, liabilityTransferAccount, + AccountTransferHelper.ACCOUNT_TRANSFER_DATE, office1LiabilityEntries); + this.journalEntryHelper.checkJournalEntryForLiabilityAccount(toOfficeId, liabilityTransferAccount, + AccountTransferHelper.ACCOUNT_TRANSFER_DATE, office2LiabilityEntries); } @@ -282,10 +282,10 @@ public class AccountTransferTest { final JournalEntry[] office2LiabilityEntries = { new JournalEntry(new Float(ACCOUNT_TRANSFER_AMOUNT_ADJUST), JournalEntry.TransactionType.DEBIT) }; - this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityTransferAccount, AccountTransferHelper.ACCOUNT_TRANSFER_DATE, - office1LiabilityEntries); - this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityTransferAccount, AccountTransferHelper.ACCOUNT_TRANSFER_DATE, - office2LiabilityEntries); + this.journalEntryHelper.checkJournalEntryForLiabilityAccount(fromOfficeId, liabilityTransferAccount, + AccountTransferHelper.ACCOUNT_TRANSFER_DATE, office1LiabilityEntries); + this.journalEntryHelper.checkJournalEntryForLiabilityAccount(toOfficeId, liabilityTransferAccount, + AccountTransferHelper.ACCOUNT_TRANSFER_DATE, office2LiabilityEntries); } @Test @@ -403,10 +403,10 @@ public class AccountTransferTest { final JournalEntry[] office2LiabilityEntries = { new JournalEntry(new Float(ACCOUNT_TRANSFER_AMOUNT_ADJUST), JournalEntry.TransactionType.DEBIT) }; - this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityTransferAccount, AccountTransferHelper.ACCOUNT_TRANSFER_DATE, - office1LiabilityEntries); - this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityTransferAccount, AccountTransferHelper.ACCOUNT_TRANSFER_DATE, - office2LiabilityEntries); + this.journalEntryHelper.checkJournalEntryForLiabilityAccount(fromOfficeId, liabilityTransferAccount, + AccountTransferHelper.ACCOUNT_TRANSFER_DATE, office1LiabilityEntries); + this.journalEntryHelper.checkJournalEntryForLiabilityAccount(toOfficeId, liabilityTransferAccount, + AccountTransferHelper.ACCOUNT_TRANSFER_DATE, office2LiabilityEntries); } diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FinancialActivityAccountsTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FinancialActivityAccountsTest.java index f4096bd04..e89d248da 100755 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FinancialActivityAccountsTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FinancialActivityAccountsTest.java @@ -34,8 +34,7 @@ public class FinancialActivityAccountsTest { private RequestSpecification requestSpec; private AccountHelper accountHelper; private FinancialActivityAccountHelper financialActivityAccountHelper; - // private final Integer assetTransferFinancialActivityId = - // FINANCIAL_ACTIVITY.ASSET_TRANSFER.getValue(); + private final Integer assetTransferFinancialActivityId = FINANCIAL_ACTIVITY.ASSET_TRANSFER.getValue(); public static final Integer liabilityTransferFinancialActivityId = FINANCIAL_ACTIVITY.LIABILITY_TRANSFER.getValue(); @Before @@ -108,7 +107,7 @@ public class FinancialActivityAccountsTest { * should fail **/ List invalidFinancialActivityAccountError = (List) financialActivityAccountHelper.updateFinancialActivityAccount( - financialActivityAccountId, liabilityTransferFinancialActivityId, newLiabilityTransferAccount.getAccountID(), + financialActivityAccountId, assetTransferFinancialActivityId, newLiabilityTransferAccount.getAccountID(), responseSpecForDomainRuleViolation, CommonConstants.RESPONSE_ERROR); assertEquals(FinancialActivityAccountInvalidException.getErrorcode(), invalidFinancialActivityAccountError.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE)); diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/accounting/JournalEntry.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/accounting/JournalEntry.java index 50c4adb0d..1740ff996 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/accounting/JournalEntry.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/accounting/JournalEntry.java @@ -19,10 +19,12 @@ public class JournalEntry { private final Float transactionAmount; private final TransactionType transactionType; + private final Integer officeId; public JournalEntry(final float transactionAmount, final TransactionType type) { this.transactionAmount = transactionAmount; this.transactionType = type; + this.officeId = null; } public Float getTransactionAmount() { diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/accounting/JournalEntryHelper.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/accounting/JournalEntryHelper.java index cc53c02e0..19f567d7e 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/accounting/JournalEntryHelper.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/accounting/JournalEntryHelper.java @@ -24,25 +24,31 @@ public class JournalEntryHelper { } public void checkJournalEntryForExpenseAccount(final Account expenseAccount, final String date, final JournalEntry... accountEntries) { - checkJournalEntry(expenseAccount, date, accountEntries); + checkJournalEntry(null, expenseAccount, date, accountEntries); } public void checkJournalEntryForAssetAccount(final Account assetAccount, final String date, final JournalEntry... accountEntries) { - checkJournalEntry(assetAccount, date, accountEntries); + checkJournalEntry(null, assetAccount, date, accountEntries); } public void checkJournalEntryForIncomeAccount(final Account incomeAccount, final String date, final JournalEntry... accountEntries) { - checkJournalEntry(incomeAccount, date, accountEntries); + checkJournalEntry(null, incomeAccount, date, accountEntries); } - - public void checkJournalEntryForLiabilityAccount(final Account liabilityAccount, final String date, final JournalEntry... accountEntries) { - checkJournalEntry(liabilityAccount, date, accountEntries); + + public void checkJournalEntryForLiabilityAccount(final Account liabilityAccount, final String date, + final JournalEntry... accountEntries) { + checkJournalEntry(null, liabilityAccount, date, accountEntries); + } + + public void checkJournalEntryForLiabilityAccount(final Integer officeId, final Account liabilityAccount, final String date, + final JournalEntry... accountEntries) { + checkJournalEntry(officeId, liabilityAccount, date, accountEntries); } public void ensureNoAccountingTransactionsWithTransactionId(final String transactionId) { ArrayList transactions = getJournalEntriesByTransactionId(transactionId); assertTrue("Tranasactions are is not empty", transactions.isEmpty()); - + } private String getEntryValueFromJournalEntry(final ArrayList entryResponse, final int entryNumber) { @@ -54,8 +60,8 @@ public class JournalEntryHelper { return (Float) entryResponse.get(entryNumber).get("amount"); } - private void checkJournalEntry(final Account account, final String date, final JournalEntry... accountEntries) { - final String url = createURLForGettingAccountEntries(account, date); + private void checkJournalEntry(final Integer officeId, final Account account, final String date, final JournalEntry... accountEntries) { + final String url = createURLForGettingAccountEntries(account, date, officeId); final ArrayList response = Utils.performServerGet(this.requestSpec, this.responseSpec, url, "pageItems"); for (int i = 0; i < accountEntries.length; i++) { assertThat(getEntryValueFromJournalEntry(response, i), equalTo(accountEntries[i].getTransactionType())); @@ -63,10 +69,14 @@ public class JournalEntryHelper { } } - private String createURLForGettingAccountEntries(final Account account, final String date) { - return new String("/mifosng-provider/api/v1/journalentries?glAccountId=" + account.getAccountID() + "&type=" + private String createURLForGettingAccountEntries(final Account account, final String date, final Integer officeId) { + String url = new String("/mifosng-provider/api/v1/journalentries?glAccountId=" + account.getAccountID() + "&type=" + account.getAccountType() + "&fromDate=" + date + "&toDate=" + date + "&tenantIdentifier=default" + "&orderBy=id&sortOrder=desc&locale=en&dateFormat=dd MMMM yyyy"); + if (officeId != null) { + url = url + "&officeId=" + officeId; + } + return url; } private ArrayList getJournalEntriesByTransactionId(final String transactionId) {