You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ma...@apache.org on 2016/02/01 10:24:49 UTC
[13/51] [partial] incubator-fineract git commit: deleted initial code
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/66cee785/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java
deleted file mode 100755
index 515eb5a..0000000
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java
+++ /dev/null
@@ -1,832 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.fineract.integrationtests;
-
-import static org.junit.Assert.assertEquals;
-
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.fineract.integrationtests.common.ClientHelper;
-import org.apache.fineract.integrationtests.common.CommonConstants;
-import org.apache.fineract.integrationtests.common.Utils;
-import org.apache.fineract.integrationtests.common.charges.ChargesHelper;
-import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper;
-import org.apache.fineract.integrationtests.common.savings.SavingsProductHelper;
-import org.apache.fineract.integrationtests.common.savings.SavingsStatusChecker;
-import org.joda.time.LocalDate;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
-/**
- * Client Savings Integration Test for checking Savings Application.
- */
-@SuppressWarnings({ "rawtypes", "unused" })
-public class ClientSavingsIntegrationTest {
-
- public static final String DEPOSIT_AMOUNT = "2000";
- public static final String WITHDRAW_AMOUNT = "1000";
- public static final String WITHDRAW_AMOUNT_ADJUSTED = "500";
- public static final String MINIMUM_OPENING_BALANCE = "1000.0";
- public static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL";
-
- private ResponseSpecification responseSpec;
- private RequestSpecification requestSpec;
- private SavingsAccountHelper savingsAccountHelper;
-
- @Before
- public void setup() {
- Utils.initializeRESTAssured();
- this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
- this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
- this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
- }
-
- @Test
- public void testSavingsAccount() {
- this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
-
- final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientID);
- final String minBalanceForInterestCalculation = null;
- final String minRequiredBalance = null;
- final String enforceMinRequiredBalance = "false";
- final boolean allowOverdraft = false;
- final Integer savingsProductID = createSavingsProduct(this.requestSpec, this.responseSpec, MINIMUM_OPENING_BALANCE,
- minBalanceForInterestCalculation, minRequiredBalance, enforceMinRequiredBalance, allowOverdraft);
- Assert.assertNotNull(savingsProductID);
-
- final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplication(clientID, savingsProductID, ACCOUNT_TYPE_INDIVIDUAL);
- Assert.assertNotNull(savingsProductID);
-
- HashMap modifications = this.savingsAccountHelper.updateSavingsAccount(clientID, savingsProductID, savingsId,
- ACCOUNT_TYPE_INDIVIDUAL);
- Assert.assertTrue(modifications.containsKey("submittedOnDate"));
-
- HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId);
- SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
- savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap);
-
- savingsStatusHashMap = this.savingsAccountHelper.activateSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap);
-
- final HashMap summaryBefore = this.savingsAccountHelper.getSavingsSummary(savingsId);
- this.savingsAccountHelper.calculateInterestForSavings(savingsId);
- HashMap summary = this.savingsAccountHelper.getSavingsSummary(savingsId);
- assertEquals(summaryBefore, summary);
-
- this.savingsAccountHelper.postInterestForSavings(savingsId);
- summary = this.savingsAccountHelper.getSavingsSummary(savingsId);
- Assert.assertFalse(summaryBefore.equals(summary));
-
- final Object savingsInterest = this.savingsAccountHelper.getSavingsInterest(savingsId);
- // verifySavingsInterest(savingsInterest);
-
- }
-
- @Test
- public void testSavingsAccountWithMinBalanceForInterestCalculation() {
- this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
-
- final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientID);
- final String minBalanceForInterestCalculation = "5000";
- final String minRequiredBalance = null;
- final String enforceMinRequiredBalance = "false";
- final boolean allowOverdraft = false;
- final Integer savingsProductID = createSavingsProduct(this.requestSpec, this.responseSpec, MINIMUM_OPENING_BALANCE,
- minBalanceForInterestCalculation, minRequiredBalance, enforceMinRequiredBalance, allowOverdraft);
- Assert.assertNotNull(savingsProductID);
-
- final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplication(clientID, savingsProductID, ACCOUNT_TYPE_INDIVIDUAL);
- Assert.assertNotNull(savingsProductID);
-
- HashMap modifications = this.savingsAccountHelper.updateSavingsAccount(clientID, savingsProductID, savingsId,
- ACCOUNT_TYPE_INDIVIDUAL);
- Assert.assertTrue(modifications.containsKey("submittedOnDate"));
-
- HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId);
- SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
- savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap);
-
- savingsStatusHashMap = this.savingsAccountHelper.activateSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap);
-
- final HashMap summaryBefore = this.savingsAccountHelper.getSavingsSummary(savingsId);
- this.savingsAccountHelper.calculateInterestForSavings(savingsId);
- HashMap summary = this.savingsAccountHelper.getSavingsSummary(savingsId);
- assertEquals(summaryBefore, summary);
-
- this.savingsAccountHelper.postInterestForSavings(savingsId);
- summary = this.savingsAccountHelper.getSavingsSummary(savingsId);
- assertEquals(summaryBefore, summary);
-
- final Object savingsInterest = this.savingsAccountHelper.getSavingsInterest(savingsId);
- Assert.assertNull(savingsInterest);
-
- }
-
- @SuppressWarnings("unchecked")
- @Test
- public void testSavingsAccount_CLOSE_APPLICATION() {
- this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
- final ResponseSpecification errorResponse = new ResponseSpecBuilder().expectStatusCode(400).build();
- final SavingsAccountHelper validationErrorHelper = new SavingsAccountHelper(this.requestSpec, errorResponse);
-
- final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientID);
- final String minBalanceForInterestCalculation = null;
- final String minRequiredBalance = "1000.0";
- final String enforceMinRequiredBalance = "true";
- final boolean allowOverdraft = false;
- final Integer savingsProductID = createSavingsProduct(this.requestSpec, this.responseSpec, MINIMUM_OPENING_BALANCE,
- minBalanceForInterestCalculation, minRequiredBalance, enforceMinRequiredBalance, allowOverdraft);
- Assert.assertNotNull(savingsProductID);
-
- final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplication(clientID, savingsProductID, ACCOUNT_TYPE_INDIVIDUAL);
- Assert.assertNotNull(savingsProductID);
-
- HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId);
- SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
- savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap);
-
- savingsStatusHashMap = this.savingsAccountHelper.activateSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap);
-
- DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
- Calendar todaysDate = Calendar.getInstance();
- final String CLOSEDON_DATE = dateFormat.format(todaysDate.getTime());
- String withdrawBalance = "false";
- ArrayList<HashMap> savingsAccountErrorData = (ArrayList<HashMap>) validationErrorHelper.closeSavingsAccountAndGetBackRequiredField(
- savingsId, withdrawBalance, CommonConstants.RESPONSE_ERROR, CLOSEDON_DATE);
- assertEquals("validation.msg.savingsaccount.close.results.in.balance.not.zero",
- savingsAccountErrorData.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- withdrawBalance = "true";
- savingsStatusHashMap = this.savingsAccountHelper.closeSavingsAccount(savingsId, withdrawBalance);
- SavingsStatusChecker.verifySavingsAccountIsClosed(savingsStatusHashMap);
- }
-
- @SuppressWarnings("unchecked")
- @Test
- public void testSavingsAccount_WITH_ENFORCE_MIN_BALANCE() {
- this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
- final ResponseSpecification errorResponse = new ResponseSpecBuilder().expectStatusCode(403).build();
- final SavingsAccountHelper validationErrorHelper = new SavingsAccountHelper(this.requestSpec, errorResponse);
-
- final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientID);
- final String minBalanceForInterestCalculation = null;
- final String minRequiredBalance = "1500.0";
- final String openningBalance = "1600";
- final String enforceMinRequiredBalance = "true";
- final boolean allowOverdraft = false;
- final Integer savingsProductID = createSavingsProduct(this.requestSpec, this.responseSpec, openningBalance,
- minBalanceForInterestCalculation, minRequiredBalance, enforceMinRequiredBalance, allowOverdraft);
- Assert.assertNotNull(savingsProductID);
-
- final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplication(clientID, savingsProductID, ACCOUNT_TYPE_INDIVIDUAL);
- Assert.assertNotNull(savingsProductID);
-
- HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId);
- SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
- final Integer savingsActivationChargeId = ChargesHelper.createCharges(this.requestSpec, this.responseSpec,
- ChargesHelper.getSavingsActivationFeeJSON());
- Assert.assertNotNull(savingsActivationChargeId);
-
- this.savingsAccountHelper.addChargesForSavings(savingsId, savingsActivationChargeId);
-
- savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap);
-
- savingsStatusHashMap = this.savingsAccountHelper.activateSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap);
-
- HashMap summary = this.savingsAccountHelper.getSavingsSummary(savingsId);
- Float balance = new Float(openningBalance);
- Float chargeAmt = 100f;
- balance -= chargeAmt;
- assertEquals("Verifying opening Balance", balance, summary.get("accountBalance"));
-
- DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy");
- Calendar todaysDate = Calendar.getInstance();
- final String TRANSACTION_DATE = dateFormat.format(todaysDate.getTime());
- final String withdrawAmt = "800";
- ArrayList<HashMap> savingsAccountErrorData = (ArrayList<HashMap>) validationErrorHelper.withdrawalFromSavingsAccount(savingsId,
- withdrawAmt, TRANSACTION_DATE, CommonConstants.RESPONSE_ERROR);
- assertEquals("error.msg.savingsaccount.transaction.insufficient.account.balance",
- savingsAccountErrorData.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- Integer depositTransactionId = (Integer) this.savingsAccountHelper.depositToSavingsAccount(savingsId, DEPOSIT_AMOUNT,
- TRANSACTION_DATE, CommonConstants.RESPONSE_RESOURCE_ID);
- HashMap depositTransaction = this.savingsAccountHelper.getSavingsTransaction(savingsId, depositTransactionId);
- balance += new Float(DEPOSIT_AMOUNT);
- assertEquals("Verifying Deposit Amount", new Float(DEPOSIT_AMOUNT), depositTransaction.get("amount"));
- assertEquals("Verifying Balance after Deposit", balance, depositTransaction.get("runningBalance"));
-
- Integer withdrawTransactionId = (Integer) this.savingsAccountHelper.withdrawalFromSavingsAccount(savingsId, withdrawAmt,
- TRANSACTION_DATE, CommonConstants.RESPONSE_RESOURCE_ID);
- HashMap withdrawTransaction = this.savingsAccountHelper.getSavingsTransaction(savingsId, withdrawTransactionId);
- balance -= new Float(withdrawAmt);
- assertEquals("Verifying Withdrawal Amount", new Float(withdrawAmt), withdrawTransaction.get("amount"));
- assertEquals("Verifying Balance after Withdrawal", balance, withdrawTransaction.get("runningBalance"));
- }
-
- @SuppressWarnings("unchecked")
- @Test
- public void testSavingsAccount_DELETE_APPLICATION() {
- this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
-
- SavingsAccountHelper savingsAccountHelperValidationError = new SavingsAccountHelper(this.requestSpec,
- new ResponseSpecBuilder().build());
-
- final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientID);
- final String minBalanceForInterestCalculation = null;
- final String minRequiredBalance = null;
- final String enforceMinRequiredBalance = "false";
- final boolean allowOverdraft = false;
- final Integer savingsProductID = createSavingsProduct(this.requestSpec, this.responseSpec, MINIMUM_OPENING_BALANCE,
- minBalanceForInterestCalculation, minRequiredBalance, enforceMinRequiredBalance, allowOverdraft);
- Assert.assertNotNull(savingsProductID);
-
- final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplication(clientID, savingsProductID, ACCOUNT_TYPE_INDIVIDUAL);
- Assert.assertNotNull(savingsProductID);
-
- HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId);
- SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
- savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap);
-
- List<HashMap> error1 = (List<HashMap>) savingsAccountHelperValidationError.deleteSavingsApplication(savingsId,
- CommonConstants.RESPONSE_ERROR);
- assertEquals("validation.msg.savingsaccount.delete.not.in.submittedandpendingapproval.state",
- error1.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- savingsStatusHashMap = this.savingsAccountHelper.undoApproval(savingsId);
- SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
- this.savingsAccountHelper.deleteSavingsApplication(savingsId, CommonConstants.RESPONSE_RESOURCE_ID);
-
- List<HashMap> error = savingsAccountHelperValidationError.getSavingsCollectionAttribute(savingsId, CommonConstants.RESPONSE_ERROR);
- assertEquals("error.msg.saving.account.id.invalid", error.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- }
-
- @SuppressWarnings("unchecked")
- @Test
- public void testSavingsAccount_REJECT_APPLICATION() {
-
- this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
-
- SavingsAccountHelper savingsAccountHelperValidationError = new SavingsAccountHelper(this.requestSpec,
- new ResponseSpecBuilder().build());
-
- final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientID);
- final String minBalanceForInterestCalculation = null;
- final String minRequiredBalance = null;
- final String enforceMinRequiredBalance = "false";
- final boolean allowOverdraft = false;
- final Integer savingsProductID = createSavingsProduct(this.requestSpec, this.responseSpec, MINIMUM_OPENING_BALANCE,
- minBalanceForInterestCalculation, minRequiredBalance, enforceMinRequiredBalance, allowOverdraft);
- Assert.assertNotNull(savingsProductID);
-
- final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplication(clientID, savingsProductID, ACCOUNT_TYPE_INDIVIDUAL);
- Assert.assertNotNull(savingsProductID);
-
- HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId);
- SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
- savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap);
-
- List<HashMap> error1 = savingsAccountHelperValidationError.rejectApplicationWithErrorCode(savingsId,
- SavingsAccountHelper.CREATED_DATE_PLUS_ONE);
- assertEquals("validation.msg.savingsaccount.reject.not.in.submittedandpendingapproval.state",
- error1.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- savingsStatusHashMap = this.savingsAccountHelper.undoApproval(savingsId);
- SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
- error1 = savingsAccountHelperValidationError.rejectApplicationWithErrorCode(savingsId, SavingsAccountHelper.getFutureDate());
- assertEquals("validation.msg.savingsaccount.reject.cannot.be.a.future.date",
- error1.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- error1 = savingsAccountHelperValidationError.rejectApplicationWithErrorCode(savingsId, SavingsAccountHelper.CREATED_DATE_MINUS_ONE);
- assertEquals("validation.msg.savingsaccount.reject.cannot.be.before.submittal.date",
- error1.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- savingsStatusHashMap = this.savingsAccountHelper.rejectApplication(savingsId);
- SavingsStatusChecker.verifySavingsIsRejected(savingsStatusHashMap);
-
- }
-
- @Test
- public void testSavingsAccount_WITHDRAW_APPLICATION() {
-
- this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
-
- final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientID);
- final String minBalanceForInterestCalculation = null;
- final String minRequiredBalance = null;
- final String enforceMinRequiredBalance = "false";
- final boolean allowOverdraft = false;
- final Integer savingsProductID = createSavingsProduct(this.requestSpec, this.responseSpec, MINIMUM_OPENING_BALANCE,
- minBalanceForInterestCalculation, minRequiredBalance, enforceMinRequiredBalance, allowOverdraft);
- Assert.assertNotNull(savingsProductID);
-
- final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplication(clientID, savingsProductID, ACCOUNT_TYPE_INDIVIDUAL);
- Assert.assertNotNull(savingsProductID);
-
- HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId);
- SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
- savingsStatusHashMap = this.savingsAccountHelper.withdrawApplication(savingsId);
- SavingsStatusChecker.verifySavingsIsWithdrawn(savingsStatusHashMap);
-
- }
-
- @SuppressWarnings("unchecked")
- @Test
- public void testSavingsAccountTransactions() {
- this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
- SavingsAccountHelper savingsAccountHelperValidationError = new SavingsAccountHelper(this.requestSpec,
- new ResponseSpecBuilder().build());
-
- final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientID);
- final String minBalanceForInterestCalculation = null;
- final String minRequiredBalance = null;
- final String enforceMinRequiredBalance = "false";
- final boolean allowOverdraft = false;
- final Integer savingsProductID = createSavingsProduct(this.requestSpec, this.responseSpec, MINIMUM_OPENING_BALANCE,
- minBalanceForInterestCalculation, minRequiredBalance, enforceMinRequiredBalance, allowOverdraft);
- Assert.assertNotNull(savingsProductID);
-
- final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplication(clientID, savingsProductID, ACCOUNT_TYPE_INDIVIDUAL);
- Assert.assertNotNull(savingsProductID);
-
- HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId);
- SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
- savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap);
-
- List<HashMap> error = (List) savingsAccountHelperValidationError.withdrawalFromSavingsAccount(savingsId, "100",
- SavingsAccountHelper.TRANSACTION_DATE, CommonConstants.RESPONSE_ERROR);
- assertEquals("error.msg.savingsaccount.transaction.account.is.not.active",
- error.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- error = (List) savingsAccountHelperValidationError.depositToSavingsAccount(savingsId, "100", SavingsAccountHelper.TRANSACTION_DATE,
- CommonConstants.RESPONSE_ERROR);
- assertEquals("error.msg.savingsaccount.transaction.account.is.not.active",
- error.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- savingsStatusHashMap = this.savingsAccountHelper.activateSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap);
-
- HashMap summary = this.savingsAccountHelper.getSavingsSummary(savingsId);
- Float balance = new Float(MINIMUM_OPENING_BALANCE);
- assertEquals("Verifying opening Balance", balance, summary.get("accountBalance"));
-
- Integer depositTransactionId = (Integer) this.savingsAccountHelper.depositToSavingsAccount(savingsId, DEPOSIT_AMOUNT,
- SavingsAccountHelper.TRANSACTION_DATE, CommonConstants.RESPONSE_RESOURCE_ID);
- HashMap depositTransaction = this.savingsAccountHelper.getSavingsTransaction(savingsId, depositTransactionId);
- balance += new Float(DEPOSIT_AMOUNT);
- assertEquals("Verifying Deposit Amount", new Float(DEPOSIT_AMOUNT), depositTransaction.get("amount"));
- assertEquals("Verifying Balance after Deposit", balance, depositTransaction.get("runningBalance"));
-
- Integer withdrawTransactionId = (Integer) this.savingsAccountHelper.withdrawalFromSavingsAccount(savingsId, WITHDRAW_AMOUNT,
- SavingsAccountHelper.TRANSACTION_DATE, CommonConstants.RESPONSE_RESOURCE_ID);
- HashMap withdrawTransaction = this.savingsAccountHelper.getSavingsTransaction(savingsId, withdrawTransactionId);
- balance -= new Float(WITHDRAW_AMOUNT);
- assertEquals("Verifying Withdrawal Amount", new Float(WITHDRAW_AMOUNT), withdrawTransaction.get("amount"));
- assertEquals("Verifying Balance after Withdrawal", balance, withdrawTransaction.get("runningBalance"));
-
- Integer newWithdrawTransactionId = this.savingsAccountHelper.updateSavingsAccountTransaction(savingsId, withdrawTransactionId,
- WITHDRAW_AMOUNT_ADJUSTED);
- HashMap newWithdrawTransaction = this.savingsAccountHelper.getSavingsTransaction(savingsId, newWithdrawTransactionId);
- balance = balance + new Float(WITHDRAW_AMOUNT) - new Float(WITHDRAW_AMOUNT_ADJUSTED);
- assertEquals("Verifying adjusted Amount", new Float(WITHDRAW_AMOUNT_ADJUSTED), newWithdrawTransaction.get("amount"));
- assertEquals("Verifying Balance after adjust", balance, newWithdrawTransaction.get("runningBalance"));
- summary = this.savingsAccountHelper.getSavingsSummary(savingsId);
- assertEquals("Verifying Adjusted Balance", balance, summary.get("accountBalance"));
- withdrawTransaction = this.savingsAccountHelper.getSavingsTransaction(savingsId, withdrawTransactionId);
- Assert.assertTrue((Boolean) withdrawTransaction.get("reversed"));
-
- this.savingsAccountHelper.undoSavingsAccountTransaction(savingsId, newWithdrawTransactionId);
- newWithdrawTransaction = this.savingsAccountHelper.getSavingsTransaction(savingsId, withdrawTransactionId);
- Assert.assertTrue((Boolean) newWithdrawTransaction.get("reversed"));
- summary = this.savingsAccountHelper.getSavingsSummary(savingsId);
- balance += new Float(WITHDRAW_AMOUNT_ADJUSTED);
- assertEquals("Verifying Balance After Undo Transaction", balance, summary.get("accountBalance"));
-
- error = (List) savingsAccountHelperValidationError.withdrawalFromSavingsAccount(savingsId, "5000",
- SavingsAccountHelper.TRANSACTION_DATE, CommonConstants.RESPONSE_ERROR);
- assertEquals("error.msg.savingsaccount.transaction.insufficient.account.balance",
- error.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- error = (List) savingsAccountHelperValidationError.withdrawalFromSavingsAccount(savingsId, "5000",
- SavingsAccountHelper.getFutureDate(), CommonConstants.RESPONSE_ERROR);
- assertEquals("error.msg.savingsaccount.transaction.in.the.future", error.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- error = (List) savingsAccountHelperValidationError.depositToSavingsAccount(savingsId, "5000", SavingsAccountHelper.getFutureDate(),
- CommonConstants.RESPONSE_ERROR);
- assertEquals("error.msg.savingsaccount.transaction.in.the.future", error.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- error = (List) savingsAccountHelperValidationError.withdrawalFromSavingsAccount(savingsId, "5000",
- SavingsAccountHelper.CREATED_DATE_MINUS_ONE, CommonConstants.RESPONSE_ERROR);
- assertEquals("error.msg.savingsaccount.transaction.before.activation.date",
- error.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- error = (List) savingsAccountHelperValidationError.depositToSavingsAccount(savingsId, "5000",
- SavingsAccountHelper.CREATED_DATE_MINUS_ONE, CommonConstants.RESPONSE_ERROR);
- assertEquals("error.msg.savingsaccount.transaction.before.activation.date",
- error.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- }
-
- @SuppressWarnings("unchecked")
- @Test
- public void testSavingsAccountCharges() {
-
- final ResponseSpecification erroResponseSpec = new ResponseSpecBuilder().build();
- this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
- final SavingsAccountHelper validationErrorHelper = new SavingsAccountHelper(this.requestSpec, erroResponseSpec);
-
- final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientID);
- final String minBalanceForInterestCalculation = null;
- final String minRequiredBalance = null;
- final String enforceMinRequiredBalance = "false";
- final boolean allowOverdraft = false;
- final Integer savingsProductID = createSavingsProduct(this.requestSpec, this.responseSpec, MINIMUM_OPENING_BALANCE,
- minBalanceForInterestCalculation, minRequiredBalance, enforceMinRequiredBalance, allowOverdraft);
- Assert.assertNotNull(savingsProductID);
-
- Assert.assertNotNull(savingsProductID);
- final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplication(clientID, savingsProductID, ACCOUNT_TYPE_INDIVIDUAL);
-
- HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId);
- SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
- final Integer withdrawalChargeId = ChargesHelper.createCharges(this.requestSpec, this.responseSpec,
- ChargesHelper.getSavingsWithdrawalFeeJSON());
- Assert.assertNotNull(withdrawalChargeId);
-
- this.savingsAccountHelper.addChargesForSavings(savingsId, withdrawalChargeId);
- ArrayList<HashMap> chargesPendingState = this.savingsAccountHelper.getSavingsCharges(savingsId);
- Assert.assertEquals(1, chargesPendingState.size());
-
- Integer savingsChargeId = (Integer) chargesPendingState.get(0).get("id");
- HashMap chargeChanges = this.savingsAccountHelper.updateCharges(savingsChargeId, savingsId);
- Assert.assertTrue(chargeChanges.containsKey("amount"));
-
- Integer deletedChargeId = this.savingsAccountHelper.deleteCharge(savingsChargeId, savingsId);
- assertEquals(savingsChargeId, deletedChargeId);
-
- chargesPendingState = this.savingsAccountHelper.getSavingsCharges(savingsId);
- Assert.assertTrue(chargesPendingState == null || chargesPendingState.size() == 0);
-
- savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap);
-
- savingsStatusHashMap = this.savingsAccountHelper.activateSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap);
-
- final Integer chargeId = ChargesHelper.createCharges(this.requestSpec, this.responseSpec, ChargesHelper.getSavingsAnnualFeeJSON());
- Assert.assertNotNull(chargeId);
-
- ArrayList<HashMap> charges = this.savingsAccountHelper.getSavingsCharges(savingsId);
- Assert.assertTrue(charges == null || charges.size() == 0);
-
- this.savingsAccountHelper.addChargesForSavings(savingsId, chargeId);
- charges = this.savingsAccountHelper.getSavingsCharges(savingsId);
- Assert.assertEquals(1, charges.size());
-
- HashMap savingsChargeForPay = charges.get(0);
- Integer annualSavingsChargeId = (Integer) savingsChargeForPay.get("id");
-
- ArrayList<HashMap> savingsAccountErrorData = (ArrayList<HashMap>) validationErrorHelper.inactivateCharge(annualSavingsChargeId,
- savingsId, CommonConstants.RESPONSE_ERROR);
- assertEquals("validation.msg.savingsaccountcharge.inactivation.of.charge.not.allowed.when.charge.is.due", savingsAccountErrorData
- .get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- SimpleDateFormat sdf = new SimpleDateFormat(CommonConstants.dateFormat, Locale.US);
- Calendar cal = Calendar.getInstance();
- List dates = (List) savingsChargeForPay.get("dueDate");
- cal.set(Calendar.YEAR, (Integer) dates.get(0));
- cal.set(Calendar.MONTH, (Integer) dates.get(1) - 1);
- cal.set(Calendar.DAY_OF_MONTH, (Integer) dates.get(2));
- int n = 0;
- Calendar current = Calendar.getInstance();
- while (cal.compareTo(current) < 0) {
- n++;
- cal.set(Calendar.YEAR, (Integer) dates.get(0) + n);
- }
- cal.set(Calendar.YEAR, (Integer) dates.get(0));
- cal.set(Calendar.MONTH, (Integer) dates.get(1) - 1);
- cal.set(Calendar.DAY_OF_MONTH, (Integer) dates.get(2));
-
- for (int i = 1; i <= n; i++) {
- this.savingsAccountHelper.payCharge((Integer) savingsChargeForPay.get("id"), savingsId,
- ((Float) savingsChargeForPay.get("amount")).toString(), sdf.format(cal.getTime()));
- HashMap paidCharge = this.savingsAccountHelper.getSavingsCharge(savingsId, (Integer) savingsChargeForPay.get("id"));
- Float expectedValue = (Float) savingsChargeForPay.get("amount") * i;
- assertEquals(expectedValue, paidCharge.get("amountPaid"));
- cal.set(Calendar.YEAR, (Integer) dates.get(0) + i);
- }
-
- Integer inactivatedChargeId = (Integer) this.savingsAccountHelper.inactivateCharge(annualSavingsChargeId, savingsId,
- CommonConstants.RESPONSE_RESOURCE_ID);
- assertEquals("Inactivated Savings Charges Id", annualSavingsChargeId, inactivatedChargeId);
-
- final Integer monthlyFeechargeId = ChargesHelper.createCharges(this.requestSpec, this.responseSpec,
- ChargesHelper.getSavingsMonthlyFeeJSON());
- Assert.assertNotNull(monthlyFeechargeId);
-
- this.savingsAccountHelper.addChargesForSavings(savingsId, monthlyFeechargeId);
- charges = this.savingsAccountHelper.getSavingsCharges(savingsId);
- Assert.assertEquals(2, charges.size());
-
- HashMap savingsChargeForWaive = charges.get(1);
- final Integer monthlySavingsCharge = (Integer) savingsChargeForWaive.get("id");
-
- savingsAccountErrorData = (ArrayList<HashMap>) validationErrorHelper.inactivateCharge(monthlySavingsCharge, savingsId,
- CommonConstants.RESPONSE_ERROR);
- assertEquals("validation.msg.savingsaccountcharge.inactivation.of.charge.not.allowed.when.charge.is.due", savingsAccountErrorData
- .get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- this.savingsAccountHelper.waiveCharge((Integer) savingsChargeForWaive.get("id"), savingsId);
- HashMap waiveCharge = this.savingsAccountHelper.getSavingsCharge(savingsId, (Integer) savingsChargeForWaive.get("id"));
- assertEquals(savingsChargeForWaive.get("amount"), waiveCharge.get("amountWaived"));
-
- this.savingsAccountHelper.waiveCharge((Integer) savingsChargeForWaive.get("id"), savingsId);
- waiveCharge = this.savingsAccountHelper.getSavingsCharge(savingsId, (Integer) savingsChargeForWaive.get("id"));
- BigDecimal totalWaiveAmount = BigDecimal.valueOf(Double.valueOf((Float) savingsChargeForWaive.get("amount")));
- totalWaiveAmount = totalWaiveAmount.add(totalWaiveAmount);
- assertEquals(totalWaiveAmount.floatValue(), waiveCharge.get("amountWaived"));
-
- final Integer weeklyFeeId = ChargesHelper.createCharges(this.requestSpec, this.responseSpec,
- ChargesHelper.getSavingsWeeklyFeeJSON());
- Assert.assertNotNull(weeklyFeeId);
-
- this.savingsAccountHelper.addChargesForSavings(savingsId, weeklyFeeId);
- charges = this.savingsAccountHelper.getSavingsCharges(savingsId);
- Assert.assertEquals(3, charges.size());
-
- savingsChargeForPay = charges.get(2);
- final Integer weeklySavingsFeeId = (Integer) savingsChargeForPay.get("id");
-
- savingsAccountErrorData = (ArrayList<HashMap>) validationErrorHelper.inactivateCharge(weeklySavingsFeeId, savingsId,
- CommonConstants.RESPONSE_ERROR);
- assertEquals("validation.msg.savingsaccountcharge.inactivation.of.charge.not.allowed.when.charge.is.due", savingsAccountErrorData
- .get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
-
- cal = Calendar.getInstance();
- dates = (List) savingsChargeForPay.get("dueDate");
- cal.set(Calendar.YEAR, (Integer) dates.get(0));
- cal.set(Calendar.MONTH, (Integer) dates.get(1) - 1);
- cal.set(Calendar.DAY_OF_MONTH, (Integer) dates.get(2));
-
- // Depositing huge amount as scheduler job deducts the fee amount
- Integer depositTransactionId = (Integer) this.savingsAccountHelper.depositToSavingsAccount(savingsId, "100000",
- SavingsAccountHelper.TRANSACTION_DATE, CommonConstants.RESPONSE_RESOURCE_ID);
- Assert.assertNotNull(depositTransactionId);
-
- this.savingsAccountHelper.payCharge((Integer) savingsChargeForPay.get("id"), savingsId,
- ((Float) savingsChargeForPay.get("amount")).toString(), sdf.format(cal.getTime()));
- HashMap paidCharge = this.savingsAccountHelper.getSavingsCharge(savingsId, (Integer) savingsChargeForPay.get("id"));
- assertEquals(savingsChargeForPay.get("amount"), paidCharge.get("amountPaid"));
- List nextDueDates = (List) paidCharge.get("dueDate");
- LocalDate nextDueDate = new LocalDate((Integer) nextDueDates.get(0), (Integer) nextDueDates.get(1), (Integer) nextDueDates.get(2));
- LocalDate expectedNextDueDate = new LocalDate((Integer) dates.get(0), (Integer) dates.get(1), (Integer) dates.get(2))
- .plusWeeks((Integer) paidCharge.get("feeInterval"));
- assertEquals(expectedNextDueDate, nextDueDate);
- }
-
- /***
- * Test case for overdraft account functionality. Open account with zero
- * balance, perform transactions then post interest and verify posted
- * interest
- */
- @SuppressWarnings("unchecked")
- @Test
- public void testSavingsAccountWithOverdraft() {
- this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
- final ResponseSpecification errorResponse = new ResponseSpecBuilder().expectStatusCode(400).build();
- final SavingsAccountHelper validationErrorHelper = new SavingsAccountHelper(this.requestSpec, errorResponse);
-
- /***
- * Create a client to apply for savings account (overdraft account).
- */
- final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientID);
- final String minBalanceForInterestCalculation = null;
-
- /***
- * Create savings product with zero opening balance and overdraft
- * enabled
- */
- final String zeroOpeningBalance = "0.0";
- final String minRequiredBalance = null;
- final String enforceMinRequiredBalance = "false";
- final boolean allowOverdraft = true;
- final Integer savingsProductID = createSavingsProduct(this.requestSpec, this.responseSpec, zeroOpeningBalance,
- minBalanceForInterestCalculation, minRequiredBalance, enforceMinRequiredBalance, allowOverdraft);
- Assert.assertNotNull(savingsProductID);
-
- /***
- * Apply for Savings account
- */
- final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplication(clientID, savingsProductID, ACCOUNT_TYPE_INDIVIDUAL);
- Assert.assertNotNull(savingsProductID);
-
- HashMap modifications = this.savingsAccountHelper.updateSavingsAccount(clientID, savingsProductID, savingsId,
- ACCOUNT_TYPE_INDIVIDUAL);
- Assert.assertTrue(modifications.containsKey("submittedOnDate"));
-
- HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId);
- SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
- /***
- * Approve the savings account
- */
- savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId);
- SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap);
-
- DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
- Calendar todaysDate = Calendar.getInstance();
- todaysDate.add(Calendar.MONTH, -1);
- todaysDate.set(Calendar.DAY_OF_MONTH, 1);
- final String ACTIVATION_DATE = dateFormat.format(todaysDate.getTime());
- final Integer lastDayOfMonth = todaysDate.getActualMaximum(Calendar.DAY_OF_MONTH);
- todaysDate.set(Calendar.DAY_OF_MONTH, lastDayOfMonth);
- final String TRANSACTION_DATE = dateFormat.format(todaysDate.getTime());
-
- /***
- * Activate the application and verify account status
- *
- * @param activationDate
- * this value is every time first day of previous month
- */
- savingsStatusHashMap = activateSavingsAccount(savingsId, ACTIVATION_DATE);
- SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap);
-
- /***
- * Verify the account summary
- */
- final HashMap summaryBefore = this.savingsAccountHelper.getSavingsSummary(savingsId);
- this.savingsAccountHelper.calculateInterestForSavings(savingsId);
- HashMap summary = this.savingsAccountHelper.getSavingsSummary(savingsId);
- assertEquals(summaryBefore, summary);
-
- Float balance = Float.valueOf(zeroOpeningBalance);
-
- /***
- * Perform withdraw transaction, verify account balance(account balance
- * will go to negative as no deposits are there prior to this
- * transaction)
- */
- Integer withdrawTransactionId = (Integer) this.savingsAccountHelper.withdrawalFromSavingsAccount(savingsId, WITHDRAW_AMOUNT,
- ACTIVATION_DATE, CommonConstants.RESPONSE_RESOURCE_ID);
- HashMap withdrawTransaction = this.savingsAccountHelper.getSavingsTransaction(savingsId, withdrawTransactionId);
- balance -= new Float(WITHDRAW_AMOUNT);
- assertEquals("Verifying Withdrawal Amount", new Float(WITHDRAW_AMOUNT), withdrawTransaction.get("amount"));
- assertEquals("Verifying Balance after Withdrawal", balance, withdrawTransaction.get("runningBalance"));
-
- /***
- * Perform Deposit transaction on last day of month and verify account
- * balance.
- *
- * @param transactionDate
- * this value is every time last day of previous month
- */
- Integer depositTransactionId = (Integer) this.savingsAccountHelper.depositToSavingsAccount(savingsId, DEPOSIT_AMOUNT,
- TRANSACTION_DATE, CommonConstants.RESPONSE_RESOURCE_ID);
- HashMap depositTransaction = this.savingsAccountHelper.getSavingsTransaction(savingsId, depositTransactionId);
- balance += new Float(DEPOSIT_AMOUNT);
- assertEquals("Verifying Deposit Amount", new Float(DEPOSIT_AMOUNT), depositTransaction.get("amount"));
- assertEquals("Verifying Balance after Deposit", balance, depositTransaction.get("runningBalance"));
-
- /***
- * Perform Post interest transaction and verify the posted amount
- */
- this.savingsAccountHelper.postInterestForSavings(savingsId);
- HashMap accountDetails = this.savingsAccountHelper.getSavingsDetails(savingsId);
- summary = (HashMap) accountDetails.get("summary");
- Float actualInterestPosted = Float.valueOf(summary.get("totalInterestPosted").toString());
-
- /***
- * Calculate expected interest to be posted, interest should be posted
- * for one day only because deposit transaction happened on last day of
- * month before this account balance is negative.
- */
- final Float nominalAnnualInterest = Float.valueOf(accountDetails.get("nominalAnnualInterestRate").toString());
- final HashMap interestCalculationDaysInYearType = (HashMap) accountDetails.get("interestCalculationDaysInYearType");
- final Integer daysInYear = Integer.valueOf(interestCalculationDaysInYearType.get("id").toString());
- double interestRateInFraction = (nominalAnnualInterest / 100);
- double perDay = (double) 1 / (daysInYear);
- double interestPerDay = interestRateInFraction * perDay;
- Float interestPosted = (float) (interestPerDay * balance * 1);
-
- /***
- * Apply rounding on interestPosted, actualInterestPosted and verify
- * both are same
- */
- DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
- decimalFormat.applyPattern("#.###");
- interestPosted = new Float(decimalFormat.format(interestPosted));
- actualInterestPosted = new Float(decimalFormat.format(actualInterestPosted));
- assertEquals("Verifying interest posted", interestPosted, actualInterestPosted);
-
- todaysDate = Calendar.getInstance();
- final String CLOSEDON_DATE = dateFormat.format(todaysDate.getTime());
- String withdrawBalance = "false";
- ArrayList<HashMap> savingsAccountErrorData = (ArrayList<HashMap>) validationErrorHelper.closeSavingsAccountAndGetBackRequiredField(
- savingsId, withdrawBalance, CommonConstants.RESPONSE_ERROR, CLOSEDON_DATE);
- assertEquals("validation.msg.savingsaccount.close.results.in.balance.not.zero",
- savingsAccountErrorData.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
- }
-
- private HashMap activateSavingsAccount(final Integer savingsId, final String activationDate) {
- final HashMap status = this.savingsAccountHelper.activateSavingsAccount(savingsId, activationDate);
- return status;
- }
-
- private Integer createSavingsProduct(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
- final String minOpenningBalance, String minBalanceForInterestCalculation, String minRequiredBalance,
- String enforceMinRequiredBalance, final boolean allowOverdraft) {
- System.out.println("------------------------------CREATING NEW SAVINGS PRODUCT ---------------------------------------");
- SavingsProductHelper savingsProductHelper = new SavingsProductHelper();
- if (allowOverdraft) {
- final String overDraftLimit = "2000.0";
- savingsProductHelper = savingsProductHelper.withOverDraft(overDraftLimit);
- }
-
- final String savingsProductJSON = savingsProductHelper
- //
- .withInterestCompoundingPeriodTypeAsDaily()
- //
- .withInterestPostingPeriodTypeAsMonthly()
- //
- .withInterestCalculationPeriodTypeAsDailyBalance()
- //
- .withMinBalanceForInterestCalculation(minBalanceForInterestCalculation)
- //
- .withMinRequiredBalance(minRequiredBalance).withEnforceMinRequiredBalance(enforceMinRequiredBalance)
- .withMinimumOpenningBalance(minOpenningBalance).build();
- return SavingsProductHelper.createSavingsProduct(savingsProductJSON, requestSpec, responseSpec);
- }
-
- /*
- * private void verifySavingsInterest(final Object savingsInterest) {
- * System.out.println(
- * "--------------------VERIFYING THE BALANCE, INTEREST --------------------------"
- * );
- *
- * assertEquals("Verifying Interest Calculation", new Float("238.3399"),
- * savingsInterest); }
- */
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/66cee785/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientStatusChecker.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientStatusChecker.java
deleted file mode 100644
index 12863bb..0000000
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientStatusChecker.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.fineract.integrationtests;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.HashMap;
-
-public class ClientStatusChecker {
-
- public static void verifyClientIsActive(final HashMap<String, Object> clientStatusHashMap) {
- assertEquals((int) clientStatusHashMap.get("id"), 300);
- }
-
- public static void verifyClientClosed(final HashMap<String, Object> clientStatusHashMap) {
- System.out.println("\n-------------------------------------- VERIFYING CLIENT IS CLOSED ------------------------------------");
- assertEquals((int) clientStatusHashMap.get("id"), 600);
- System.out.println("Client Status:" + clientStatusHashMap + "\n");
- }
-
- public static void verifyClientPending(final HashMap<String, Object> clientStatusHashMap) {
- System.out.println("\n-------------------------------------- VERIFYING CLIENT IS PENDING ------------------------------------");
- assertEquals((int) clientStatusHashMap.get("id"), 100);
- System.out.println("Client Status:" + clientStatusHashMap + "\n");
- }
-
- public static void verifyClientRejected(final HashMap<String, Object> clientStatusHashMap) {
- System.out.println("\n-------------------------------------- VERIFYING CLIENT IS REJECTED ------------------------------------");
- assertEquals((int) clientStatusHashMap.get("id"), 700);
- System.out.println("Client Status:" + clientStatusHashMap + "\n");
- }
-
- public static void verifyClientActiavted(final HashMap<String, Object> clientStatusHashMap) {
- System.out.println("\n-------------------------------------- VERIFYING CLIENT IS ACTIVATED ------------------------------------");
- assertEquals((int) clientStatusHashMap.get("id"), 300);
- System.out.println("Client Status:" + clientStatusHashMap + "\n");
- }
-
- public static void verifyClientWithdrawn(final HashMap<String, Object> clientStatusHashMap) {
- System.out.println("\n-------------------------------------- VERIFYING CLIENT IS WITHDRAWN ------------------------------------");
- assertEquals((int) clientStatusHashMap.get("id"), 800);
- System.out.println("Client Status:" + clientStatusHashMap + "\n");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/66cee785/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientTest.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientTest.java
deleted file mode 100644
index 0d1b86e..0000000
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.fineract.integrationtests;
-
-import java.util.HashMap;
-
-import org.apache.fineract.integrationtests.common.ClientHelper;
-import org.apache.fineract.integrationtests.common.Utils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
-public class ClientTest {
-
- private ResponseSpecification responseSpec;
- private RequestSpecification requestSpec;
- private ClientHelper clientHelper;
-
- @Before
- public void setup() {
- Utils.initializeRESTAssured();
- this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
- this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
- this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
-
- }
-
- @Test
- public void testClientStatus() {
- this.clientHelper = new ClientHelper(this.requestSpec, this.responseSpec);
- final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientId);
-
- HashMap<String, Object> status = ClientHelper.getClientStatus(requestSpec, responseSpec, String.valueOf(clientId));
- ClientStatusChecker.verifyClientIsActive(status);
-
- HashMap<String, Object> clientStatusHashMap = this.clientHelper.closeClient(clientId);
- ClientStatusChecker.verifyClientClosed(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.reactivateClient(clientId);
- ClientStatusChecker.verifyClientPending(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.rejectClient(clientId);
- ClientStatusChecker.verifyClientRejected(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.activateClient(clientId);
- ClientStatusChecker.verifyClientActiavted(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.closeClient(clientId);
- ClientStatusChecker.verifyClientClosed(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.reactivateClient(clientId);
- ClientStatusChecker.verifyClientPending(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.withdrawClient(clientId);
- ClientStatusChecker.verifyClientWithdrawn(clientStatusHashMap);
-
- }
-
- @Test
- public void testClientAsPersonStatus() {
-
- this.clientHelper = new ClientHelper(this.requestSpec, this.responseSpec);
- final Integer clientId = ClientHelper.createClientAsPerson(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientId);
-
- HashMap<String, Object> status = ClientHelper.getClientStatus(requestSpec, responseSpec, String.valueOf(clientId));
- ClientStatusChecker.verifyClientIsActive(status);
-
- HashMap<String, Object> clientStatusHashMap = this.clientHelper.closeClient(clientId);
- ClientStatusChecker.verifyClientClosed(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.reactivateClient(clientId);
- ClientStatusChecker.verifyClientPending(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.rejectClient(clientId);
- ClientStatusChecker.verifyClientRejected(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.activateClient(clientId);
- ClientStatusChecker.verifyClientActiavted(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.closeClient(clientId);
- ClientStatusChecker.verifyClientClosed(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.reactivateClient(clientId);
- ClientStatusChecker.verifyClientPending(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.withdrawClient(clientId);
- ClientStatusChecker.verifyClientWithdrawn(clientStatusHashMap);
-
- }
-
- @Test
- public void testClientAsEntityStatus() {
-
- this.clientHelper = new ClientHelper(this.requestSpec, this.responseSpec);
- final Integer clientId = ClientHelper.createClientAsEntity(this.requestSpec, this.responseSpec);
- Assert.assertNotNull(clientId);
-
- HashMap<String, Object> status = ClientHelper.getClientStatus(requestSpec, responseSpec, String.valueOf(clientId));
- ClientStatusChecker.verifyClientIsActive(status);
-
- HashMap<String, Object> clientStatusHashMap = this.clientHelper.closeClient(clientId);
- ClientStatusChecker.verifyClientClosed(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.reactivateClient(clientId);
- ClientStatusChecker.verifyClientPending(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.rejectClient(clientId);
- ClientStatusChecker.verifyClientRejected(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.activateClient(clientId);
- ClientStatusChecker.verifyClientActiavted(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.closeClient(clientId);
- ClientStatusChecker.verifyClientClosed(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.reactivateClient(clientId);
- ClientStatusChecker.verifyClientPending(clientStatusHashMap);
-
- clientStatusHashMap = this.clientHelper.withdrawClient(clientId);
- ClientStatusChecker.verifyClientWithdrawn(clientStatusHashMap);
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/66cee785/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java
deleted file mode 100755
index 9548dc7..0000000
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.fineract.integrationtests;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Locale;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.apache.fineract.integrationtests.common.ClientHelper;
-import org.apache.fineract.integrationtests.common.Utils;
-import org.apache.fineract.integrationtests.common.accounting.Account;
-import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
-import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
-import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
-public class ConcurrencyIntegrationTest {
-
- private ResponseSpecification responseSpec;
- private RequestSpecification requestSpec;
- private LoanTransactionHelper loanTransactionHelper;
-
- private static final String NO_ACCOUNTING = "1";
-
- final int MYTHREADS = 30;
-
- @Before
- public void setup() {
- Utils.initializeRESTAssured();
- this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
- this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
- this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
- this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
- }
-
- @Test
- public void verifyConcurrentLoanRepayments() {
- this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
- final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
- ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
- final Integer loanProductID = createLoanProduct(false, NO_ACCOUNTING);
- final Integer loanID = applyForLoanApplication(clientID, loanProductID, "12,000.00");
- this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
- this.loanTransactionHelper.disburseLoan("20 September 2011", loanID, "12,000.00");
-
- ExecutorService executor = Executors.newFixedThreadPool(MYTHREADS);
- Calendar date = Calendar.getInstance();
- date.set(2011, 9, 20);
- Float repaymentAmount = 100.0f;
- for (int i = 0; i < 10; i++) {
- System.out.println("Starting concurrent transaction number " + i);
- date.add(Calendar.DAY_OF_MONTH, 1);
- repaymentAmount = repaymentAmount + 100;
- Runnable worker = new LoanRepaymentExecutor(loanTransactionHelper, loanID, repaymentAmount, date);
- executor.execute(worker);
- }
-
- executor.shutdown();
- // Wait until all threads are finish
- while (!executor.isTerminated()) {
-
- }
- System.out.println("\nFinished all threads");
-
- }
-
- private Integer createLoanProduct(final boolean multiDisburseLoan, final String accountingRule, final Account... accounts) {
- System.out.println("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------");
- LoanProductTestBuilder builder = new LoanProductTestBuilder() //
- .withPrincipal("12,000.00") //
- .withNumberOfRepayments("4") //
- .withRepaymentAfterEvery("1") //
- .withRepaymentTypeAsMonth() //
- .withinterestRatePerPeriod("1") //
- .withInterestRateFrequencyTypeAsMonths() //
- .withAmortizationTypeAsEqualInstallments() //
- .withInterestTypeAsDecliningBalance() //
- .withTranches(multiDisburseLoan) //
- .withAccounting(accountingRule, accounts);
-
- if (multiDisburseLoan) {
- builder = builder.withInterestCalculationPeriodTypeAsRepaymentPeriod(true);
- }
- final String loanProductJSON = builder.build(null);
- return this.loanTransactionHelper.getLoanProductId(loanProductJSON);
- }
-
- private Integer applyForLoanApplication(final Integer clientID, final Integer loanProductID, String principal) {
- System.out.println("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
- final String loanApplicationJSON = new LoanApplicationTestBuilder() //
- .withPrincipal(principal) //
- .withLoanTermFrequency("4") //
- .withLoanTermFrequencyAsMonths() //
- .withNumberOfRepayments("4") //
- .withRepaymentEveryAfter("1") //
- .withRepaymentFrequencyTypeAsMonths() //
- .withInterestRatePerPeriod("2") //
- .withAmortizationTypeAsEqualInstallments() //
- .withInterestTypeAsDecliningBalance() //
- .withInterestCalculationPeriodTypeSameAsRepaymentPeriod() //
- .withExpectedDisbursementDate("20 September 2011") //
- .withSubmittedOnDate("20 September 2011") //
- .build(clientID.toString(), loanProductID.toString(), null);
- return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
- }
-
- public static class LoanRepaymentExecutor implements Runnable {
-
- private final Integer loanId;
- private final Float repaymentAmount;
- private final String repaymentDate;
- private final LoanTransactionHelper loanTransactionHelper;
-
- DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-
- LoanRepaymentExecutor(LoanTransactionHelper loanTransactionHelper, Integer loanId, Float repaymentAmount, Calendar repaymentDate) {
- this.loanId = loanId;
- this.repaymentAmount = repaymentAmount;
- this.repaymentDate = dateFormat.format(repaymentDate.getTime());
- this.loanTransactionHelper = loanTransactionHelper;
- }
-
- @Override
- public void run() {
- try {
- this.loanTransactionHelper.makeRepayment(repaymentDate, repaymentAmount, loanId);
- } catch (Exception e) {
- System.out.println("Found an exception" + e.getMessage());
- System.out.println("Details of failed concurrent transaction (date, amount, loanId) are " + repaymentDate + ","
- + repaymentAmount + "," + loanId);
- throw (e);
- }
- System.out.println("Details of passed concurrent transaction, details (date, amount, loanId) are " + repaymentDate + ","
- + repaymentAmount + "," + loanId);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/66cee785/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrenciesTest.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrenciesTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrenciesTest.java
deleted file mode 100644
index a418c4c..0000000
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrenciesTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.fineract.integrationtests;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-import org.apache.fineract.integrationtests.common.CurrenciesHelper;
-import org.apache.fineract.integrationtests.common.CurrencyDomain;
-import org.apache.fineract.integrationtests.common.Utils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
-@SuppressWarnings({ "unused", "rawtypes" })
-public class CurrenciesTest {
-
- private ResponseSpecification responseSpec;
- private RequestSpecification requestSpec;
-
- @Before
- public void setup() {
- Utils.initializeRESTAssured();
- this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
- this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
- this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
- }
-
- @Test
- public void testCurrencyElements() {
-
- CurrencyDomain currency = CurrenciesHelper.getCurrencybyCode(requestSpec, responseSpec, "USD");
- CurrencyDomain usd = CurrencyDomain.create("USD", "US Dollar", 2, "$", "currency.USD", "US Dollar ($)").build();
-
- Assert.assertTrue(currency.getDecimalPlaces() >= 0);
- Assert.assertNotNull(currency.getName());
- Assert.assertNotNull(currency.getDisplaySymbol());
- Assert.assertNotNull(currency.getDisplayLabel());
- Assert.assertNotNull(currency.getNameCode());
-
- Assert.assertEquals(usd, currency);
- }
-
- @Test
- public void testUpdateCurrencySelection() {
-
- // Test updation
- ArrayList<String> currenciestoUpdate = new ArrayList<String>();
- currenciestoUpdate.add("KES");
- currenciestoUpdate.add("BND");
- currenciestoUpdate.add("LBP");
- currenciestoUpdate.add("GHC");
- currenciestoUpdate.add("USD");
-
- ArrayList<String> currenciesOutput = CurrenciesHelper.updateSelectedCurrencies(this.requestSpec, this.responseSpec,
- currenciestoUpdate);
- Assert.assertNotNull(currenciesOutput);
-
- Assert.assertEquals("Verifying Do Outputed Currencies Match after Updation", currenciestoUpdate, currenciesOutput);
-
- // Test that output matches updation
- ArrayList<CurrencyDomain> currenciesBeforeUpdate = new ArrayList<CurrencyDomain>();
- for (String e : currenciestoUpdate) {
- currenciesBeforeUpdate.add(CurrenciesHelper.getCurrencybyCode(requestSpec, responseSpec, e));
- }
- Collections.sort(currenciesBeforeUpdate);
-
- ArrayList<CurrencyDomain> currenciesAfterUpdate = CurrenciesHelper.getSelectedCurrencies(requestSpec, responseSpec);
- Assert.assertNotNull(currenciesAfterUpdate);
-
- Assert.assertEquals("Verifying Do Selected Currencies Match after Updation", currenciesBeforeUpdate, currenciesAfterUpdate);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/66cee785/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrencyIntegrationTest.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrencyIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrencyIntegrationTest.java
deleted file mode 100644
index 2468a40..0000000
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrencyIntegrationTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.fineract.integrationtests;
-
-import org.apache.fineract.integrationtests.common.Utils;
-import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper;
-import org.junit.Before;
-
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
-public class CurrencyIntegrationTest {
-
- private ResponseSpecification responseSpec;
- private RequestSpecification requestSpec;
- private SavingsAccountHelper savingsAccountHelper;
-
-
- @Before
- public void setup() {
- Utils.initializeRESTAssured();
- this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
- this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
- this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
- }
-}