Skip to content

Commit 178af4e

Browse files
pivovaritpivovarit
authored
Money fix (eugenp#2210)
* Fix problems with money * Refactor
1 parent 026c971 commit 178af4e

23 files changed

Lines changed: 300 additions & 286 deletions

‎core-java/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListUnitTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.junit.Test;
1515

1616
public class FlattenNestedListUnitTest {
17-
List<List<String>> lol = asList(asList("one:one"), asList("two:one", "two:two", "two:three"), asList("three:one", "three:two", "three:three", "three:four"));
17+
private List<List<String>> lol = asList(asList("one:one"), asList("two:one", "two:two", "two:three"), asList("three:one", "three:two", "three:three", "three:four"));
1818

1919
@Test
2020
public void givenNestedList_thenFlattenImperatively() {
@@ -36,13 +36,13 @@ public void givenNestedList_thenFlattenFunctionally() {
3636
assertThat(ls, IsIterableContainingInOrder.contains("one:one", "two:one", "two:two", "two:three", "three:one", "three:two", "three:three", "three:four"));
3737
}
3838

39-
public <T> List<T> flattenListOfListsImperatively(List<List<T>> list) {
39+
private <T> List<T> flattenListOfListsImperatively(List<List<T>> list) {
4040
List<T> ls = new ArrayList<>();
4141
list.forEach(ls::addAll);
4242
return ls;
4343
}
4444

45-
public <T> List<T> flattenListOfListsStream(List<List<T>> list) {
45+
private <T> List<T> flattenListOfListsStream(List<List<T>> list) {
4646
return list.stream().flatMap(Collection::stream).collect(Collectors.toList());
4747
}
4848
}

‎core-java/src/test/java/com/baeldung/list/listoflist/ListOfListsUnitTest.java‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
package com.baeldung.list.listoflist;
22

3+
import org.junit.Before;
4+
import org.junit.Test;
5+
36
import java.util.ArrayList;
47
import java.util.List;
58

69
import static org.junit.Assert.assertEquals;
7-
import org.junit.Before;
8-
import org.junit.Test;
910

1011
public class ListOfListsUnitTest {
1112

12-
private List<ArrayList<? extends Stationery>> listOfLists = new ArrayList<ArrayList<? extends Stationery>>();
13-
private ArrayList<Pen> penList = new ArrayList<>();
14-
private ArrayList<Pencil> pencilList = new ArrayList<>();
15-
private ArrayList<Rubber> rubberList = new ArrayList<>();
13+
private List<List<? extends Stationery>> listOfLists = new ArrayList<>();
14+
private List<Pen> penList = new ArrayList<>();
15+
private List<Pencil> pencilList = new ArrayList<>();
16+
private List<Rubber> rubberList = new ArrayList<>();
1617

1718
@SuppressWarnings("unchecked")
1819
@Before
@@ -29,11 +30,11 @@ public void init() {
2930
@Test
3031
public void givenListOfLists_thenCheckNames() {
3132
assertEquals("Pen 1", ((Pen) listOfLists.get(0)
32-
.get(0)).getName());
33+
.get(0)).getName());
3334
assertEquals("Pencil 1", ((Pencil) listOfLists.get(1)
34-
.get(0)).getName());
35+
.get(0)).getName());
3536
assertEquals("Rubber 1", ((Rubber) listOfLists.get(2)
36-
.get(0)).getName());
37+
.get(0)).getName());
3738
}
3839

3940
@SuppressWarnings("unchecked")
@@ -43,10 +44,10 @@ public void givenListOfLists_whenRemovingElements_thenCheckNames() {
4344
((ArrayList<Pencil>) listOfLists.get(1)).remove(0);
4445
listOfLists.remove(1);
4546
assertEquals("Rubber 1", ((Rubber) listOfLists.get(1)
46-
.get(0)).getName());
47+
.get(0)).getName());
4748
listOfLists.remove(0);
4849
assertEquals("Rubber 1", ((Rubber) listOfLists.get(0)
49-
.get(0)).getName());
50+
.get(0)).getName());
5051
}
5152

5253
@Test
@@ -60,17 +61,17 @@ public void givenThreeList_whenCombineIntoOneList_thenCheckList() {
6061
ArrayList<Rubber> rubbers = new ArrayList<>();
6162
rubbers.add(new Rubber("Rubber 1"));
6263
rubbers.add(new Rubber("Rubber 2"));
63-
64+
6465
List<ArrayList<? extends Stationery>> list = new ArrayList<ArrayList<? extends Stationery>>();
6566
list.add(pens);
6667
list.add(pencils);
6768
list.add(rubbers);
68-
69+
6970
assertEquals("Pen 1", ((Pen) list.get(0)
70-
.get(0)).getName());
71+
.get(0)).getName());
7172
assertEquals("Pencil 1", ((Pencil) list.get(1)
72-
.get(0)).getName());
73+
.get(0)).getName());
7374
assertEquals("Rubber 1", ((Rubber) list.get(2)
74-
.get(0)).getName());
75+
.get(0)).getName());
7576
}
7677
}

