From f88bf249e70c4a1010ccfa6ea9260d72de4d8dc8 Mon Sep 17 00:00:00 2001 From: txtran224 Date: Thu, 31 Oct 2024 21:40:08 +0000 Subject: [PATCH 1/8] feat:lesson_16 Coins and CoinTest files added --- .../com/codedifferently/lesson16/Coins.Java | 25 +++++++ .../codedifferently/lesson16/CoinsTest.Java | 68 +++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.Java create mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.Java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.Java new file mode 100644 index 000000000..51516ffcb --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.Java @@ -0,0 +1,25 @@ +package com.codedifferently.Coins; + + //class +public class Coins { + +public enum CoinType{ + penny, nickel, dime, quarter +} + private int coinValue; + private boolean coinIsRare; + private double coinGramWeight; + private int coinAge; + private Arraylist coincollection; + + //constructor +public Coins(CoinType coinType, int coinValue, Boolean coinIsRare, Double coinGramWeight) { + this.coinType = coinType; + this.coinValue = coinValue; + this.coinIsRare = coinIsRare; + this.coinGramWeight = coinGramWeight; + this.coinAge = coinAge; + this.coincollection = coinCollection; + } +} +// for loop for coin collection and check if rare add to collection diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java new file mode 100644 index 000000000..8cd1ec9a2 --- /dev/null +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java @@ -0,0 +1,68 @@ +package com.codedifferently.lesson16; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; + +class CoinTest{ + +@test +void testCheckCoininPocket(){ +//arrange +Coins coin = new Coin(to fill in); + +//act action +CoinType actualCoin = CoinType.nickel; + +//assert +assertEquals(nickel,coins.checkCoinType()) +} +@test +void testWeighCoins(){ +//arrange +Coins coin = new Coin(to fill in); +double expectedWeight = 5.0; +//act +double coinWeight = coin.coinGramWeight(); +//assert +assertEquals(expected, coinweight); +} +@test +void testConvertCoins(){ +//arrange +coinCollection = new Arraylist<>(); +Coin nickel1 = new coin(); +Coin nickel2 = new coin(); +coinCollection.add(nickel1); +coinCollection.add(nickel2); + +//act +Coin Dime = Coin.convertNickelsToDime(); +//assert +Assert(10, Dime.getValue()) +} +@Test +void testCollectCoins(){ +//arrange +coinCollection = new Arraylist<>(); +Coin penny = new coin(); +Coin nickel = new coin(); +Coin dime = new coin (); +add coins to coin collection +//act +AddCoin(penny); +AddCoin(nickel); +AddCoin(dime); +//assert +AssertEquals(3,coinCollection()); +} +@test +void testGetAgeCoin(){ +//arrange + Coin coin = new coin(); +// Act + int age = coin.geCoinAge(); +// Assert + assertEquals(1954, actual); + } +} \ No newline at end of file From 14e176a058829319d7b3ebd7443303ce466501ca Mon Sep 17 00:00:00 2001 From: txtran224 Date: Fri, 1 Nov 2024 14:44:33 +0000 Subject: [PATCH 2/8] fix: more bugs --- .../com/codedifferently/lesson16/Coins.Java | 25 ------ .../com/codedifferently/lesson16/coinsc.java | 44 +++++++++++ .../codedifferently/lesson16/CoinsTest.Java | 79 ++++++++++--------- 3 files changed, 87 insertions(+), 61 deletions(-) delete mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.Java create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/coinsc.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.Java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.Java deleted file mode 100644 index 51516ffcb..000000000 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.Java +++ /dev/null @@ -1,25 +0,0 @@ -package com.codedifferently.Coins; - - //class -public class Coins { - -public enum CoinType{ - penny, nickel, dime, quarter -} - private int coinValue; - private boolean coinIsRare; - private double coinGramWeight; - private int coinAge; - private Arraylist coincollection; - - //constructor -public Coins(CoinType coinType, int coinValue, Boolean coinIsRare, Double coinGramWeight) { - this.coinType = coinType; - this.coinValue = coinValue; - this.coinIsRare = coinIsRare; - this.coinGramWeight = coinGramWeight; - this.coinAge = coinAge; - this.coincollection = coinCollection; - } -} -// for loop for coin collection and check if rare add to collection diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/coinsc.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/coinsc.java new file mode 100644 index 000000000..e0804aa6a --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/coinsc.java @@ -0,0 +1,44 @@ +package com.codedifferently.lesson16; + +public class Coins { + +public enum CoinType{ + PENNY, NICKEL, DIME, QUARTER +} + private CoinType coinType; + private int coinValue; + private boolean coinIsRare; + private double coinGramWeight; + private int coinAge; + private Arraylist material; + + //constructor +public Coins(CoinType coinType, int coinValue, Boolean coinIsRare, Double coinGramWeight, Arraylist material) { + this.coinType = coinType; + this.coinValue = coinValue; + this.coinIsRare = coinIsRare; + this.coinGramWeight = coinGramWeight; + this.coinAge = coinAge; + this.material = material; +} + //Getters and Setters +public CoinType getCoinType(){ + return coinType; +} +public int getCoinValue(){ + return coinValue; +} +public boolean isCoinRare(){ + return coinIsRare; +} +public double getCoinGramWeight(){ + return coinGramWeight; +} +public int getCoinAge() { + return coinAge; +} +public List getMaterial(){ + return material;} +} +//todo +// for loop for coin collection and check if rare add to collection \ No newline at end of file diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java index 8cd1ec9a2..ca5482510 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java @@ -1,68 +1,75 @@ package com.codedifferently.lesson16; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.List; class CoinTest{ -@test -void testCheckCoininPocket(){ +@Test + void testCheckCoinInPocket(){ //arrange -Coins coin = new Coin(to fill in); - + Coins coin = new Coin(Coins.CoinType.NICKEL, 5, false, 5.0, 1966, new ArrayList<>(nickel,copper)); //act action -CoinType actualCoin = CoinType.nickel; + CoinType actualCoin = CoinType.NICKEL; //assert -assertEquals(nickel,coins.checkCoinType()) + assertEquals(CoinType.NICKEL,coins.checkCoinType()) } -@test -void testWeighCoins(){ +@Test + void testWeighCoins(){ //arrange -Coins coin = new Coin(to fill in); -double expectedWeight = 5.0; + Coins coin = new Coin(Coins.CoinType.NICKEL, 5, false, 5.0, 1966, new ArrayList<>(nickel,copper)); + double expectedWeight = 5.0; //act -double coinWeight = coin.coinGramWeight(); + double coinWeight = coin.coinGramWeight(); //assert -assertEquals(expected, coinweight); + assertEquals(expected, coinWeight); } -@test -void testConvertCoins(){ +@Test + void testConvertCoins(){ //arrange -coinCollection = new Arraylist<>(); -Coin nickel1 = new coin(); -Coin nickel2 = new coin(); -coinCollection.add(nickel1); -coinCollection.add(nickel2); + coinCollection = new Arraylist<>(); + Coin nickel1 = new Coin(); + Coin nickel2 = new coin(); + coinCollection.add(nickel1); + coinCollection.add(nickel2); //act -Coin Dime = Coin.convertNickelsToDime(); + Coin Dime = Coin.convertNickelsToDime(nickel1, nickel2); //assert -Assert(10, Dime.getValue()) + Assert(10, Dime.getValue()) } @Test -void testCollectCoins(){ + void testCollectCoins(){ //arrange -coinCollection = new Arraylist<>(); -Coin penny = new coin(); -Coin nickel = new coin(); -Coin dime = new coin (); -add coins to coin collection + coinCollection = new Arraylist<>(); + Coin penny = new Coin(); + Coin nickel = new Coin(); + Coin dime = new Coin (); //act -AddCoin(penny); -AddCoin(nickel); -AddCoin(dime); + AddCoin(penny); + AddCoin(nickel); + AddCoin(dime); //assert -AssertEquals(3,coinCollection()); + AssertEquals(3,coinCollection()); } -@test -void testGetAgeCoin(){ +@Test + void testGetAgeCoin(){ //arrange - Coin coin = new coin(); + Coin coin = new Coin(); // Act int age = coin.geCoinAge(); // Assert - assertEquals(1954, actual); + assertEquals(1954, age); } -} \ No newline at end of file +@Test + void testGetMaterialComposition(){ + Coin Penny = new Coin(new Arraylist<>(Array.asList("copper,zinc"))) + +} +} From 6e4fabebc49d8e990be301b10f3771890e45d314 Mon Sep 17 00:00:00 2001 From: txtran224 Date: Fri, 1 Nov 2024 15:12:48 +0000 Subject: [PATCH 3/8] fix: Coins file added --- .../com/codedifferently/lesson16/Coins.java | 49 ++++++++++++ .../com/codedifferently/lesson16/coinsc.java | 44 ----------- .../codedifferently/lesson16/CoinsTest.Java | 11 ++- .../codedifferently/lesson16/CoinsTest.java | 78 +++++++++++++++++++ 4 files changed, 134 insertions(+), 48 deletions(-) create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.java delete mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/coinsc.java create mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.java new file mode 100644 index 000000000..3f69b83da --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.java @@ -0,0 +1,49 @@ +package com.codedifferently.lesson16; + +import java.util.List; + +public class Coins { + + public enum CoinType{ + PENNY, NICKEL, DIME, QUARTER + } + private final CoinType coinType; + private final int coinValue; + private final boolean coinIsRare; + private final double coinGramWeight; + private final int coinAge; + private final List material; + + //constructor + public Coins(CoinType coinType, int coinValue, Boolean coinIsRare, Double coinGramWeight,int coinAge, List material) { + this.coinType = coinType; + this.coinValue = coinValue; + this.coinIsRare = coinIsRare; + this.coinGramWeight = coinGramWeight; + this.coinAge = coinAge; + this.material = material; + } + //Getters and Setters + public CoinType getCoinType(){ + return coinType; + } + public int getCoinValue(){ + return coinValue; + } + public boolean isCoinRare(){ + return coinIsRare; + } + public double getCoinGramWeight(){ + return coinGramWeight; + } + public int getCoinAge() { + return coinAge; + } + public List getMaterial(){ + return material;} + + + } + + //todo + // for loop for coin collection and check if rare add to collection diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/coinsc.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/coinsc.java deleted file mode 100644 index e0804aa6a..000000000 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/coinsc.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.codedifferently.lesson16; - -public class Coins { - -public enum CoinType{ - PENNY, NICKEL, DIME, QUARTER -} - private CoinType coinType; - private int coinValue; - private boolean coinIsRare; - private double coinGramWeight; - private int coinAge; - private Arraylist material; - - //constructor -public Coins(CoinType coinType, int coinValue, Boolean coinIsRare, Double coinGramWeight, Arraylist material) { - this.coinType = coinType; - this.coinValue = coinValue; - this.coinIsRare = coinIsRare; - this.coinGramWeight = coinGramWeight; - this.coinAge = coinAge; - this.material = material; -} - //Getters and Setters -public CoinType getCoinType(){ - return coinType; -} -public int getCoinValue(){ - return coinValue; -} -public boolean isCoinRare(){ - return coinIsRare; -} -public double getCoinGramWeight(){ - return coinGramWeight; -} -public int getCoinAge() { - return coinAge; -} -public List getMaterial(){ - return material;} -} -//todo -// for loop for coin collection and check if rare add to collection \ No newline at end of file diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java index ca5482510..0e13de3a1 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java @@ -1,15 +1,18 @@ package com.codedifferently.lesson16; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.assertj.core.api.Assertions.assertThat; -import org.junit.jupiter.api.Test; +import java.sql.Array; import java.util.ArrayList; -import java.util.List; + +import org.junit.jupiter.api.Test; + +import com.codedifferently.lesson16.Coins.CoinType; class CoinTest{ + + @Test void testCheckCoinInPocket(){ //arrange diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java new file mode 100644 index 000000000..0e13de3a1 --- /dev/null +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java @@ -0,0 +1,78 @@ +package com.codedifferently.lesson16; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.sql.Array; +import java.util.ArrayList; + +import org.junit.jupiter.api.Test; + +import com.codedifferently.lesson16.Coins.CoinType; + +class CoinTest{ + + + +@Test + void testCheckCoinInPocket(){ +//arrange + Coins coin = new Coin(Coins.CoinType.NICKEL, 5, false, 5.0, 1966, new ArrayList<>(nickel,copper)); +//act action + CoinType actualCoin = CoinType.NICKEL; + +//assert + assertEquals(CoinType.NICKEL,coins.checkCoinType()) +} +@Test + void testWeighCoins(){ +//arrange + Coins coin = new Coin(Coins.CoinType.NICKEL, 5, false, 5.0, 1966, new ArrayList<>(nickel,copper)); + double expectedWeight = 5.0; +//act + double coinWeight = coin.coinGramWeight(); +//assert + assertEquals(expected, coinWeight); +} +@Test + void testConvertCoins(){ +//arrange + coinCollection = new Arraylist<>(); + Coin nickel1 = new Coin(); + Coin nickel2 = new coin(); + coinCollection.add(nickel1); + coinCollection.add(nickel2); + +//act + Coin Dime = Coin.convertNickelsToDime(nickel1, nickel2); +//assert + Assert(10, Dime.getValue()) +} +@Test + void testCollectCoins(){ +//arrange + coinCollection = new Arraylist<>(); + Coin penny = new Coin(); + Coin nickel = new Coin(); + Coin dime = new Coin (); +//act + AddCoin(penny); + AddCoin(nickel); + AddCoin(dime); +//assert + AssertEquals(3,coinCollection()); +} +@Test + void testGetAgeCoin(){ +//arrange + Coin coin = new Coin(); +// Act + int age = coin.geCoinAge(); +// Assert + assertEquals(1954, age); + } +@Test + void testGetMaterialComposition(){ + Coin Penny = new Coin(new Arraylist<>(Array.asList("copper,zinc"))) + +} +} From 37e3acff9c774849c0d838dcbd91e9b1cf3c901b Mon Sep 17 00:00:00 2001 From: txtran224 Date: Fri, 1 Nov 2024 18:00:51 +0000 Subject: [PATCH 4/8] feat:lesson_16 Coin object added for Tommy Tran --- .../com/codedifferently/lesson16/Coins.java | 113 +++++++++----- .../codedifferently/lesson16/CoinsTest.Java | 140 ++++++++++-------- .../codedifferently/lesson16/CoinsTest.java | 140 ++++++++++-------- 3 files changed, 229 insertions(+), 164 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.java index 3f69b83da..33cb2928d 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.java @@ -1,49 +1,82 @@ package com.codedifferently.lesson16; +import java.util.ArrayList; import java.util.List; public class Coins { - public enum CoinType{ - PENNY, NICKEL, DIME, QUARTER - } - private final CoinType coinType; - private final int coinValue; - private final boolean coinIsRare; - private final double coinGramWeight; - private final int coinAge; - private final List material; - - //constructor - public Coins(CoinType coinType, int coinValue, Boolean coinIsRare, Double coinGramWeight,int coinAge, List material) { - this.coinType = coinType; - this.coinValue = coinValue; - this.coinIsRare = coinIsRare; - this.coinGramWeight = coinGramWeight; - this.coinAge = coinAge; - this.material = material; - } - //Getters and Setters - public CoinType getCoinType(){ - return coinType; - } - public int getCoinValue(){ - return coinValue; - } - public boolean isCoinRare(){ - return coinIsRare; - } - public double getCoinGramWeight(){ - return coinGramWeight; - } - public int getCoinAge() { - return coinAge; + public enum CoinType { + PENNY, + NICKEL, + DIME, + QUARTER + } + + private final CoinType coinType; + private final int coinValue; + private final boolean coinIsRare; + private final double coinGramWeight; + private final int coinAge; + private final List material; + private static final List coinCollection = new ArrayList<>(); + + // constructor + public Coins( + CoinType coinType, + int coinValue, + Boolean coinIsRare, + Double coinGramWeight, + int coinAge, + List material) { + this.coinType = coinType; + this.coinValue = coinValue; + this.coinIsRare = coinIsRare; + this.coinGramWeight = coinGramWeight; + this.coinAge = coinAge; + this.material = material; + } + + // Getters and Setters + public CoinType getCoinType() { + return coinType; + } + + public int getCoinValue() { + return coinValue; + } + + public boolean isCoinRare() { + return coinIsRare; + } + + public double getCoinGramWeight() { + return coinGramWeight; + } + + public int getCoinAge() { + return coinAge; + } + + public List getMaterial() { + return material; + } + + public static int convertNickelsToDimes(int totalNickels) { + if (totalNickels < 1) { + throw new IllegalArgumentException("you do not have enough nickles"); } - public List getMaterial(){ - return material;} + return totalNickels / 2; + } - - } + public static List CollectCoins() { + Coins penny = new Coins(Coins.CoinType.PENNY, 1, true, 2.5, 1977, List.of("zinc", "copper")); + Coins nickel = + new Coins(Coins.CoinType.NICKEL, 5, true, 5.0, 1953, List.of("nickel", "copper")); + Coins dime = new Coins(CoinType.DIME, 10, true, 10.0, 1957, List.of("nickel", "copper")); - //todo - // for loop for coin collection and check if rare add to collection + coinCollection.add(penny); + coinCollection.add(nickel); + coinCollection.add(dime); + return coinCollection; + } +} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java index 0e13de3a1..e6055087e 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java @@ -1,78 +1,94 @@ package com.codedifferently.lesson16; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import java.sql.Array; +import com.codedifferently.lesson16.Coins.CoinType; import java.util.ArrayList; - +import java.util.List; import org.junit.jupiter.api.Test; -import com.codedifferently.lesson16.Coins.CoinType; +class CoinTest { -class CoinTest{ + @Test + void testCheckCoinInPocket() { + // arrange + Coins coin = new Coins(CoinType.NICKEL, 5, false, 5.0, 1953, List.of("nickel", "copper")); + // act action + Coins.CoinType actualCoin = coin.getCoinType(); + int coinValue = coin.getCoinValue(); + boolean coinRarity = coin.isCoinRare(); + // assert + assertEquals(CoinType.NICKEL, actualCoin); + assertEquals(5, coinValue); + assertFalse(coinRarity); + } + @Test + void testWeighCoins() { + // arrange + Coins coin = new Coins(CoinType.NICKEL, 5, false, 5.0, 1953, List.of("nickel", "copper")); + double expectedWeight = 5.0; + // act + double coinWeight = coin.getCoinGramWeight(); + // assert + assertEquals(expectedWeight, coinWeight); + } -@Test - void testCheckCoinInPocket(){ -//arrange - Coins coin = new Coin(Coins.CoinType.NICKEL, 5, false, 5.0, 1966, new ArrayList<>(nickel,copper)); -//act action - CoinType actualCoin = CoinType.NICKEL; + @Test + void testConvertCoins() { + // arrange + List coinCollection = new ArrayList<>(); + coinCollection.add(new Coins(CoinType.NICKEL, 5, false, 5.0, 1953, List.of())); + coinCollection.add(new Coins(CoinType.NICKEL, 5, false, 5.0, 1953, List.of())); + // act + int totalNickles = coinCollection.size(); + int dimes = Coins.convertNickelsToDimes(totalNickles); + // assert + assertEquals(1, dimes); + } -//assert - assertEquals(CoinType.NICKEL,coins.checkCoinType()) -} -@Test - void testWeighCoins(){ -//arrange - Coins coin = new Coin(Coins.CoinType.NICKEL, 5, false, 5.0, 1966, new ArrayList<>(nickel,copper)); - double expectedWeight = 5.0; -//act - double coinWeight = coin.coinGramWeight(); -//assert - assertEquals(expected, coinWeight); -} -@Test - void testConvertCoins(){ -//arrange - coinCollection = new Arraylist<>(); - Coin nickel1 = new Coin(); - Coin nickel2 = new coin(); - coinCollection.add(nickel1); - coinCollection.add(nickel2); + @Test + void testCollectCoins() { + // arrange + Coins.CollectCoins(); -//act - Coin Dime = Coin.convertNickelsToDime(nickel1, nickel2); -//assert - Assert(10, Dime.getValue()) -} -@Test - void testCollectCoins(){ -//arrange - coinCollection = new Arraylist<>(); - Coin penny = new Coin(); - Coin nickel = new Coin(); - Coin dime = new Coin (); -//act - AddCoin(penny); - AddCoin(nickel); - AddCoin(dime); -//assert - AssertEquals(3,coinCollection()); -} -@Test - void testGetAgeCoin(){ -//arrange - Coin coin = new Coin(); -// Act - int age = coin.geCoinAge(); -// Assert - assertEquals(1954, age); + List coinCollection = Coins.getCoinCollection(); + + assertTrue(coinCollection.size() == 3); } -@Test - void testGetMaterialComposition(){ - Coin Penny = new Coin(new Arraylist<>(Array.asList("copper,zinc"))) -} + @Test + void testGetAgeCoin() { + // arrange + Coins dime = new Coins(CoinType.DIME, 10, true, 10.0, 1957, List.of("nickel", "copper")); + // Act + int age = dime.getCoinAge(); + // Assert + assertEquals(1957, age); + } + + @Test + void testGetMaterialComposition() { + // arrange + Coins penny = new Coins(CoinType.PENNY, 1, true, 2.5, 1977, List.of("zinc", "copper")); + // act + List materialComposition = penny.getMaterial(); + // assert + assertThat(materialComposition).containsExactly("zinc", "copper"); + } + + @Test + void testCannotConvert() { + assertThatThrownBy( + () -> { + Coins.convertNickelsToDimes(0); + }) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("you do not have enough nickles"); + } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java index 0e13de3a1..e6055087e 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java @@ -1,78 +1,94 @@ package com.codedifferently.lesson16; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import java.sql.Array; +import com.codedifferently.lesson16.Coins.CoinType; import java.util.ArrayList; - +import java.util.List; import org.junit.jupiter.api.Test; -import com.codedifferently.lesson16.Coins.CoinType; +class CoinTest { -class CoinTest{ + @Test + void testCheckCoinInPocket() { + // arrange + Coins coin = new Coins(CoinType.NICKEL, 5, false, 5.0, 1953, List.of("nickel", "copper")); + // act action + Coins.CoinType actualCoin = coin.getCoinType(); + int coinValue = coin.getCoinValue(); + boolean coinRarity = coin.isCoinRare(); + // assert + assertEquals(CoinType.NICKEL, actualCoin); + assertEquals(5, coinValue); + assertFalse(coinRarity); + } + @Test + void testWeighCoins() { + // arrange + Coins coin = new Coins(CoinType.NICKEL, 5, false, 5.0, 1953, List.of("nickel", "copper")); + double expectedWeight = 5.0; + // act + double coinWeight = coin.getCoinGramWeight(); + // assert + assertEquals(expectedWeight, coinWeight); + } -@Test - void testCheckCoinInPocket(){ -//arrange - Coins coin = new Coin(Coins.CoinType.NICKEL, 5, false, 5.0, 1966, new ArrayList<>(nickel,copper)); -//act action - CoinType actualCoin = CoinType.NICKEL; + @Test + void testConvertCoins() { + // arrange + List coinCollection = new ArrayList<>(); + coinCollection.add(new Coins(CoinType.NICKEL, 5, false, 5.0, 1953, List.of())); + coinCollection.add(new Coins(CoinType.NICKEL, 5, false, 5.0, 1953, List.of())); + // act + int totalNickles = coinCollection.size(); + int dimes = Coins.convertNickelsToDimes(totalNickles); + // assert + assertEquals(1, dimes); + } -//assert - assertEquals(CoinType.NICKEL,coins.checkCoinType()) -} -@Test - void testWeighCoins(){ -//arrange - Coins coin = new Coin(Coins.CoinType.NICKEL, 5, false, 5.0, 1966, new ArrayList<>(nickel,copper)); - double expectedWeight = 5.0; -//act - double coinWeight = coin.coinGramWeight(); -//assert - assertEquals(expected, coinWeight); -} -@Test - void testConvertCoins(){ -//arrange - coinCollection = new Arraylist<>(); - Coin nickel1 = new Coin(); - Coin nickel2 = new coin(); - coinCollection.add(nickel1); - coinCollection.add(nickel2); + @Test + void testCollectCoins() { + // arrange + Coins.CollectCoins(); -//act - Coin Dime = Coin.convertNickelsToDime(nickel1, nickel2); -//assert - Assert(10, Dime.getValue()) -} -@Test - void testCollectCoins(){ -//arrange - coinCollection = new Arraylist<>(); - Coin penny = new Coin(); - Coin nickel = new Coin(); - Coin dime = new Coin (); -//act - AddCoin(penny); - AddCoin(nickel); - AddCoin(dime); -//assert - AssertEquals(3,coinCollection()); -} -@Test - void testGetAgeCoin(){ -//arrange - Coin coin = new Coin(); -// Act - int age = coin.geCoinAge(); -// Assert - assertEquals(1954, age); + List coinCollection = Coins.getCoinCollection(); + + assertTrue(coinCollection.size() == 3); } -@Test - void testGetMaterialComposition(){ - Coin Penny = new Coin(new Arraylist<>(Array.asList("copper,zinc"))) -} + @Test + void testGetAgeCoin() { + // arrange + Coins dime = new Coins(CoinType.DIME, 10, true, 10.0, 1957, List.of("nickel", "copper")); + // Act + int age = dime.getCoinAge(); + // Assert + assertEquals(1957, age); + } + + @Test + void testGetMaterialComposition() { + // arrange + Coins penny = new Coins(CoinType.PENNY, 1, true, 2.5, 1977, List.of("zinc", "copper")); + // act + List materialComposition = penny.getMaterial(); + // assert + assertThat(materialComposition).containsExactly("zinc", "copper"); + } + + @Test + void testCannotConvert() { + assertThatThrownBy( + () -> { + Coins.convertNickelsToDimes(0); + }) + .isInstanceOf(IllegalArgumentException.class) + .hasMessageContaining("you do not have enough nickles"); + } } From 15fbf956c272ad4def1b383a0dc2778d7a0fb183 Mon Sep 17 00:00:00 2001 From: txtran224 Date: Fri, 1 Nov 2024 18:02:40 +0000 Subject: [PATCH 5/8] fix:lesson16 java test file --- .../java/com/codedifferently/lesson16/CoinsTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java index e6055087e..f1d0bd157 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java @@ -6,11 +6,13 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.codedifferently.lesson16.Coins.CoinType; import java.util.ArrayList; import java.util.List; + import org.junit.jupiter.api.Test; +import com.codedifferently.lesson16.Coins.CoinType; + class CoinTest { @Test @@ -55,11 +57,14 @@ void testConvertCoins() { @Test void testCollectCoins() { // arrange - Coins.CollectCoins(); + Coins.collectCoins(); List coinCollection = Coins.getCoinCollection(); assertTrue(coinCollection.size() == 3); + + + } @Test From 50066ef6081a226dc88f4d60be8ef32818ab3f9c Mon Sep 17 00:00:00 2001 From: txtran224 Date: Fri, 1 Nov 2024 18:03:35 +0000 Subject: [PATCH 6/8] lesson_16 --- .../java/com/codedifferently/lesson16/CoinsTest.Java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java index e6055087e..f1d0bd157 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java @@ -6,11 +6,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.codedifferently.lesson16.Coins.CoinType; import java.util.ArrayList; import java.util.List; + import org.junit.jupiter.api.Test; +import com.codedifferently.lesson16.Coins.CoinType; + class CoinTest { @Test @@ -55,11 +57,14 @@ class CoinTest { @Test void testCollectCoins() { // arrange - Coins.CollectCoins(); + Coins.collectCoins(); List coinCollection = Coins.getCoinCollection(); assertTrue(coinCollection.size() == 3); + + + } @Test From b1d9fd832de80f691869466e727e1ad5a84cc441 Mon Sep 17 00:00:00 2001 From: txtran224 Date: Fri, 1 Nov 2024 14:06:38 -0400 Subject: [PATCH 7/8] Delete lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java --- .../codedifferently/lesson16/CoinsTest.Java | 99 ------------------- 1 file changed, 99 deletions(-) delete mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java deleted file mode 100644 index f1d0bd157..000000000 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.Java +++ /dev/null @@ -1,99 +0,0 @@ -package com.codedifferently.lesson16; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.ArrayList; -import java.util.List; - -import org.junit.jupiter.api.Test; - -import com.codedifferently.lesson16.Coins.CoinType; - -class CoinTest { - - @Test - void testCheckCoinInPocket() { - // arrange - Coins coin = new Coins(CoinType.NICKEL, 5, false, 5.0, 1953, List.of("nickel", "copper")); - // act action - Coins.CoinType actualCoin = coin.getCoinType(); - int coinValue = coin.getCoinValue(); - boolean coinRarity = coin.isCoinRare(); - - // assert - assertEquals(CoinType.NICKEL, actualCoin); - assertEquals(5, coinValue); - assertFalse(coinRarity); - } - - @Test - void testWeighCoins() { - // arrange - Coins coin = new Coins(CoinType.NICKEL, 5, false, 5.0, 1953, List.of("nickel", "copper")); - double expectedWeight = 5.0; - // act - double coinWeight = coin.getCoinGramWeight(); - // assert - assertEquals(expectedWeight, coinWeight); - } - - @Test - void testConvertCoins() { - // arrange - List coinCollection = new ArrayList<>(); - coinCollection.add(new Coins(CoinType.NICKEL, 5, false, 5.0, 1953, List.of())); - coinCollection.add(new Coins(CoinType.NICKEL, 5, false, 5.0, 1953, List.of())); - // act - int totalNickles = coinCollection.size(); - int dimes = Coins.convertNickelsToDimes(totalNickles); - // assert - assertEquals(1, dimes); - } - - @Test - void testCollectCoins() { - // arrange - Coins.collectCoins(); - - List coinCollection = Coins.getCoinCollection(); - - assertTrue(coinCollection.size() == 3); - - - - } - - @Test - void testGetAgeCoin() { - // arrange - Coins dime = new Coins(CoinType.DIME, 10, true, 10.0, 1957, List.of("nickel", "copper")); - // Act - int age = dime.getCoinAge(); - // Assert - assertEquals(1957, age); - } - - @Test - void testGetMaterialComposition() { - // arrange - Coins penny = new Coins(CoinType.PENNY, 1, true, 2.5, 1977, List.of("zinc", "copper")); - // act - List materialComposition = penny.getMaterial(); - // assert - assertThat(materialComposition).containsExactly("zinc", "copper"); - } - - @Test - void testCannotConvert() { - assertThatThrownBy( - () -> { - Coins.convertNickelsToDimes(0); - }) - .isInstanceOf(IllegalArgumentException.class) - .hasMessageContaining("you do not have enough nickles"); - } -} From ddcee379c8fee00bc2282ec372728df70822ce61 Mon Sep 17 00:00:00 2001 From: txtran224 Date: Fri, 1 Nov 2024 21:56:00 +0000 Subject: [PATCH 8/8] fix:lesson_16 bugs --- .../lesson16/{ => coins}/Coins.java | 10 +++++++--- .../lesson16/{ => coins}/CoinsTest.java | 18 +++++------------- 2 files changed, 12 insertions(+), 16 deletions(-) rename lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/{ => coins}/Coins.java (88%) rename lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/{ => coins}/CoinsTest.java (88%) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/coins/Coins.java similarity index 88% rename from lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.java rename to lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/coins/Coins.java index 33cb2928d..59aaabd00 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/Coins.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/coins/Coins.java @@ -1,4 +1,4 @@ -package com.codedifferently.lesson16; +package com.codedifferently.lesson16.coins; import java.util.ArrayList; import java.util.List; @@ -58,7 +58,11 @@ public int getCoinAge() { } public List getMaterial() { - return material; + List materialsList = new ArrayList<>(); + for (String mat : material) { + materialsList.add(mat); + } + return materialsList; } public static int convertNickelsToDimes(int totalNickels) { @@ -68,7 +72,7 @@ public static int convertNickelsToDimes(int totalNickels) { return totalNickels / 2; } - public static List CollectCoins() { + public static List setCoinCollection() { Coins penny = new Coins(Coins.CoinType.PENNY, 1, true, 2.5, 1977, List.of("zinc", "copper")); Coins nickel = new Coins(Coins.CoinType.NICKEL, 5, true, 5.0, 1953, List.of("nickel", "copper")); diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/coins/CoinsTest.java similarity index 88% rename from lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java rename to lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/coins/CoinsTest.java index f1d0bd157..5ac862f8f 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CoinsTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/coins/CoinsTest.java @@ -1,18 +1,15 @@ -package com.codedifferently.lesson16; +package com.codedifferently.lesson16.coins; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.codedifferently.lesson16.coins.Coins.CoinType; import java.util.ArrayList; import java.util.List; - import org.junit.jupiter.api.Test; -import com.codedifferently.lesson16.Coins.CoinType; - class CoinTest { @Test @@ -55,16 +52,11 @@ void testConvertCoins() { } @Test - void testCollectCoins() { + void testCoinCollection() { // arrange - Coins.collectCoins(); - - List coinCollection = Coins.getCoinCollection(); - - assertTrue(coinCollection.size() == 3); - - + List coinCollection = Coins.setCoinCollection(); + assertEquals(3, coinCollection.size()); } @Test