|
7 | 7 | import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.hasAmount; |
8 | 8 | import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.hasCurrencyCode; |
9 | 9 | import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.hasDate; |
| 10 | +import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.hasExDate; |
10 | 11 | import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.hasFees; |
11 | 12 | import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.hasForexGrossValue; |
12 | 13 | import static name.abuchen.portfolio.datatransfer.ExtractorMatchers.hasGrossValue; |
@@ -858,6 +859,7 @@ public void testDividende01() |
858 | 859 | assertThat(transaction.getType(), is(AccountTransaction.Type.DIVIDENDS)); |
859 | 860 |
|
860 | 861 | assertThat(transaction.getDateTime(), is(LocalDateTime.parse("2021-04-30T00:00"))); |
| 862 | + assertThat(transaction.getExDate(), is(LocalDateTime.parse("2021-04-28T00:00"))); |
861 | 863 | assertThat(transaction.getShares(), is(Values.Share.factorize(90))); |
862 | 864 | assertThat(transaction.getSource(), is("Dividende01.txt")); |
863 | 865 | assertNull(transaction.getNote()); |
@@ -903,6 +905,7 @@ public void testDividende02() |
903 | 905 | assertThat(transaction.getType(), is(AccountTransaction.Type.DIVIDENDS)); |
904 | 906 |
|
905 | 907 | assertThat(transaction.getDateTime(), is(LocalDateTime.parse("2021-12-20T00:00"))); |
| 908 | + assertThat(transaction.getExDate(), is(LocalDateTime.parse("2021-12-01T00:00"))); |
906 | 909 | assertThat(transaction.getShares(), is(Values.Share.factorize(100))); |
907 | 910 | assertThat(transaction.getSource(), is("Dividende02.txt")); |
908 | 911 | assertThat(transaction.getNote(), is("Abrechnungsnr. 85127406360 | Quartalsdividende")); |
@@ -949,6 +952,7 @@ public void testDividende02WithSecurityInEUR() |
949 | 952 | assertThat(transaction.getType(), is(AccountTransaction.Type.DIVIDENDS)); |
950 | 953 |
|
951 | 954 | assertThat(transaction.getDateTime(), is(LocalDateTime.parse("2021-12-20T00:00"))); |
| 955 | + assertThat(transaction.getExDate(), is(LocalDateTime.parse("2021-12-01T00:00"))); |
952 | 956 | assertThat(transaction.getShares(), is(Values.Share.factorize(100))); |
953 | 957 | assertThat(transaction.getSource(), is("Dividende02.txt")); |
954 | 958 | assertThat(transaction.getNote(), is("Abrechnungsnr. 85127406360 | Quartalsdividende")); |
@@ -1000,6 +1004,7 @@ public void testDividende03() |
1000 | 1004 | assertThat(transaction.getType(), is(AccountTransaction.Type.DIVIDENDS)); |
1001 | 1005 |
|
1002 | 1006 | assertThat(transaction.getDateTime(), is(LocalDateTime.parse("2022-10-28T00:00"))); |
| 1007 | + assertThat(transaction.getExDate(), is(LocalDateTime.parse("2022-10-04T00:00"))); |
1003 | 1008 | assertThat(transaction.getShares(), is(Values.Share.factorize(100))); |
1004 | 1009 | assertThat(transaction.getSource(), is("Dividende03.txt")); |
1005 | 1010 | assertThat(transaction.getNote(), is("Abrechnungsnr. 88888888888 | Quartalsdividende")); |
@@ -1047,6 +1052,7 @@ public void testDividende03WithSecurityInEUR() |
1047 | 1052 | assertThat(transaction.getType(), is(AccountTransaction.Type.DIVIDENDS)); |
1048 | 1053 |
|
1049 | 1054 | assertThat(transaction.getDateTime(), is(LocalDateTime.parse("2022-10-28T00:00"))); |
| 1055 | + assertThat(transaction.getExDate(), is(LocalDateTime.parse("2022-10-04T00:00"))); |
1050 | 1056 | assertThat(transaction.getShares(), is(Values.Share.factorize(100))); |
1051 | 1057 | assertThat(transaction.getSource(), is("Dividende03.txt")); |
1052 | 1058 | assertThat(transaction.getNote(), is("Abrechnungsnr. 88888888888 | Quartalsdividende")); |
@@ -1099,6 +1105,7 @@ public void testDividende04() |
1099 | 1105 | assertThat(transaction.getType(), is(AccountTransaction.Type.DIVIDENDS)); |
1100 | 1106 |
|
1101 | 1107 | assertThat(transaction.getDateTime(), is(LocalDateTime.parse("2022-11-03T00:00"))); |
| 1108 | + assertThat(transaction.getExDate(), is(LocalDateTime.parse("2022-10-06T00:00"))); |
1102 | 1109 | assertThat(transaction.getShares(), is(Values.Share.factorize(400))); |
1103 | 1110 | assertThat(transaction.getSource(), is("Dividende04.txt")); |
1104 | 1111 | assertThat(transaction.getNote(), is("Abrechnungsnr. 80642931040 | Quartalsdividende")); |
@@ -1146,6 +1153,7 @@ public void testDividende04WithSecurityInEUR() |
1146 | 1153 | assertThat(transaction.getType(), is(AccountTransaction.Type.DIVIDENDS)); |
1147 | 1154 |
|
1148 | 1155 | assertThat(transaction.getDateTime(), is(LocalDateTime.parse("2022-11-03T00:00"))); |
| 1156 | + assertThat(transaction.getExDate(), is(LocalDateTime.parse("2022-10-06T00:00"))); |
1149 | 1157 | assertThat(transaction.getShares(), is(Values.Share.factorize(400))); |
1150 | 1158 | assertThat(transaction.getSource(), is("Dividende04.txt")); |
1151 | 1159 | assertThat(transaction.getNote(), is("Abrechnungsnr. 80642931040 | Quartalsdividende")); |
@@ -1198,6 +1206,7 @@ public void testDividende05() |
1198 | 1206 | assertThat(transaction.getType(), is(AccountTransaction.Type.DIVIDENDS)); |
1199 | 1207 |
|
1200 | 1208 | assertThat(transaction.getDateTime(), is(LocalDateTime.parse("2023-01-17T00:00"))); |
| 1209 | + assertThat(transaction.getExDate(), is(LocalDateTime.parse("2023-01-17T00:00"))); |
1201 | 1210 | assertThat(transaction.getShares(), is(Values.Share.factorize(221))); |
1202 | 1211 | assertThat(transaction.getSource(), is("Dividende05.txt")); |
1203 | 1212 | assertNull(transaction.getNote()); |
@@ -1244,6 +1253,7 @@ public void testDividende05WithSecurityInEUR() |
1244 | 1253 | assertThat(transaction.getType(), is(AccountTransaction.Type.DIVIDENDS)); |
1245 | 1254 |
|
1246 | 1255 | assertThat(transaction.getDateTime(), is(LocalDateTime.parse("2023-01-17T00:00"))); |
| 1256 | + assertThat(transaction.getExDate(), is(LocalDateTime.parse("2023-01-17T00:00"))); |
1247 | 1257 | assertThat(transaction.getShares(), is(Values.Share.factorize(221))); |
1248 | 1258 | assertThat(transaction.getSource(), is("Dividende05.txt")); |
1249 | 1259 | assertNull(transaction.getNote()); |
@@ -1296,6 +1306,7 @@ public void testDividende06() |
1296 | 1306 | assertThat(transaction.getType(), is(AccountTransaction.Type.DIVIDENDS)); |
1297 | 1307 |
|
1298 | 1308 | assertThat(transaction.getDateTime(), is(LocalDateTime.parse("2023-01-09T00:00"))); |
| 1309 | + assertThat(transaction.getExDate(), is(LocalDateTime.parse("2022-12-19T00:00"))); |
1299 | 1310 | assertThat(transaction.getShares(), is(Values.Share.factorize(70))); |
1300 | 1311 | assertThat(transaction.getSource(), is("Dividende06.txt")); |
1301 | 1312 | assertNull(transaction.getNote()); |
@@ -1342,6 +1353,7 @@ public void testDividende07() |
1342 | 1353 | assertThat(transaction.getType(), is(AccountTransaction.Type.DIVIDENDS)); |
1343 | 1354 |
|
1344 | 1355 | assertThat(transaction.getDateTime(), is(LocalDateTime.parse("2023-04-12T00:00"))); |
| 1356 | + assertThat(transaction.getExDate(), is(LocalDateTime.parse("2023-04-06T00:00"))); |
1345 | 1357 | assertThat(transaction.getShares(), is(Values.Share.factorize(111))); |
1346 | 1358 | assertThat(transaction.getSource(), is("Dividende07.txt")); |
1347 | 1359 | assertThat(transaction.getNote(), is("Abrechnungsnr. 66666666666")); |
@@ -1413,7 +1425,8 @@ public void testDividende09() |
1413 | 1425 |
|
1414 | 1426 | // check dividends transaction |
1415 | 1427 | assertThat(results, hasItem(dividend( // |
1416 | | - hasDate("2020-04-15T00:00"), hasShares(221), // |
| 1428 | + hasDate("2020-04-15T00:00"), hasExDate("2020-04-15T00:00"), // |
| 1429 | + hasShares(221), // |
1417 | 1430 | hasSource("Dividende09.txt"), // |
1418 | 1431 | hasNote(null), // |
1419 | 1432 | hasAmount("EUR", 82.99), hasGrossValue("EUR", 97.81), // |
@@ -1448,7 +1461,8 @@ public void testDividende09WithSecurityInEUR() |
1448 | 1461 |
|
1449 | 1462 | // check dividends transaction |
1450 | 1463 | assertThat(results, hasItem(dividend( // |
1451 | | - hasDate("2020-04-15T00:00"), hasShares(221), // |
| 1464 | + hasDate("2020-04-15T00:00"), hasExDate("2020-04-15T00:00"), // |
| 1465 | + hasShares(221), // |
1452 | 1466 | hasSource("Dividende09.txt"), // |
1453 | 1467 | hasNote(null), // |
1454 | 1468 | hasAmount("EUR", 82.99), hasGrossValue("EUR", 97.81), // |
@@ -1489,7 +1503,8 @@ public void testDividende10() |
1489 | 1503 |
|
1490 | 1504 | // check dividends transaction |
1491 | 1505 | assertThat(results, hasItem(dividend( // |
1492 | | - hasDate("2021-08-16T00:00"), hasShares(7.01), // |
| 1506 | + hasDate("2021-08-16T00:00"), hasExDate("2021-08-16T00:00"), // |
| 1507 | + hasShares(7.01), // |
1493 | 1508 | hasSource("Dividende10.txt"), // |
1494 | 1509 | hasNote(null), // |
1495 | 1510 | hasAmount("EUR", 5.59), hasGrossValue("EUR", 8.34), // |
@@ -1523,7 +1538,8 @@ public void testDividende11() |
1523 | 1538 |
|
1524 | 1539 | // check dividends transaction |
1525 | 1540 | assertThat(results, hasItem(dividend( // |
1526 | | - hasDate("2024-05-02T00:00"), hasShares(25.00), // |
| 1541 | + hasDate("2024-05-02T00:00"), hasExDate("2024-04-29T00:00"), // |
| 1542 | + hasShares(25.00), // |
1527 | 1543 | hasSource("Dividende11.txt"), // |
1528 | 1544 | hasNote("Abrechnungsnr. 76560429680"), // |
1529 | 1545 | hasAmount("EUR", 40.50), hasGrossValue("EUR", 55.00), // |
@@ -1557,7 +1573,8 @@ public void testDividende12() |
1557 | 1573 |
|
1558 | 1574 | // check dividends transaction |
1559 | 1575 | assertThat(results, hasItem(dividend( // |
1560 | | - hasDate("2023-09-25T00:00"), hasShares(29.00), // |
| 1576 | + hasDate("2023-09-25T00:00"), hasExDate("2023-08-30T00:00"), // |
| 1577 | + hasShares(29.00), // |
1561 | 1578 | hasSource("Dividende12.txt"), // |
1562 | 1579 | hasNote("Abrechnungsnr. 76560429680 | Quartalsdividende"), // |
1563 | 1580 | hasAmount("EUR", 16.16), hasGrossValue("EUR", 21.71), // |
@@ -1593,7 +1610,8 @@ public void testDividende12WithSecurityInEUR() |
1593 | 1610 |
|
1594 | 1611 | // check dividends transaction |
1595 | 1612 | assertThat(results, hasItem(dividend( // |
1596 | | - hasDate("2023-09-25T00:00"), hasShares(29.00), // |
| 1613 | + hasDate("2023-09-25T00:00"), hasExDate("2023-08-30T00:00"), // |
| 1614 | + hasShares(29.00), // |
1597 | 1615 | hasSource("Dividende12.txt"), // |
1598 | 1616 | hasNote("Abrechnungsnr. 76560429680 | Quartalsdividende"), // |
1599 | 1617 | hasAmount("EUR", 16.16), hasGrossValue("EUR", 21.71), // |
@@ -1634,7 +1652,8 @@ public void testDividende13() |
1634 | 1652 |
|
1635 | 1653 | // check dividends transaction |
1636 | 1654 | assertThat(results, hasItem(dividend( // |
1637 | | - hasDate("2024-09-11T00:00"), hasShares(254.00), // |
| 1655 | + hasDate("2024-09-11T00:00"), hasExDate("2024-09-06T00:00"), // |
| 1656 | + hasShares(254.00), // |
1638 | 1657 | hasSource("Dividende13.txt"), // |
1639 | 1658 | hasNote("Ref.-Nr.: 17518731738"), // |
1640 | 1659 | hasAmount("CHF", 392.94), hasGrossValue("CHF", 604.52), // |
|
0 commit comments