CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

FINERACT-723: Fixing date comparisons that resulting in a problem when timezone is different on database and application server

Browse Source
This commit is contained in:
Petri Tuomola
2020-05-21 11:50:30 +02:00
committed by Michael Vorburger ⛑️
parent 3bc7914068
commit acfec8bb94
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountIntegrationTests.java
+3 -6
View File
@@ -201,8 +201,7 @@ public class ShareAccountIntegrationTests {
} else if (transactionType.equals("charge.payment")) { } else if (transactionType.equals("charge.payment")) {
Assert.assertEquals("2.0", String.valueOf(transaction.get("amount"))); Assert.assertEquals("2.0", String.valueOf(transaction.get("amount")));
Assert.assertEquals("0", String.valueOf(transaction.get("amountPaid"))); Assert.assertEquals("0", String.valueOf(transaction.get("amountPaid")));
Date transactionDate = DateUtils.getDateOfTenant() ; Assert.assertEquals(simple.format(Utils.getLocalDateOfTenant().toDate()), simple.format(date));
Assert.assertEquals(simple.format(transactionDate), simple.format(date));
} }
} }
@@ -252,8 +251,7 @@ public class ShareAccountIntegrationTests {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.set(dateList.get(0), dateList.get(1) - 1, dateList.get(2)); cal.set(dateList.get(0), dateList.get(1) - 1, dateList.get(2));
Date rejectedDate = cal.getTime(); Date rejectedDate = cal.getTime();
Date currentTenantDate = DateUtils.getDateOfTenant() ; Assert.assertEquals(simple.format(Utils.getLocalDateOfTenant().toDate()), simple.format(rejectedDate));
Assert.assertEquals(simple.format(currentTenantDate), simple.format(rejectedDate));
List<Map<String, Object>> transactions = (List<Map<String, Object>>) shareAccountData.get("purchasedShares"); List<Map<String, Object>> transactions = (List<Map<String, Object>>) shareAccountData.get("purchasedShares");
Assert.assertNotNull(transactions); Assert.assertNotNull(transactions);
@@ -364,8 +362,7 @@ public class ShareAccountIntegrationTests {
} else if (transactionType.equals("charge.payment")) { } else if (transactionType.equals("charge.payment")) {
Assert.assertEquals("2.0", String.valueOf(transaction.get("amount"))); Assert.assertEquals("2.0", String.valueOf(transaction.get("amount")));
Assert.assertEquals("0", String.valueOf(transaction.get("amountPaid"))); Assert.assertEquals("0", String.valueOf(transaction.get("amountPaid")));
Date transactionDate = DateUtils.getDateOfTenant() ; Assert.assertEquals(simple.format(Utils.getLocalDateOfTenant().toDate()), simple.format(date));
Assert.assertEquals(simple.format(transactionDate), simple.format(date));
} }
} }