From 97b9694ac99c5a3bec8997d1f96cf95841529a66 Mon Sep 17 00:00:00 2001 From: Danielson A Date: Fri, 12 Sep 2025 14:22:30 -0400 Subject: [PATCH 1/8] feat: added tests --- .../lesson16/danielsonobject/Card.java | 32 ++++++++ .../lesson16/danielsonobject/Deck.java | 53 +++++++++++++ .../danielsonobject/JokerException.java | 7 ++ .../lesson16/danielsonobject/Suit.java | 9 +++ .../codedifferently/lesson16/CardTest.java | 44 +++++++++++ .../codedifferently/lesson16/DeckTest.java | 77 +++++++++++++++++++ 6 files changed, 222 insertions(+) create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/JokerException.java create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Suit.java create mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java create mode 100644 lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java new file mode 100644 index 000000000..f895718a5 --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java @@ -0,0 +1,32 @@ +package com.codedifferently.lesson16.danielsonobject; + +public class Card { + private final Suit suit; + private final int rank; + + public Card(Suit suit, int rank) { + if (rank < 1 || rank > 14) { + throw new IllegalArgumentException("Rank must be between 1 and 14"); + } + this.suit = suit; + this.rank = rank; + } + + public Suit getSuit() { + return suit; + } + + public int getRank() { + return rank; + } + + public Card compareTo(Card other) { + if (this.rank > other.rank) { + return this; + } else if (this.rank < other.rank) { + return other; + } else { + return null; // They are equal + } + } +} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java new file mode 100644 index 000000000..5a49b7814 --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java @@ -0,0 +1,53 @@ +package com.codedifferently.lesson16.danielsonobject; + +import com.codedifferently.lesson16.danielsonobject.Card; +import com.codedifferently.lesson16.danielsonobject.Suit; +import java.util.ArrayList; + +public class Deck { + private String brand; + private ArrayList cards; + private int max_size = 54; + + public Deck(String brand){ + this.brand = brand; + this.cards = new ArrayList<>(); + for (Suit suit : Suit.values()) { + if (suit == Suit.NONE) { + cards.add(new Card(Suit.NONE, 14)); // This will represent the Jokers. + cards.add(new Card(Suit.NONE, 14)); + } + for (int rank = 1; rank <= 13; rank++) { + cards.add(new Card(suit, rank)); + } + } + } + + public void shuffle() {} + + public Card draw() { + return null; + } + + public int getSize() { + return cards.size(); + } + + public ArrayList getCards() { + return cards; + } + + public void returnToDeck(Card card) {} + + public void shuffleIntoDeck(Card card){ + + } + + public void removeJokers() { + max_size = 52; + } + + public void addJokers() { + max_size = 54; + } +} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/JokerException.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/JokerException.java new file mode 100644 index 000000000..068464a0d --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/JokerException.java @@ -0,0 +1,7 @@ +package com.codedifferently.lesson16.danielsonobject; + +public class JokerException extends Exception{ + public JokerException(String message){ + super(message); + } +} diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Suit.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Suit.java new file mode 100644 index 000000000..955e36da9 --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Suit.java @@ -0,0 +1,9 @@ +package com.codedifferently.lesson16.danielsonobject; + +public enum Suit { + NONE, + HEARTS, + DIAMONDS, + CLUBS, + SPADES +} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java new file mode 100644 index 000000000..14c4ea6eb --- /dev/null +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java @@ -0,0 +1,44 @@ +package com.codedifferently.lesson16; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import com.codedifferently.lesson16.danielsonobject.Card; +import com.codedifferently.lesson16.danielsonobject.Suit; +import org.junit.jupiter.api.Test; + +public class CardTest { + // Test cases for Card class + @Test + public void testCardCreation() { + Card card = new Card(Suit.HEARTS, 10); + assertThat(card.getSuit()).isEqualTo(Suit.HEARTS); + assertThat(card.getRank()).isEqualTo(10); + + card = new Card(Suit.SPADES, 3); + assertThat(card.getSuit()).isEqualTo(Suit.SPADES); + assertThat(card.getRank()).isEqualTo(3); + + card = new Card(Suit.NONE, 14); + assertThat(card.getSuit()).isEqualTo(Suit.NONE); + assertThat(card.getRank()).isEqualTo(14); + + assertThatThrownBy(() -> new Card(Suit.HEARTS, 0)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("Rank must be between 1 and 14"); + } + + @Test + public void testCompareTo() { + Card card1 = new Card(Suit.HEARTS, 10); + Card card2 = new Card(Suit.SPADES, 3); + Card card3 = new Card(Suit.DIAMONDS, 10); + Card card4 = new Card(Suit.NONE, 14); // Joker + + assertThat(card1.compareTo(card2)).isEqualTo(card1); // 10 > 3 + assertThat(card2.compareTo(card1)).isEqualTo(card1); // 3 < 10 + assertThat(card1.compareTo(card4)).isEqualTo(card4); // 10 < Joker + assertThat(card4.compareTo(card2)).isEqualTo(card4); // Joker > + assertThat(card1.compareTo(card3)).isNull(); // 10 + } +} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java new file mode 100644 index 000000000..a614aa07a --- /dev/null +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java @@ -0,0 +1,77 @@ +package com.codedifferently.lesson16; +import com.codedifferently.lesson16.Deck; +import com.codedifferently.lesson16.danielsonobject.Card; +import com.codedifferently.lesson16.danielsonobject.JokerException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; + +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.assertNotEquals; + +public class DeckTest { + Deck deck; + @BeforeEach + public void setUp(){ + deck = new Deck("Bicycle"); + } + @Test + public void Deckexists(){ + Deck deck = new Deck("Bicycle"); + assertThat(deck).isNotNull(); + } + @Test + public void getCards(){ + ArrayList cards = deck.getCards(); + assertThat(deck).isNotNull(); + } + + + @Test + public void jokerTest(){ + assertThatThrownBy( + () -> {deck.addJokers();}) + .isInstanceOf(JokerException.class) + .hasMessage("There are already jokers"); + + deck.removeJokers(); + assertEquals(deck.getSize(),52); + deck.addJokers(); + assertEquals(deck.getSize(), 54); + } + + @Test + public void draw(){ + Card card1 = deck.draw(); + Card card2 = deck.draw(); + + assertNotEquals(card1, card2); + + assertEquals(52,deck.getSize()); + } + + @Test + public void sizeTest(){ + assertEquals(deck.getSize(),54); + } + + @Test + public void returnToDeckTest(){ + int initalSize = deck.getSize(); + Card card1 = deck.draw(); + deck.returnToDeck(card1); + assertEquals(card1, deck.getCards().get(0)); + assertEquals(initalSize, deck.getSize()); + } + + @Test + public void shuffleTest(){ + Deck copy = deck; + deck.shuffle(); + assertNotEquals(deck, copy); + assertEquals(deck.getSize(), copy.getSize()); + } +} From fccbb7ef6eea22c9c30aa25217681930d07d5d98 Mon Sep 17 00:00:00 2001 From: Danielson A Date: Fri, 12 Sep 2025 14:49:17 -0400 Subject: [PATCH 2/8] feat: initial deck code; untested --- .../lesson16/danielsonobject/Card.java | 23 +++++++++++ .../lesson16/danielsonobject/Deck.java | 38 ++++++++++++++++--- .../codedifferently/lesson16/CardTest.java | 11 ++++-- .../codedifferently/lesson16/DeckTest.java | 4 +- 4 files changed, 64 insertions(+), 12 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java index f895718a5..0f25bf4af 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java @@ -12,6 +12,11 @@ public Card(Suit suit, int rank) { this.rank = rank; } + public Card() { + this.suit = Suit.NONE; + this.rank = 14; + } + public Suit getSuit() { return suit; } @@ -29,4 +34,22 @@ public Card compareTo(Card other) { return null; // They are equal } } + + @Override + public String toString() { + if (suit == Suit.NONE){ + return "Joker"; + }else if(2 <= rank && rank <= 10) { + return rank + " of "+suit.toString(); + }else{ + String face = ""; + switch (this.rank){ + case 11 -> face = "Jack"; + case 12 -> face = "Queen"; + case 13 -> face = "King"; + default -> face = "Ace"; + } + return face +" of "+ suit.toString(); + } + } } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java index 5a49b7814..b986acafc 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java @@ -1,10 +1,10 @@ package com.codedifferently.lesson16.danielsonobject; -import com.codedifferently.lesson16.danielsonobject.Card; -import com.codedifferently.lesson16.danielsonobject.Suit; import java.util.ArrayList; +import java.util.Random; public class Deck { + private Random rand = new Random(); private String brand; private ArrayList cards; private int max_size = 54; @@ -23,10 +23,16 @@ public Deck(String brand){ } } + public String getBrand(){ + return brand; + } public void shuffle() {} public Card draw() { - return null; + if (cards.isEmpty()){ + throw new IllegalStateException("There are no Cards to draw"); + } + return cards.removeFirst(); } public int getSize() { @@ -37,17 +43,39 @@ public ArrayList getCards() { return cards; } - public void returnToDeck(Card card) {} + public void returnToDeck(Card card) { + cards.addFirst(card); + } public void shuffleIntoDeck(Card card){ + if (cards.size() + 1 > max_size){ + throw new IllegalStateException("Deck limit reached"); + } + int insert = rand.nextInt(0, max_size); + cards.add(insert, card); } public void removeJokers() { + cards.remove(new Card()); + /* + for(Card card : cards){ + if (card.getSuit == Suit.NONE){ + cards.remove(card); + } + } + */ max_size = 52; } public void addJokers() { - max_size = 54; + if (max_size == 52) { + max_size = 54; + shuffleIntoDeck(new Card()); + shuffleIntoDeck(new Card()); + } + else if (max_size == 54){ + throw new RuntimeException("Jokers are already accounted for"); + } } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java index 14c4ea6eb..e144432b9 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java @@ -19,15 +19,18 @@ public void testCardCreation() { assertThat(card.getSuit()).isEqualTo(Suit.SPADES); assertThat(card.getRank()).isEqualTo(3); - card = new Card(Suit.NONE, 14); - assertThat(card.getSuit()).isEqualTo(Suit.NONE); - assertThat(card.getRank()).isEqualTo(14); - assertThatThrownBy(() -> new Card(Suit.HEARTS, 0)) .isInstanceOf(IllegalArgumentException.class) .hasMessage("Rank must be between 1 and 14"); } + @Test + public void JokerCreation(){ + Card card = new Card(); + assertThat(card.getSuit()).isEqualTo(Suit.NONE); + assertThat(card.getRank()).isEqualTo(14); + } + @Test public void testCompareTo() { Card card1 = new Card(Suit.HEARTS, 10); diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java index a614aa07a..24de80d2a 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java @@ -1,7 +1,5 @@ package com.codedifferently.lesson16; -import com.codedifferently.lesson16.Deck; -import com.codedifferently.lesson16.danielsonobject.Card; -import com.codedifferently.lesson16.danielsonobject.JokerException; +import com.codedifferently.lesson16.danielsonobject.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; From 116f0460898f0756c6afac9488a74e143daf63e9 Mon Sep 17 00:00:00 2001 From: Danielson A Date: Fri, 12 Sep 2025 15:31:53 -0400 Subject: [PATCH 3/8] feat: all test but shuffle passing --- .../lesson16/danielsonobject/Deck.java | 29 ++++++++------- .../codedifferently/lesson16/DeckTest.java | 36 +++++++++++++------ 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java index b986acafc..90539bfff 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java @@ -14,11 +14,13 @@ public Deck(String brand){ this.cards = new ArrayList<>(); for (Suit suit : Suit.values()) { if (suit == Suit.NONE) { - cards.add(new Card(Suit.NONE, 14)); // This will represent the Jokers. - cards.add(new Card(Suit.NONE, 14)); + cards.add(new Card()); // This will represent the Jokers. + cards.add(new Card()); } - for (int rank = 1; rank <= 13; rank++) { - cards.add(new Card(suit, rank)); + else{ + for (int rank = 1; rank <= 13; rank++) { + cards.add(new Card(suit, rank)); + } } } } @@ -43,7 +45,7 @@ public ArrayList getCards() { return cards; } - public void returnToDeck(Card card) { + public void addToDeck(Card card) { cards.addFirst(card); } @@ -52,30 +54,27 @@ public void shuffleIntoDeck(Card card){ throw new IllegalStateException("Deck limit reached"); } int insert = rand.nextInt(0, max_size); + cards.add(insert, card); } - public void removeJokers() { - cards.remove(new Card()); - /* - for(Card card : cards){ - if (card.getSuit == Suit.NONE){ - cards.remove(card); - } + public void removeJokers() throws JokerException{ + if (max_size == 52){ + throw new JokerException("There are already no Jokers"); } - */ + cards.removeIf(card -> card.getSuit() == Suit.NONE); max_size = 52; } - public void addJokers() { + public void addJokers() throws JokerException { if (max_size == 52) { max_size = 54; shuffleIntoDeck(new Card()); shuffleIntoDeck(new Card()); } else if (max_size == 54){ - throw new RuntimeException("Jokers are already accounted for"); + throw new JokerException("Jokers are already accounted for"); } } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java index 24de80d2a..e85c161aa 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java @@ -9,6 +9,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.fail; public class DeckTest { Deck deck; @@ -27,22 +28,37 @@ public void getCards(){ assertThat(deck).isNotNull(); } + @Test + public void removeJokerTest() throws JokerException { + deck.removeJokers(); + assertEquals(deck.getSize(), 52); + for (Card card : deck.getCards()){ + if (card.getRank() == 14){ + fail("There is still a Joker in the deck"); + } + } + } @Test - public void jokerTest(){ + public void addJokerTest() throws JokerException { assertThatThrownBy( - () -> {deck.addJokers();}) + () -> {deck.addJokers();}) .isInstanceOf(JokerException.class) - .hasMessage("There are already jokers"); - + .hasMessage("Jokers are already accounted for"); deck.removeJokers(); - assertEquals(deck.getSize(),52); deck.addJokers(); assertEquals(deck.getSize(), 54); + int count = 0; + for (Card card : deck.getCards()){ + if (card.getRank() == 14){ + count ++; + } + } + assertEquals(2, count); } @Test - public void draw(){ + public void drawTest(){ Card card1 = deck.draw(); Card card2 = deck.draw(); @@ -57,12 +73,12 @@ public void sizeTest(){ } @Test - public void returnToDeckTest(){ - int initalSize = deck.getSize(); + public void addToDeckTest(){ + int initialSize = deck.getSize(); Card card1 = deck.draw(); - deck.returnToDeck(card1); + deck.addToDeck(card1); assertEquals(card1, deck.getCards().get(0)); - assertEquals(initalSize, deck.getSize()); + assertEquals(initialSize, deck.getSize()); } @Test From 4bb78f383de04f973f9f5c85573ad2855468b336 Mon Sep 17 00:00:00 2001 From: Danielson A Date: Fri, 12 Sep 2025 15:59:02 -0400 Subject: [PATCH 4/8] feat: all tests passing --- .../lesson16/danielsonobject/Card.java | 23 +++++++++++++------ .../lesson16/danielsonobject/Deck.java | 14 +++++++---- .../codedifferently/lesson16/CardTest.java | 2 +- .../codedifferently/lesson16/DeckTest.java | 11 ++++----- 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java index 0f25bf4af..ec110bd94 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java @@ -1,22 +1,19 @@ package com.codedifferently.lesson16.danielsonobject; +import java.util.Objects; + public class Card { private final Suit suit; private final int rank; public Card(Suit suit, int rank) { - if (rank < 1 || rank > 14) { - throw new IllegalArgumentException("Rank must be between 1 and 14"); + if (rank < 1 || rank > 15) { + throw new IllegalArgumentException("Rank must be between 1 and 15"); } this.suit = suit; this.rank = rank; } - public Card() { - this.suit = Suit.NONE; - this.rank = 14; - } - public Suit getSuit() { return suit; } @@ -52,4 +49,16 @@ public String toString() { return face +" of "+ suit.toString(); } } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof Card)) return false; + Card card = (Card) o; + return rank == card.rank && suit == card.suit; + } + + @Override + public int hashCode() { + return Objects.hash(suit, rank); + } } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java index 90539bfff..28c8f5401 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java @@ -1,6 +1,8 @@ package com.codedifferently.lesson16.danielsonobject; import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.Random; public class Deck { @@ -14,8 +16,8 @@ public Deck(String brand){ this.cards = new ArrayList<>(); for (Suit suit : Suit.values()) { if (suit == Suit.NONE) { - cards.add(new Card()); // This will represent the Jokers. - cards.add(new Card()); + cards.add(new Card(Suit.NONE, 14)); // This will represent the Jokers. + cards.add(new Card(Suit.NONE, 15)); } else{ for (int rank = 1; rank <= 13; rank++) { @@ -28,7 +30,9 @@ public Deck(String brand){ public String getBrand(){ return brand; } - public void shuffle() {} + public void shuffle() { + Collections.shuffle(cards); + } public Card draw() { if (cards.isEmpty()){ @@ -70,8 +74,8 @@ public void removeJokers() throws JokerException{ public void addJokers() throws JokerException { if (max_size == 52) { max_size = 54; - shuffleIntoDeck(new Card()); - shuffleIntoDeck(new Card()); + shuffleIntoDeck(new Card(Suit.NONE, 14)); + shuffleIntoDeck(new Card(Suit.NONE, 15)); } else if (max_size == 54){ throw new JokerException("Jokers are already accounted for"); diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java index e144432b9..fe5628be3 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java @@ -26,7 +26,7 @@ public void testCardCreation() { @Test public void JokerCreation(){ - Card card = new Card(); + Card card = new Card(Suit.NONE, 14); assertThat(card.getSuit()).isEqualTo(Suit.NONE); assertThat(card.getRank()).isEqualTo(14); } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java index e85c161aa..c53d891c4 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java @@ -7,9 +7,7 @@ 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.assertNotEquals; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.*; public class DeckTest { Deck deck; @@ -50,7 +48,7 @@ public void addJokerTest() throws JokerException { assertEquals(deck.getSize(), 54); int count = 0; for (Card card : deck.getCards()){ - if (card.getRank() == 14){ + if (card.getSuit() == Suit.NONE){ count ++; } } @@ -83,9 +81,10 @@ public void addToDeckTest(){ @Test public void shuffleTest(){ - Deck copy = deck; + Deck copy = new Deck("Bicyle"); + assertEquals(deck.getCards(), copy.getCards()); deck.shuffle(); - assertNotEquals(deck, copy); + assertNotEquals(deck.getCards(), copy.getCards()); assertEquals(deck.getSize(), copy.getSize()); } } From fb739417ac7c1f327f56c227b1f8324c1bad3caa Mon Sep 17 00:00:00 2001 From: Danielson A Date: Fri, 12 Sep 2025 16:07:31 -0400 Subject: [PATCH 5/8] fix: spotlessApply --- .../lesson16/danielsonobject/Card.java | 13 +- .../lesson16/danielsonobject/Deck.java | 23 ++- .../danielsonobject/JokerException.java | 8 +- .../codedifferently/lesson16/CardTest.java | 2 +- .../codedifferently/lesson16/DeckTest.java | 149 +++++++++--------- 5 files changed, 99 insertions(+), 96 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java index ec110bd94..5cc1804dd 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java @@ -34,21 +34,22 @@ public Card compareTo(Card other) { @Override public String toString() { - if (suit == Suit.NONE){ + if (suit == Suit.NONE) { return "Joker"; - }else if(2 <= rank && rank <= 10) { - return rank + " of "+suit.toString(); - }else{ + } else if (2 <= rank && rank <= 10) { + return rank + " of " + suit.toString(); + } else { String face = ""; - switch (this.rank){ + switch (this.rank) { case 11 -> face = "Jack"; case 12 -> face = "Queen"; case 13 -> face = "King"; default -> face = "Ace"; } - return face +" of "+ suit.toString(); + return face + " of " + suit.toString(); } } + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java index 28c8f5401..3f7047eca 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java @@ -1,7 +1,6 @@ package com.codedifferently.lesson16.danielsonobject; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.Random; @@ -11,15 +10,14 @@ public class Deck { private ArrayList cards; private int max_size = 54; - public Deck(String brand){ + public Deck(String brand) { this.brand = brand; this.cards = new ArrayList<>(); for (Suit suit : Suit.values()) { if (suit == Suit.NONE) { cards.add(new Card(Suit.NONE, 14)); // This will represent the Jokers. cards.add(new Card(Suit.NONE, 15)); - } - else{ + } else { for (int rank = 1; rank <= 13; rank++) { cards.add(new Card(suit, rank)); } @@ -27,15 +25,16 @@ public Deck(String brand){ } } - public String getBrand(){ + public String getBrand() { return brand; } + public void shuffle() { Collections.shuffle(cards); } public Card draw() { - if (cards.isEmpty()){ + if (cards.isEmpty()) { throw new IllegalStateException("There are no Cards to draw"); } return cards.removeFirst(); @@ -53,18 +52,17 @@ public void addToDeck(Card card) { cards.addFirst(card); } - public void shuffleIntoDeck(Card card){ - if (cards.size() + 1 > max_size){ + public void shuffleIntoDeck(Card card) { + if (cards.size() + 1 > max_size) { throw new IllegalStateException("Deck limit reached"); } int insert = rand.nextInt(0, max_size); cards.add(insert, card); - } - public void removeJokers() throws JokerException{ - if (max_size == 52){ + public void removeJokers() throws JokerException { + if (max_size == 52) { throw new JokerException("There are already no Jokers"); } cards.removeIf(card -> card.getSuit() == Suit.NONE); @@ -76,8 +74,7 @@ public void addJokers() throws JokerException { max_size = 54; shuffleIntoDeck(new Card(Suit.NONE, 14)); shuffleIntoDeck(new Card(Suit.NONE, 15)); - } - else if (max_size == 54){ + } else if (max_size == 54) { throw new JokerException("Jokers are already accounted for"); } } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/JokerException.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/JokerException.java index 068464a0d..1c47515bb 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/JokerException.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/JokerException.java @@ -1,7 +1,7 @@ package com.codedifferently.lesson16.danielsonobject; -public class JokerException extends Exception{ - public JokerException(String message){ - super(message); - } +public class JokerException extends Exception { + public JokerException(String message) { + super(message); + } } diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java index fe5628be3..7d93c5758 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java @@ -25,7 +25,7 @@ public void testCardCreation() { } @Test - public void JokerCreation(){ + public void JokerCreation() { Card card = new Card(Suit.NONE, 14); assertThat(card.getSuit()).isEqualTo(Suit.NONE); assertThat(card.getRank()).isEqualTo(14); diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java index c53d891c4..b14a54df2 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java @@ -1,90 +1,95 @@ package com.codedifferently.lesson16; -import com.codedifferently.lesson16.danielsonobject.*; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.ArrayList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.*; +import com.codedifferently.lesson16.danielsonobject.*; +import java.util.ArrayList; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + public class DeckTest { - Deck deck; - @BeforeEach - public void setUp(){ - deck = new Deck("Bicycle"); - } - @Test - public void Deckexists(){ - Deck deck = new Deck("Bicycle"); - assertThat(deck).isNotNull(); - } - @Test - public void getCards(){ - ArrayList cards = deck.getCards(); - assertThat(deck).isNotNull(); - } + Deck deck; + + @BeforeEach + public void setUp() { + deck = new Deck("Bicycle"); + } + + @Test + public void Deckexists() { + Deck deck = new Deck("Bicycle"); + assertThat(deck).isNotNull(); + } - @Test - public void removeJokerTest() throws JokerException { - deck.removeJokers(); - assertEquals(deck.getSize(), 52); - for (Card card : deck.getCards()){ - if (card.getRank() == 14){ - fail("There is still a Joker in the deck"); - } - } + @Test + public void getCards() { + ArrayList cards = deck.getCards(); + assertThat(deck).isNotNull(); + } + + @Test + public void removeJokerTest() throws JokerException { + deck.removeJokers(); + assertEquals(deck.getSize(), 52); + for (Card card : deck.getCards()) { + if (card.getRank() == 14) { + fail("There is still a Joker in the deck"); + } } + } - @Test - public void addJokerTest() throws JokerException { - assertThatThrownBy( - () -> {deck.addJokers();}) - .isInstanceOf(JokerException.class) - .hasMessage("Jokers are already accounted for"); - deck.removeJokers(); - deck.addJokers(); - assertEquals(deck.getSize(), 54); - int count = 0; - for (Card card : deck.getCards()){ - if (card.getSuit() == Suit.NONE){ - count ++; - } - } - assertEquals(2, count); + @Test + public void addJokerTest() throws JokerException { + assertThatThrownBy( + () -> { + deck.addJokers(); + }) + .isInstanceOf(JokerException.class) + .hasMessage("Jokers are already accounted for"); + deck.removeJokers(); + deck.addJokers(); + assertEquals(deck.getSize(), 54); + int count = 0; + for (Card card : deck.getCards()) { + if (card.getSuit() == Suit.NONE) { + count++; + } } + assertEquals(2, count); + } - @Test - public void drawTest(){ - Card card1 = deck.draw(); - Card card2 = deck.draw(); + @Test + public void drawTest() { + Card card1 = deck.draw(); + Card card2 = deck.draw(); - assertNotEquals(card1, card2); + assertNotEquals(card1, card2); - assertEquals(52,deck.getSize()); - } + assertEquals(52, deck.getSize()); + } - @Test - public void sizeTest(){ - assertEquals(deck.getSize(),54); - } + @Test + public void sizeTest() { + assertEquals(deck.getSize(), 54); + } - @Test - public void addToDeckTest(){ - int initialSize = deck.getSize(); - Card card1 = deck.draw(); - deck.addToDeck(card1); - assertEquals(card1, deck.getCards().get(0)); - assertEquals(initialSize, deck.getSize()); - } + @Test + public void addToDeckTest() { + int initialSize = deck.getSize(); + Card card1 = deck.draw(); + deck.addToDeck(card1); + assertEquals(card1, deck.getCards().get(0)); + assertEquals(initialSize, deck.getSize()); + } - @Test - public void shuffleTest(){ - Deck copy = new Deck("Bicyle"); - assertEquals(deck.getCards(), copy.getCards()); - deck.shuffle(); - assertNotEquals(deck.getCards(), copy.getCards()); - assertEquals(deck.getSize(), copy.getSize()); - } + @Test + public void shuffleTest() { + Deck copy = new Deck("Bicyle"); + assertEquals(deck.getCards(), copy.getCards()); + deck.shuffle(); + assertNotEquals(deck.getCards(), copy.getCards()); + assertEquals(deck.getSize(), copy.getSize()); + } } From cff9b71962dee9430d663b949c8896d37a8ea838 Mon Sep 17 00:00:00 2001 From: Danielson A Date: Fri, 12 Sep 2025 16:30:38 -0400 Subject: [PATCH 6/8] fix: warning resolved(i think) --- .../lesson16/danielsonobject/Card.java | 15 ++++-------- .../lesson16/danielsonobject/Deck.java | 6 ++--- .../codedifferently/lesson16/CardTest.java | 2 +- .../codedifferently/lesson16/DeckTest.java | 24 ++++++++++++------- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java index 5cc1804dd..1ae9c68f1 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java @@ -1,7 +1,9 @@ package com.codedifferently.lesson16.danielsonobject; import java.util.Objects; +import lombok.Getter; +@Getter public class Card { private final Suit suit; private final int rank; @@ -14,14 +16,6 @@ public Card(Suit suit, int rank) { this.rank = rank; } - public Suit getSuit() { - return suit; - } - - public int getRank() { - return rank; - } - public Card compareTo(Card other) { if (this.rank > other.rank) { return this; @@ -39,7 +33,7 @@ public String toString() { } else if (2 <= rank && rank <= 10) { return rank + " of " + suit.toString(); } else { - String face = ""; + String face; switch (this.rank) { case 11 -> face = "Jack"; case 12 -> face = "Queen"; @@ -53,8 +47,7 @@ public String toString() { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof Card)) return false; - Card card = (Card) o; + if (!(o instanceof Card card)) return false; return rank == card.rank && suit == card.suit; } diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java index 3f7047eca..81b60b4c3 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java @@ -5,9 +5,9 @@ import java.util.Random; public class Deck { - private Random rand = new Random(); - private String brand; - private ArrayList cards; + private final Random rand = new Random(); + private final String brand; + private final ArrayList cards; private int max_size = 54; public Deck(String brand) { diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java index 7d93c5758..ae3e81017 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java @@ -21,7 +21,7 @@ public void testCardCreation() { assertThatThrownBy(() -> new Card(Suit.HEARTS, 0)) .isInstanceOf(IllegalArgumentException.class) - .hasMessage("Rank must be between 1 and 14"); + .hasMessage("Rank must be between 1 and 15"); } @Test diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java index b14a54df2..2ac48f136 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java @@ -1,8 +1,10 @@ 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.*; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.fail; import com.codedifferently.lesson16.danielsonobject.*; import java.util.ArrayList; @@ -26,7 +28,7 @@ public void Deckexists() { @Test public void getCards() { ArrayList cards = deck.getCards(); - assertThat(deck).isNotNull(); + assertThat(cards).isNotNull(); } @Test @@ -42,12 +44,10 @@ public void removeJokerTest() throws JokerException { @Test public void addJokerTest() throws JokerException { - assertThatThrownBy( - () -> { - deck.addJokers(); - }) + assertThatThrownBy(() -> deck.addJokers()) .isInstanceOf(JokerException.class) .hasMessage("Jokers are already accounted for"); + deck.removeJokers(); deck.addJokers(); assertEquals(deck.getSize(), 54); @@ -60,6 +60,12 @@ public void addJokerTest() throws JokerException { assertEquals(2, count); } + @Test + public void brandTest() { + assertEquals("Bicycle", deck.getBrand()); + assertEquals("Copag", new Deck("Copag").getBrand()); + } + @Test public void drawTest() { Card card1 = deck.draw(); @@ -80,7 +86,7 @@ public void addToDeckTest() { int initialSize = deck.getSize(); Card card1 = deck.draw(); deck.addToDeck(card1); - assertEquals(card1, deck.getCards().get(0)); + assertEquals(card1, deck.getCards().getFirst()); assertEquals(initialSize, deck.getSize()); } From e3c4595bf2767ddaaa661387655441ec6a469838 Mon Sep 17 00:00:00 2001 From: Danielson A Date: Sun, 14 Sep 2025 12:08:38 -0400 Subject: [PATCH 7/8] feat: added DeckException --- .../lesson16/danielsonobject/Deck.java | 11 +++++++---- .../lesson16/danielsonobject/DeckException.java | 7 +++++++ .../com/codedifferently/lesson16/DeckTest.java | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/DeckException.java diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java index 81b60b4c3..b3186d1ed 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Deck.java @@ -35,7 +35,7 @@ public void shuffle() { public Card draw() { if (cards.isEmpty()) { - throw new IllegalStateException("There are no Cards to draw"); + throw new DeckException("There are no Cards to draw"); } return cards.removeFirst(); } @@ -48,13 +48,16 @@ public ArrayList getCards() { return cards; } - public void addToDeck(Card card) { + public void addToDeck(Card card) throws DeckException { + if (cards.size() + 1 > max_size) { + throw new DeckException("Deck limit reached"); + } cards.addFirst(card); } - public void shuffleIntoDeck(Card card) { + public void shuffleIntoDeck(Card card) throws DeckException { if (cards.size() + 1 > max_size) { - throw new IllegalStateException("Deck limit reached"); + throw new DeckException("Deck limit reached"); } int insert = rand.nextInt(0, max_size); diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/DeckException.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/DeckException.java new file mode 100644 index 000000000..31eb1deed --- /dev/null +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/DeckException.java @@ -0,0 +1,7 @@ +package com.codedifferently.lesson16.danielsonobject; + +public class DeckException extends IllegalStateException { + DeckException(String message) { + super(message); + } +} diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java index 2ac48f136..21c21d32e 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java @@ -90,6 +90,20 @@ public void addToDeckTest() { assertEquals(initialSize, deck.getSize()); } + @Test + public void DeckExceptionTest() { + assertThatThrownBy(() -> deck.addToDeck(new Card(Suit.HEARTS, 1))) + .isInstanceOf(DeckException.class) + .hasMessage("Deck limit reached"); + + for (int x = 0; x < 54; x++) { + deck.draw(); + } + assertThatThrownBy(() -> deck.draw()) + .isInstanceOf(DeckException.class) + .hasMessage("There are no Cards to draw"); + } + @Test public void shuffleTest() { Deck copy = new Deck("Bicyle"); From 6ae196cb410a00f4e62aa068e576ed8b8a72a43c Mon Sep 17 00:00:00 2001 From: "Danielson A." Date: Wed, 24 Sep 2025 20:31:32 +0000 Subject: [PATCH 8/8] fix: danielsonobject made --- .../codedifferently/lesson16/danielsonobject/Card.java | 8 ++++++++ .../lesson16/{ => danielsonobject}/CardTest.java | 4 +--- .../lesson16/{ => danielsonobject}/DeckTest.java | 3 +-- 3 files changed, 10 insertions(+), 5 deletions(-) rename lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/{ => danielsonobject}/CardTest.java (90%) rename lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/{ => danielsonobject}/DeckTest.java (96%) diff --git a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java index 1ae9c68f1..0f18fdd19 100644 --- a/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java +++ b/lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/danielsonobject/Card.java @@ -16,6 +16,14 @@ public Card(Suit suit, int rank) { this.rank = rank; } + public Suit getSuit() { + return suit; + } + + public int getRank() { + return rank; + } + public Card compareTo(Card other) { if (this.rank > other.rank) { return this; diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/danielsonobject/CardTest.java similarity index 90% rename from lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java rename to lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/danielsonobject/CardTest.java index ae3e81017..cae8cc5fa 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/CardTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/danielsonobject/CardTest.java @@ -1,10 +1,8 @@ -package com.codedifferently.lesson16; +package com.codedifferently.lesson16.danielsonobject; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import com.codedifferently.lesson16.danielsonobject.Card; -import com.codedifferently.lesson16.danielsonobject.Suit; import org.junit.jupiter.api.Test; public class CardTest { diff --git a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/danielsonobject/DeckTest.java similarity index 96% rename from lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java rename to lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/danielsonobject/DeckTest.java index 21c21d32e..0e77286df 100644 --- a/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/DeckTest.java +++ b/lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/danielsonobject/DeckTest.java @@ -1,4 +1,4 @@ -package com.codedifferently.lesson16; +package com.codedifferently.lesson16.danielsonobject; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; @@ -6,7 +6,6 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.fail; -import com.codedifferently.lesson16.danielsonobject.*; import java.util.ArrayList; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;