Merge pull request #958 from vishwasbabu/develop

more fixes to account transfers test cases

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,
+        this.journalEntryHelper.checkJournalEntryForLiabilityAccount(fromOfficeId, liabilityTransferAccount,
-                office1LiabilityEntries);
+                AccountTransferHelper.ACCOUNT_TRANSFER_DATE, office1LiabilityEntries);
-        this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityTransferAccount, AccountTransferHelper.ACCOUNT_TRANSFER_DATE,
+        this.journalEntryHelper.checkJournalEntryForLiabilityAccount(toOfficeId, liabilityTransferAccount,
-                office2LiabilityEntries);
+                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,
+        this.journalEntryHelper.checkJournalEntryForLiabilityAccount(fromOfficeId, liabilityTransferAccount,
-                office1LiabilityEntries);
+                AccountTransferHelper.ACCOUNT_TRANSFER_DATE, office1LiabilityEntries);
-        this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityTransferAccount, AccountTransferHelper.ACCOUNT_TRANSFER_DATE,
+        this.journalEntryHelper.checkJournalEntryForLiabilityAccount(toOfficeId, liabilityTransferAccount,
-                office2LiabilityEntries);
+                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,
+        this.journalEntryHelper.checkJournalEntryForLiabilityAccount(fromOfficeId, liabilityTransferAccount,
-                office1LiabilityEntries);
+                AccountTransferHelper.ACCOUNT_TRANSFER_DATE, office1LiabilityEntries);
-        this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityTransferAccount, AccountTransferHelper.ACCOUNT_TRANSFER_DATE,
+        this.journalEntryHelper.checkJournalEntryForLiabilityAccount(toOfficeId, liabilityTransferAccount,
-                office2LiabilityEntries);
+                AccountTransferHelper.ACCOUNT_TRANSFER_DATE, office2LiabilityEntries);
 
     }
 

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 =
+    private final Integer assetTransferFinancialActivityId = FINANCIAL_ACTIVITY.ASSET_TRANSFER.getValue();
-    // 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<HashMap> invalidFinancialActivityAccountError = (List<HashMap>) 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));

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() {

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) {
+    public void checkJournalEntryForLiabilityAccount(final Account liabilityAccount, final String date,
-        checkJournalEntry(liabilityAccount, date, accountEntries);
+            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<HashMap> transactions = getJournalEntriesByTransactionId(transactionId);
         assertTrue("Tranasactions are is not empty", transactions.isEmpty());
-        
+
     }
 
     private String getEntryValueFromJournalEntry(final ArrayList<HashMap> 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) {
+    private void checkJournalEntry(final Integer officeId, final Account account, final String date, final JournalEntry... accountEntries) {
-        final String url = createURLForGettingAccountEntries(account, date);
+        final String url = createURLForGettingAccountEntries(account, date, officeId);
         final ArrayList<HashMap> 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) {
+    private String createURLForGettingAccountEntries(final Account account, final String date, final Integer officeId) {
-        return new String("/mifosng-provider/api/v1/journalentries?glAccountId=" + account.getAccountID() + "&type="
+        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<HashMap> getJournalEntriesByTransactionId(final String transactionId) {