From 15a9804427c285ffc896780e9373b4c85fc7df77 Mon Sep 17 00:00:00 2001 From: mplescano Date: Mon, 29 Sep 2014 11:24:28 -0500 Subject: [PATCH] Fixing for locale differents of English --- .../AccountingScenarioIntegrationTest.java | 16 ++- .../ClientSavingsIntegrationTest.java | 10 +- .../integrationtests/FixedDepositTest.java | 118 ++++++++-------- .../GroupSavingsIntegrationTest.java | 5 +- .../RecurringDepositTest.java | 130 +++++++++--------- .../SchedulerJobsTestResults.java | 16 ++- .../integrationtests/SystemCodeTest.java | 2 +- .../integrationtests/common/Utils.java | 3 +- .../RecurringDepositAccountHelper.java | 3 +- .../common/savings/SavingsAccountHelper.java | 3 +- .../java/org/mifosplatform/common/Utils.java | 3 +- 11 files changed, 162 insertions(+), 147 deletions(-) diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountingScenarioIntegrationTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountingScenarioIntegrationTest.java index 4a9d5ef6e..250aa2231 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountingScenarioIntegrationTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountingScenarioIntegrationTest.java @@ -9,12 +9,14 @@ import static org.junit.Assert.assertEquals; import java.text.DateFormat; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import java.text.ParseException; 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.joda.time.Days; import org.joda.time.LocalDate; @@ -336,7 +338,7 @@ public class AccountingScenarioIntegrationTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -418,7 +420,7 @@ public class AccountingScenarioIntegrationTest { final Account expenseAccount = this.accountHelper.createExpenseAccount(); final Account liabilityAccount = this.accountHelper.createLiabilityAccount(); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -683,7 +685,7 @@ public class AccountingScenarioIntegrationTest { LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap); LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); Calendar todayDate = Calendar.getInstance(); final String currentDate = dateFormat.format(todayDate.getTime()); @@ -742,7 +744,7 @@ public class AccountingScenarioIntegrationTest { int totalDaysInPeriod = Days.daysBetween(fromDateLocal, dueDateLocal).getDays(); float totalInterest = (float) loanSchedule.get(1).get("interestOriginalDue"); - DecimalFormat numberFormat = new DecimalFormat("#.00"); + DecimalFormat numberFormat = new DecimalFormat("#.00", new DecimalFormatSymbols(Locale.US)); float INTEREST_4_DAYS = totalInterest / totalDaysInPeriod * 4; INTEREST_4_DAYS = new Float(numberFormat.format(INTEREST_4_DAYS)); @@ -778,7 +780,7 @@ public class AccountingScenarioIntegrationTest { LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap); LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); Calendar todayDate = Calendar.getInstance(); final String currentDate = dateFormat.format(todayDate.getTime()); @@ -836,7 +838,7 @@ public class AccountingScenarioIntegrationTest { int totalDaysInPeriod = Days.daysBetween(fromDateLocal, dueDateLocal).getDays(); float totalInterest = (float) loanSchedule.get(1).get("interestOriginalDue"); - DecimalFormat numberFormat = new DecimalFormat("#.00"); + DecimalFormat numberFormat = new DecimalFormat("#.00", new DecimalFormatSymbols(Locale.US)); float INTEREST_3_DAYS = totalInterest / totalDaysInPeriod * 3; INTEREST_3_DAYS = new Float(numberFormat.format(INTEREST_3_DAYS)); this.loanTransactionHelper.checkAccrualTransactionForRepayment(getDateAsLocalDate(runOndate), INTEREST_3_DAYS, FEE_PORTION, @@ -966,7 +968,7 @@ public class AccountingScenarioIntegrationTest { private LocalDate getDateAsLocalDate(String dateAsString) { LocalDate date = null; try { - DateFormat df = new SimpleDateFormat("dd MMMM yyyy"); + DateFormat df = new SimpleDateFormat("dd MMMM yyyy", Locale.US); date = new LocalDate(df.parse(dateAsString)); } catch (ParseException e) { e.printStackTrace(); diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/ClientSavingsIntegrationTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/ClientSavingsIntegrationTest.java index 2b551fce4..4ce702fb1 100755 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/ClientSavingsIntegrationTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/ClientSavingsIntegrationTest.java @@ -10,11 +10,13 @@ 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.joda.time.LocalDate; import org.junit.Assert; @@ -175,7 +177,7 @@ public class ClientSavingsIntegrationTest { savingsStatusHashMap = this.savingsAccountHelper.activateSavings(savingsId); SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); Calendar todaysDate = Calendar.getInstance(); final String CLOSEDON_DATE = dateFormat.format(todaysDate.getTime()); String withdrawBalance = "false"; @@ -472,7 +474,7 @@ public class ClientSavingsIntegrationTest { 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); + 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)); @@ -602,7 +604,7 @@ public class ClientSavingsIntegrationTest { savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId); SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); + 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); @@ -681,7 +683,7 @@ public class ClientSavingsIntegrationTest { * Apply rounding on interestPosted, actualInterestPosted and verify * both are same */ - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("#.###"); interestPosted = new Float(decimalFormat.format(interestPosted)); actualInterestPosted = new Float(decimalFormat.format(actualInterestPosted)); diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FixedDepositTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FixedDepositTest.java index 51f171233..5b8cec222 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FixedDepositTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/FixedDepositTest.java @@ -9,6 +9,7 @@ import static org.junit.Assert.assertEquals; import java.text.DateFormat; import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -16,6 +17,7 @@ import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.Locale; import org.joda.time.DateTime; import org.joda.time.Days; @@ -116,8 +118,8 @@ public class FixedDepositTest { final Account expenseAccount = this.accountHelper.createExpenseAccount(); final Account liabilityAccount = this.accountHelper.createLiabilityAccount(); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -256,8 +258,8 @@ public class FixedDepositTest { final Account expenseAccount = this.accountHelper.createExpenseAccount(); final Account liabilityAccount = this.accountHelper.createLiabilityAccount(); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -427,8 +429,8 @@ public class FixedDepositTest { final Account expenseAccount = this.accountHelper.createExpenseAccount(); final Account liabilityAccount = this.accountHelper.createLiabilityAccount(); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -522,8 +524,8 @@ public class FixedDepositTest { this.fixedDepositProductHelper = new FixedDepositProductHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -3); @@ -565,8 +567,8 @@ public class FixedDepositTest { this.fixedDepositProductHelper = new FixedDepositProductHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -3); @@ -608,8 +610,8 @@ public class FixedDepositTest { this.accountHelper = new AccountHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -3); @@ -649,8 +651,8 @@ public class FixedDepositTest { this.accountHelper = new AccountHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -3); @@ -689,8 +691,8 @@ public class FixedDepositTest { this.fixedDepositProductHelper = new FixedDepositProductHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -3); @@ -727,8 +729,8 @@ public class FixedDepositTest { this.fixedDepositProductHelper = new FixedDepositProductHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -784,7 +786,7 @@ public class FixedDepositTest { principal = this.fixedDepositAccountHelper.getPrincipalAfterCompoundingInterest(todaysDate, principal, depositPeriod, interestPerDay, MONTHLY_INTERVAL, MONTHLY_INTERVAL); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); maturityAmount = new Float(decimalFormat.format(maturityAmount)); @@ -797,8 +799,8 @@ public class FixedDepositTest { this.fixedDepositProductHelper = new FixedDepositProductHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -857,7 +859,7 @@ public class FixedDepositTest { principal = this.fixedDepositAccountHelper.getPrincipalAfterCompoundingInterest(todaysDate, principal, depositPeriod, interestPerDay, MONTHLY_INTERVAL, MONTHLY_INTERVAL); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); maturityAmount = new Float(decimalFormat.format(maturityAmount)); @@ -872,8 +874,8 @@ public class FixedDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -959,7 +961,7 @@ public class FixedDepositTest { fixedDepositAccountData = this.fixedDepositAccountHelper.getFixedDepositAccountById(this.requestSpec, this.responseSpec, fixedDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); @@ -976,8 +978,8 @@ public class FixedDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1067,7 +1069,7 @@ public class FixedDepositTest { fixedDepositAccountData = this.fixedDepositAccountHelper.getFixedDepositAccountById(this.requestSpec, this.responseSpec, fixedDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); @@ -1084,8 +1086,8 @@ public class FixedDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1180,7 +1182,7 @@ public class FixedDepositTest { fixedDepositAccountData = this.fixedDepositAccountHelper.getFixedDepositAccountById(this.requestSpec, this.responseSpec, fixedDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(fixedDepositAccountData.get("maturityAmount"))); @@ -1196,8 +1198,8 @@ public class FixedDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1296,7 +1298,7 @@ public class FixedDepositTest { fixedDepositAccountData = this.fixedDepositAccountHelper.getFixedDepositAccountById(this.requestSpec, this.responseSpec, fixedDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(fixedDepositAccountData.get("maturityAmount"))); @@ -1310,8 +1312,8 @@ public class FixedDepositTest { this.fixedDepositProductHelper = new FixedDepositProductHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1372,7 +1374,7 @@ public class FixedDepositTest { principal = this.fixedDepositAccountHelper.getPrincipalAfterCompoundingInterest(todaysDate, principal, depositPeriod, interestPerDay, DAILY_COMPOUNDING_INTERVAL, MONTHLY_INTERVAL); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); maturityAmount = new Float(decimalFormat.format(maturityAmount)); @@ -1386,8 +1388,8 @@ public class FixedDepositTest { this.fixedDepositProductHelper = new FixedDepositProductHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1448,7 +1450,7 @@ public class FixedDepositTest { principal = this.fixedDepositAccountHelper.getPrincipalAfterCompoundingInterest(todaysDate, principal, depositPeriod, interestPerDay, DAILY_COMPOUNDING_INTERVAL, MONTHLY_INTERVAL); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); maturityAmount = new Float(decimalFormat.format(maturityAmount)); @@ -1462,8 +1464,8 @@ public class FixedDepositTest { this.fixedDepositProductHelper = new FixedDepositProductHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentMonthFormat = new SimpleDateFormat("MM"); DateFormat currentDateFormat = new SimpleDateFormat("dd"); @@ -1532,7 +1534,7 @@ public class FixedDepositTest { fixedDepositAccountData = this.fixedDepositAccountHelper.getFixedDepositAccountById(this.requestSpec, this.responseSpec, fixedDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(fixedDepositAccountData.get("maturityAmount"))); @@ -1546,8 +1548,8 @@ public class FixedDepositTest { this.fixedDepositProductHelper = new FixedDepositProductHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentMonthFormat = new SimpleDateFormat("MM"); DateFormat currentDateFormat = new SimpleDateFormat("dd"); @@ -1616,7 +1618,7 @@ public class FixedDepositTest { fixedDepositAccountData = this.fixedDepositAccountHelper.getFixedDepositAccountById(this.requestSpec, this.responseSpec, fixedDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(fixedDepositAccountData.get("maturityAmount"))); @@ -1632,8 +1634,8 @@ public class FixedDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentMonthFormat = new SimpleDateFormat("MM"); DateFormat currentDateFormat = new SimpleDateFormat("dd"); @@ -1698,7 +1700,7 @@ public class FixedDepositTest { fixedDepositAccountData = this.fixedDepositAccountHelper.getFixedDepositAccountById(this.requestSpec, this.responseSpec, fixedDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(fixedDepositAccountData.get("maturityAmount"))); @@ -1714,8 +1716,8 @@ public class FixedDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentMonthFormat = new SimpleDateFormat("MM"); DateFormat currentDateFormat = new SimpleDateFormat("dd"); @@ -1780,7 +1782,7 @@ public class FixedDepositTest { fixedDepositAccountData = this.fixedDepositAccountHelper.getFixedDepositAccountById(this.requestSpec, this.responseSpec, fixedDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(fixedDepositAccountData.get("maturityAmount"))); @@ -1796,8 +1798,8 @@ public class FixedDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentMonthFormat = new SimpleDateFormat("MM"); DateFormat currentDateFormat = new SimpleDateFormat("dd"); @@ -1862,7 +1864,7 @@ public class FixedDepositTest { fixedDepositAccountData = this.fixedDepositAccountHelper.getFixedDepositAccountById(this.requestSpec, this.responseSpec, fixedDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(fixedDepositAccountData.get("maturityAmount"))); @@ -1877,8 +1879,8 @@ public class FixedDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentMonthFormat = new SimpleDateFormat("MM"); DateFormat currentDateFormat = new SimpleDateFormat("dd"); @@ -1943,7 +1945,7 @@ public class FixedDepositTest { fixedDepositAccountData = this.fixedDepositAccountHelper.getFixedDepositAccountById(this.requestSpec, this.responseSpec, fixedDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(fixedDepositAccountData.get("maturityAmount"))); diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupSavingsIntegrationTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupSavingsIntegrationTest.java index f0b84c932..0ba4d1d52 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupSavingsIntegrationTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/GroupSavingsIntegrationTest.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.HashMap; import java.util.List; +import java.util.Locale; import org.joda.time.LocalDate; import org.junit.Assert; @@ -140,7 +141,7 @@ public class GroupSavingsIntegrationTest { savingsStatusHashMap = this.savingsAccountHelper.activateSavings(savingsId); SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); Calendar todaysDate = Calendar.getInstance(); final String CLOSEDON_DATE = dateFormat.format(todaysDate.getTime()); String withdrawBalance = "false"; @@ -456,7 +457,7 @@ public class GroupSavingsIntegrationTest { Assert.assertEquals(1, charges.size()); HashMap savingsChargeForPay = charges.get(0); - SimpleDateFormat sdf = new SimpleDateFormat(CommonConstants.dateFormat); + 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)); diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/RecurringDepositTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/RecurringDepositTest.java index 263677aeb..ddbd01690 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/RecurringDepositTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/RecurringDepositTest.java @@ -9,11 +9,13 @@ import static org.junit.Assert.assertEquals; 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 net.sf.ehcache.transaction.xa.EhcacheXAException; @@ -117,8 +119,8 @@ public class RecurringDepositTest { final Account expenseAccount = this.accountHelper.createExpenseAccount(); final Account liabilityAccount = this.accountHelper.createLiabilityAccount(); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -269,8 +271,8 @@ public class RecurringDepositTest { final Account expenseAccount = this.accountHelper.createExpenseAccount(); final Account liabilityAccount = this.accountHelper.createLiabilityAccount(); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -449,7 +451,7 @@ public class RecurringDepositTest { Float balanceAfter = (Float) savingsSummaryAfter.get("accountBalance"); Float expectedSavingsBalance = balanceBefore + prematurityAmount; - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Assert.assertEquals("Verifying Savings Account Balance after Premature Closure", decimalFormat.format(expectedSavingsBalance), @@ -479,8 +481,8 @@ public class RecurringDepositTest { final Account expenseAccount = this.accountHelper.createExpenseAccount(); final Account liabilityAccount = this.accountHelper.createLiabilityAccount(); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -613,8 +615,8 @@ public class RecurringDepositTest { this.recurringDepositProductHelper = new RecurringDepositProductHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -3); @@ -656,8 +658,8 @@ public class RecurringDepositTest { this.recurringDepositProductHelper = new RecurringDepositProductHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -3); @@ -704,8 +706,8 @@ public class RecurringDepositTest { this.accountHelper = new AccountHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -3); @@ -751,8 +753,8 @@ public class RecurringDepositTest { this.accountHelper = new AccountHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -3); @@ -796,8 +798,8 @@ public class RecurringDepositTest { this.recurringDepositProductHelper = new RecurringDepositProductHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -3); @@ -848,8 +850,8 @@ public class RecurringDepositTest { final Account expenseAccount = this.accountHelper.createExpenseAccount(); final Account liabilityAccount = this.accountHelper.createLiabilityAccount(); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -3); @@ -971,8 +973,8 @@ public class RecurringDepositTest { this.recurringDepositProductHelper = new RecurringDepositProductHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1034,7 +1036,7 @@ public class RecurringDepositTest { principal = this.recurringDepositAccountHelper.getPrincipalAfterCompoundingInterest(todaysDate, principal, depositAmount, depositPeriod, interestPerDay, MONTHLY_INTERVAL, MONTHLY_INTERVAL); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); maturityAmount = new Float(decimalFormat.format(maturityAmount)); @@ -1051,8 +1053,8 @@ public class RecurringDepositTest { this.recurringDepositProductHelper = new RecurringDepositProductHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1119,7 +1121,7 @@ public class RecurringDepositTest { principal = this.recurringDepositAccountHelper.getPrincipalAfterCompoundingInterest(todaysDate, principal, depositAmount, depositPeriod, interestPerDay, MONTHLY_INTERVAL, MONTHLY_INTERVAL); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); maturityAmount = new Float(decimalFormat.format(maturityAmount)); @@ -1135,8 +1137,8 @@ public class RecurringDepositTest { this.recurringDepositProductHelper = new RecurringDepositProductHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1197,7 +1199,7 @@ public class RecurringDepositTest { System.out.println("per day = " + perDay); double interestPerDay = interestRateInFraction * perDay; - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Integer currentDate = new Integer(currentDateFormat.format(todaysDate.getTime())); @@ -1233,8 +1235,8 @@ public class RecurringDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1339,7 +1341,7 @@ public class RecurringDepositTest { recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, this.responseSpec, recurringDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); @@ -1360,8 +1362,8 @@ public class RecurringDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1471,7 +1473,7 @@ public class RecurringDepositTest { recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, this.responseSpec, recurringDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); @@ -1493,8 +1495,8 @@ public class RecurringDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1611,7 +1613,7 @@ public class RecurringDepositTest { recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, this.responseSpec, recurringDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); @@ -1633,8 +1635,8 @@ public class RecurringDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1756,7 +1758,7 @@ public class RecurringDepositTest { recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, this.responseSpec, recurringDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); @@ -1775,8 +1777,8 @@ public class RecurringDepositTest { this.recurringDepositProductHelper = new RecurringDepositProductHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1841,7 +1843,7 @@ public class RecurringDepositTest { principal = this.recurringDepositAccountHelper.getPrincipalAfterCompoundingInterest(todaysDate, principal, recurringDepositAmount, depositPeriod, interestPerDay, DAILY_COMPOUNDING_INTERVAL, MONTHLY_INTERVAL); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); maturityAmount = new Float(decimalFormat.format(maturityAmount)); @@ -1859,8 +1861,8 @@ public class RecurringDepositTest { this.recurringDepositProductHelper = new RecurringDepositProductHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentDateFormat = new SimpleDateFormat("dd"); Calendar todaysDate = Calendar.getInstance(); @@ -1926,7 +1928,7 @@ public class RecurringDepositTest { principal = this.recurringDepositAccountHelper.getPrincipalAfterCompoundingInterest(todaysDate, principal, recurringDepositAmount, depositPeriod, interestPerDay, DAILY_COMPOUNDING_INTERVAL, MONTHLY_INTERVAL); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); principal = new Float(decimalFormat.format(principal)); maturityAmount = new Float(decimalFormat.format(maturityAmount)); @@ -1946,8 +1948,8 @@ public class RecurringDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentMonthFormat = new SimpleDateFormat("MM"); DateFormat currentDateFormat = new SimpleDateFormat("dd"); @@ -2017,7 +2019,7 @@ public class RecurringDepositTest { recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, this.responseSpec, recurringDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(recurringDepositAccountData.get("maturityAmount"))); @@ -2037,8 +2039,8 @@ public class RecurringDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentMonthFormat = new SimpleDateFormat("MM"); DateFormat currentDateFormat = new SimpleDateFormat("dd"); @@ -2108,7 +2110,7 @@ public class RecurringDepositTest { recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, this.responseSpec, recurringDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(recurringDepositAccountData.get("maturityAmount"))); @@ -2126,8 +2128,8 @@ public class RecurringDepositTest { this.recurringDepositProductHelper = new RecurringDepositProductHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentMonthFormat = new SimpleDateFormat("MM"); DateFormat currentDateFormat = new SimpleDateFormat("dd"); @@ -2199,7 +2201,7 @@ public class RecurringDepositTest { recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, this.responseSpec, recurringDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(recurringDepositAccountData.get("maturityAmount"))); @@ -2217,8 +2219,8 @@ public class RecurringDepositTest { this.recurringDepositProductHelper = new RecurringDepositProductHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentMonthFormat = new SimpleDateFormat("MM"); DateFormat currentDateFormat = new SimpleDateFormat("dd"); @@ -2290,7 +2292,7 @@ public class RecurringDepositTest { recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, this.responseSpec, recurringDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(recurringDepositAccountData.get("maturityAmount"))); @@ -2310,8 +2312,8 @@ public class RecurringDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentMonthFormat = new SimpleDateFormat("MM"); DateFormat currentDateFormat = new SimpleDateFormat("dd"); @@ -2381,7 +2383,7 @@ public class RecurringDepositTest { recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, this.responseSpec, recurringDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(recurringDepositAccountData.get("maturityAmount"))); @@ -2401,8 +2403,8 @@ public class RecurringDepositTest { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.recurringDepositAccountHelper = new RecurringDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); DateFormat currentMonthFormat = new SimpleDateFormat("MM"); DateFormat currentDateFormat = new SimpleDateFormat("dd"); @@ -2472,7 +2474,7 @@ public class RecurringDepositTest { recurringDepositAccountData = this.recurringDepositAccountHelper.getRecurringDepositAccountById(this.requestSpec, this.responseSpec, recurringDepositAccountId); - DecimalFormat decimalFormat = new DecimalFormat(); + DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US)); decimalFormat.applyPattern("."); Float expectedPrematureAmount = new Float(decimalFormat.format(principal)); Float maturityAmount = new Float(decimalFormat.format(recurringDepositAccountData.get("maturityAmount"))); diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SchedulerJobsTestResults.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SchedulerJobsTestResults.java index 2a9871221..77c37a888 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SchedulerJobsTestResults.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SchedulerJobsTestResults.java @@ -9,11 +9,13 @@ import static org.junit.Assert.assertEquals; 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.junit.Assert; import org.junit.Before; @@ -445,7 +447,7 @@ public class SchedulerJobsTestResults { this.schedulerJobHelper = new SchedulerJobHelper(this.requestSpec, this.responseSpec); this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); Calendar todayDate = Calendar.getInstance(); final String currentDate = dateFormat.format(todayDate.getTime()); @@ -506,7 +508,7 @@ public class SchedulerJobsTestResults { this.schedulerJobHelper = new SchedulerJobHelper(this.requestSpec, this.responseSpec); this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); Calendar todaysDate = Calendar.getInstance(); final String currentDate = dateFormat.format(todaysDate.getTime()); @@ -563,8 +565,8 @@ public class SchedulerJobsTestResults { this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec); this.standingInstructionsHelper = new StandingInstructionsHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -1); @@ -739,8 +741,8 @@ public class SchedulerJobsTestResults { AccountHelper accountHelper = new AccountHelper(this.requestSpec, this.responseSpec); FixedDepositAccountHelper fixedDepositAccountHelper = new FixedDepositAccountHelper(this.requestSpec, this.responseSpec); - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); - DateFormat monthDayFormat = new SimpleDateFormat("dd MMM"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); + DateFormat monthDayFormat = new SimpleDateFormat("dd MMM", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -3); @@ -890,7 +892,7 @@ public class SchedulerJobsTestResults { } public void validateNumberForEqualExcludePrecission(String val, String val2) { - DecimalFormat twoDForm = new DecimalFormat("#"); + DecimalFormat twoDForm = new DecimalFormat("#", new DecimalFormatSymbols(Locale.US)); Assert.assertTrue(new Float(twoDForm.format(new Float(val))).compareTo(new Float(twoDForm.format(new Float(val2)))) == 0); } } diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SystemCodeTest.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SystemCodeTest.java index 336df8364..0dae7c777 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SystemCodeTest.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SystemCodeTest.java @@ -221,7 +221,7 @@ public class SystemCodeTest { // delete code value final Integer deletedCodeValueResponseId1 = (Integer) CodeHelper.deleteCodeValueById(this.requestSpec, this.generalResponseSpec, - createCodeResponseId, createCodeValueResponseId1, CodeHelper.RESPONSE_ID_ATTRIBUTE_NAME); + createCodeResponseId, createCodeValueResponseId1, CodeHelper.SUBRESPONSE_ID_ATTRIBUTE_NAME); // Verify code value deleted diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/Utils.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/Utils.java index e5bc869ed..59f1a3750 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/Utils.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/Utils.java @@ -13,6 +13,7 @@ import static org.junit.Assert.fail; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Locale; import java.util.Random; import org.apache.commons.lang.StringUtils; @@ -81,7 +82,7 @@ public class Utils { } public static String convertDateToURLFormat(final String dateToBeConvert) { - final SimpleDateFormat oldFormat = new SimpleDateFormat("dd MMMMMM yyyy"); + final SimpleDateFormat oldFormat = new SimpleDateFormat("dd MMMMMM yyyy", Locale.US); final SimpleDateFormat newFormat = new SimpleDateFormat("yyyy-MM-dd"); String reformattedStr = ""; try { diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java index e021fc95e..b8b075ffa 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.HashMap; import java.util.List; +import java.util.Locale; import org.mifosplatform.integrationtests.common.CommonConstants; import org.mifosplatform.integrationtests.common.Utils; @@ -252,7 +253,7 @@ public class RecurringDepositAccountHelper { public HashMap updateRecurringDepositAccount(final String clientID, final String productID, final String accountID, final String validFrom, final String validTo, final String penalInterestType, final String submittedOnDate) { - DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy"); + DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US); Calendar todaysDate = Calendar.getInstance(); todaysDate.add(Calendar.MONTH, -1); todaysDate.add(Calendar.DATE, -1); diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/savings/SavingsAccountHelper.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/savings/SavingsAccountHelper.java index 1780080de..cbd2765fb 100644 --- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/savings/SavingsAccountHelper.java +++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/savings/SavingsAccountHelper.java @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.HashMap; import java.util.List; +import java.util.Locale; import org.mifosplatform.integrationtests.common.CommonConstants; import org.mifosplatform.integrationtests.common.Utils; @@ -51,7 +52,7 @@ public class SavingsAccountHelper { } public static String getFutureDate() { - SimpleDateFormat sdf = new SimpleDateFormat(CommonConstants.dateFormat); + SimpleDateFormat sdf = new SimpleDateFormat(CommonConstants.dateFormat, Locale.US); Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 1); return sdf.format(calendar.getTime()); diff --git a/mifosng-provider/src/test/java/org/mifosplatform/common/Utils.java b/mifosng-provider/src/test/java/org/mifosplatform/common/Utils.java index e13139940..cc99b7028 100644 --- a/mifosng-provider/src/test/java/org/mifosplatform/common/Utils.java +++ b/mifosng-provider/src/test/java/org/mifosplatform/common/Utils.java @@ -22,6 +22,7 @@ import com.jayway.restassured.specification.ResponseSpecification; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Locale; import java.util.Random; @SuppressWarnings("unchecked") @@ -72,7 +73,7 @@ public class Utils { public static String convertDateToURLFormat(String dateToBeConvert){ - SimpleDateFormat oldFormat = new SimpleDateFormat("dd MMMMMM yyyy"); + SimpleDateFormat oldFormat = new SimpleDateFormat("dd MMMMMM yyyy", Locale.US); SimpleDateFormat newFormat = new SimpleDateFormat("yyyy-MM-dd"); String reformattedStr=""; try {