‎core-java/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferUnitTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void givenPath_whenWriteToItUsingMappedByteBuffer_thenShouldSuccessfullyW
4747

4848
//when
4949
try (FileChannel fileChannel = (FileChannel) Files.newByteChannel(pathToWrite,
50-
EnumSet.of(StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING))) {
50+
EnumSet.of(StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING))) {
5151
MappedByteBuffer mappedByteBuffer = fileChannel.map(FileChannel.MapMode.READ_WRITE, 0, charBuffer.length());
5252

5353
if (mappedByteBuffer != null) {
@@ -61,7 +61,7 @@ public void givenPath_whenWriteToItUsingMappedByteBuffer_thenShouldSuccessfullyW
6161

6262
}
6363

64-
public Path getFileURIFromResources(String fileName) throws Exception {
64+
private Path getFileURIFromResources(String fileName) throws Exception {
6565
ClassLoader classLoader = getClass().getClassLoader();
6666
return Paths.get(classLoader.getResource(fileName).getPath());
6767
}

‎core-java/src/test/java/com/baeldung/maths/BigDecimalImplTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.baeldung.maths;
22

3-
import java.math.BigDecimal;
4-
import java.math.RoundingMode;
53
import org.junit.Assert;
64
import org.junit.Test;
75

6+
import java.math.BigDecimal;
7+
import java.math.RoundingMode;
8+
89
public class BigDecimalImplTest {
910

1011
@Test

‎core-java/src/test/java/com/baeldung/maths/BigIntegerImplTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.baeldung.maths;
22

3-
import java.math.BigInteger;
4-
53
import org.junit.Assert;
6-
74
import org.junit.Test;
85

6+
import java.math.BigInteger;
7+
98
public class BigIntegerImplTest {
109

1110
@Test

‎core-java/src/test/java/com/baeldung/maths/FloatingPointArithmeticTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.baeldung.maths;
22

3-
import java.math.BigDecimal;
4-
53
import org.junit.Assert;
64
import org.junit.Test;
75

6+
import java.math.BigDecimal;
7+
88
public class FloatingPointArithmeticTest {
99

1010
@Test
@@ -13,33 +13,33 @@ public void givenDecimalNumbers_whenAddedTogether_thenGetExpectedResult() {
1313
double b = 4.88;
1414
double c = 21.45;
1515
double result = 39.55;
16-
16+
1717
double abc = a + b + c;
1818
double acb = a + c + b;
19-
19+
2020
Assert.assertEquals(result, abc, 0);
2121
Assert.assertNotEquals(result, acb, 0);
22-
22+
2323
double ab = 18.1;
2424
double ac = 34.67;
25-
25+
2626
double ab_c = ab + c;
2727
double ac_b = ac + b;
28-
28+
2929
Assert.assertEquals(result, ab_c, 0);
3030
Assert.assertNotEquals(result, ac_b, 0);
31-
31+
3232
BigDecimal d = new BigDecimal(String.valueOf(a));
3333
BigDecimal e = new BigDecimal(String.valueOf(b));
3434
BigDecimal f = new BigDecimal(String.valueOf(c));
3535
BigDecimal sum = new BigDecimal("39.55");
36-
36+
3737
BigDecimal def = d.add(e).add(f);
3838
BigDecimal dfe = d.add(f).add(e);
39-
39+
4040
Assert.assertEquals(0, def.compareTo(sum));
4141
Assert.assertEquals(0, dfe.compareTo(sum));
42-
42+
4343
Assert.assertNotEquals(0, sum.compareTo(new BigDecimal(String.valueOf(acb))));
4444
}
4545
}

‎core-java/src/test/java/com/baeldung/maths/RoundTest.java‎

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,67 +5,70 @@
55
import org.junit.Assert;
66
import org.junit.Test;
77

8+
import static org.junit.Assert.assertEquals;
9+
import static org.junit.Assert.assertNotEquals;
10+
811
public class RoundTest {
912
private double value = 2.03456d;
1013
private int places = 2;
1114
private double delta = 0.0d;
1215
private double expected = 2.03d;
1316

1417
@Test
15-
public void givenDecimalNumber_whenRoundToNDecimalPlaces_thenGetExpectedResult() {
16-
Assert.assertEquals(expected, Round.round(value, places), delta);
17-
Assert.assertEquals(expected, Round.roundNotPrecise(value, places), delta);
18-
Assert.assertEquals(expected, Round.roundAvoid(value, places), delta);
19-
Assert.assertEquals(expected, Precision.round(value, places), delta);
20-
Assert.assertEquals(expected, DoubleRounder.round(value, places), delta);
21-
18+
public void givenDecimalNumber_whenRoundToNDecimalPlaces_thenGetExpectedResult() {
19+
assertEquals(expected, Round.round(value, places), delta);
20+
assertEquals(expected, Round.roundNotPrecise(value, places), delta);
21+
assertEquals(expected, Round.roundAvoid(value, places), delta);
22+
assertEquals(expected, Precision.round(value, places), delta);
23+
assertEquals(expected, DoubleRounder.round(value, places), delta);
24+
2225
places = 3;
2326
expected = 2.035d;
24-
25-
Assert.assertEquals(expected, Round.round(value, places), delta);
26-
Assert.assertEquals(expected, Round.roundNotPrecise(value, places), delta);
27-
Assert.assertEquals(expected, Round.roundAvoid(value, places), delta);
28-
Assert.assertEquals(expected, Precision.round(value, places), delta);
29-
Assert.assertEquals(expected, DoubleRounder.round(value, places), delta);
30-
27+
28+
assertEquals(expected, Round.round(value, places), delta);
29+
assertEquals(expected, Round.roundNotPrecise(value, places), delta);
30+
assertEquals(expected, Round.roundAvoid(value, places), delta);
31+
assertEquals(expected, Precision.round(value, places), delta);
32+
assertEquals(expected, DoubleRounder.round(value, places), delta);
33+
3134
value = 1000.0d;
3235
places = 17;
3336
expected = 1000.0d;
34-
35-
Assert.assertEquals(expected, Round.round(value, places), delta);
36-
Assert.assertEquals(expected, Round.roundNotPrecise(value, places), delta);
37-
Assert.assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 92.23372036854776 !
38-
Assert.assertEquals(expected, Precision.round(value, places), delta);
39-
Assert.assertEquals(expected, DoubleRounder.round(value, places), delta);
40-
37+
38+
assertEquals(expected, Round.round(value, places), delta);
39+
assertEquals(expected, Round.roundNotPrecise(value, places), delta);
40+
assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 92.23372036854776 !
41+
assertEquals(expected, Precision.round(value, places), delta);
42+
assertEquals(expected, DoubleRounder.round(value, places), delta);
43+
4144
value = 256.025d;
4245
places = 2;
4346
expected = 256.03d;
44-
45-
Assert.assertEquals(expected, Round.round(value, places), delta);
46-
Assert.assertNotEquals(expected, Round.roundNotPrecise(value, places), delta); // Returns: 256.02 !
47-
Assert.assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 256.02 !
48-
Assert.assertEquals(expected, Precision.round(value, places), delta);
49-
Assert.assertNotEquals(expected, DoubleRounder.round(value, places), delta); // Returns: 256.02 !
50-
51-
value = 260.775d;
47+
48+
assertEquals(expected, Round.round(value, places), delta);
49+
assertNotEquals(expected, Round.roundNotPrecise(value, places), delta); // Returns: 256.02 !
50+
assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 256.02 !
51+
assertEquals(expected, Precision.round(value, places), delta);
52+
assertNotEquals(expected, DoubleRounder.round(value, places), delta); // Returns: 256.02 !
53+
54+
value = 260.775d;
5255
places = 2;
5356
expected = 260.78d;
54-
55-
Assert.assertEquals(expected, Round.round(value, places), delta);
56-
Assert.assertNotEquals(expected, Round.roundNotPrecise(value, places), delta); // Returns: 260.77 !
57-
Assert.assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 260.77 !
58-
Assert.assertEquals(expected, Precision.round(value, places), delta);
59-
Assert.assertNotEquals(expected, DoubleRounder.round(value, places), delta); // Returns: 260.77 !
60-
57+
58+
assertEquals(expected, Round.round(value, places), delta);
59+
assertNotEquals(expected, Round.roundNotPrecise(value, places), delta); // Returns: 260.77 !
60+
assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 260.77 !
61+
assertEquals(expected, Precision.round(value, places), delta);
62+
assertNotEquals(expected, DoubleRounder.round(value, places), delta); // Returns: 260.77 !
63+
6164
value = 90080070060.1d;
6265
places = 9;
6366
expected = 90080070060.1d;
64-
65-
Assert.assertEquals(expected, Round.round(value, places), delta);
66-
Assert.assertEquals(expected, Round.roundNotPrecise(value, places), delta);
67-
Assert.assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 9.223372036854776E9 !
68-
Assert.assertEquals(expected, Precision.round(value, places), delta);
69-
Assert.assertEquals(expected, DoubleRounder.round(value, places), delta);
67+
68+
assertEquals(expected, Round.round(value, places), delta);
69+
assertEquals(expected, Round.roundNotPrecise(value, places), delta);
70+
assertNotEquals(expected, Round.roundAvoid(value, places), delta); // Returns: 9.223372036854776E9 !
71+
assertEquals(expected, Precision.round(value, places), delta);
72+
assertEquals(expected, DoubleRounder.round(value, places), delta);
7073
}
7174
}

0 commit comments

Comments
 (0)