Skip to content

Commit ddcee37

Browse files
committed
fix:lesson_16 bugs
1 parent b1d9fd8 commit ddcee37

File tree

2 files changed

+12
-16
lines changed
  • lesson_16/objects/objects_app/src

2 files changed

+12
-16
lines changed

lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.java renamed to lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/coins/Coins.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.codedifferently.lesson16;
1+
package com.codedifferently.lesson16.coins;
22

33
import java.util.ArrayList;
44
import java.util.List;
@@ -58,7 +58,11 @@ public int getCoinAge() {
5858
}
5959

6060
public List<String> getMaterial() {
61-
return material;
61+
List<String> materialsList = new ArrayList<>();
62+
for (String mat : material) {
63+
materialsList.add(mat);
64+
}
65+
return materialsList;
6266
}
6367

6468
public static int convertNickelsToDimes(int totalNickels) {
@@ -68,7 +72,7 @@ public static int convertNickelsToDimes(int totalNickels) {
6872
return totalNickels / 2;
6973
}
7074

71-
public static List<Coins> CollectCoins() {
75+
public static List<Coins> setCoinCollection() {
7276
Coins penny = new Coins(Coins.CoinType.PENNY, 1, true, 2.5, 1977, List.of("zinc", "copper"));
7377
Coins nickel =
7478
new Coins(Coins.CoinType.NICKEL, 5, true, 5.0, 1953, List.of("nickel", "copper"));

lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java renamed to lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/coins/CoinsTest.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
package com.codedifferently.lesson16;
1+
package com.codedifferently.lesson16.coins;
22

33
import static org.assertj.core.api.Assertions.assertThat;
44
import static org.assertj.core.api.Assertions.assertThatThrownBy;
55
import static org.junit.jupiter.api.Assertions.assertEquals;
66
import static org.junit.jupiter.api.Assertions.assertFalse;
7-
import static org.junit.jupiter.api.Assertions.assertTrue;
87

8+
import com.codedifferently.lesson16.coins.Coins.CoinType;
99
import java.util.ArrayList;
1010
import java.util.List;
11-
1211
import org.junit.jupiter.api.Test;
1312

14-
import com.codedifferently.lesson16.Coins.CoinType;
15-
1613
class CoinTest {
1714

1815
@Test
@@ -55,16 +52,11 @@ void testConvertCoins() {
5552
}
5653

5754
@Test
58-
void testCollectCoins() {
55+
void testCoinCollection() {
5956
// arrange
60-
Coins.collectCoins();
61-
62-
List<Coins> coinCollection = Coins.getCoinCollection();
63-
64-
assertTrue(coinCollection.size() == 3);
65-
66-
57+
List<Coins> coinCollection = Coins.setCoinCollection();
6758

59+
assertEquals(3, coinCollection.size());
6860
}
6961

7062
@Test

0 commit comments

Comments
 (0)