From 39beb4acc65b6cf98447287e1c048d4e8f4d6703 Mon Sep 17 00:00:00 2001 From: fdai7736 Date: Wed, 24 Jan 2024 00:08:07 +0100 Subject: [PATCH] Refactoring: change remove Constructor to Setter --- .../java/de/hsfulda/onses/models/Card.java | 47 ++++++++++--------- src/test/java/de/hsfulda/onses/CardTest.java | 12 ++--- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/src/main/java/de/hsfulda/onses/models/Card.java b/src/main/java/de/hsfulda/onses/models/Card.java index d82f13b..ab34ad8 100644 --- a/src/main/java/de/hsfulda/onses/models/Card.java +++ b/src/main/java/de/hsfulda/onses/models/Card.java @@ -1,31 +1,36 @@ package de.hsfulda.onses.models; public class Card { - - public enum Color { - RED, BLUE, GREEN, YELLOW, BLACK; - }; - public enum evalue { - ZERO, ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN, EIGHT, NINE, DRAWTWO, SKIP, REVERSE, CHOOSE, CHOOSEDRAW; - - private static final evalue[] values = evalue.values(); - public static evalue getValue(int n) { - return evalue.values[n]; - } - }; - - private final int id; - private final Color color; - private final evalue value; - - - public Card(int id, Color color, evalue value) - { + private int id; + private Color color; + private evalue value; + + public enum Color { + RED, BLUE, GREEN, YELLOW, BLACK; + }; + public enum evalue { + ZERO, ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN, EIGHT, NINE, DRAWTWO, SKIP, REVERSE, CHOOSE, CHOOSEDRAW; + + private static final evalue[] values = evalue.values(); + public static evalue getValue(int n) { + return evalue.values[n]; + } + }; + + public Card setId(int id) { this.id = id; + return this; + } + + public Card setColor(Color color) { this.color = color; - this.value = value; + return this; } + public Card setValue(evalue value) { + this.value = value; + return this; + } public int getId() { return this.id; diff --git a/src/test/java/de/hsfulda/onses/CardTest.java b/src/test/java/de/hsfulda/onses/CardTest.java index fd5efab..fc84c62 100644 --- a/src/test/java/de/hsfulda/onses/CardTest.java +++ b/src/test/java/de/hsfulda/onses/CardTest.java @@ -17,7 +17,7 @@ public class CardTest { int expected = 5; int ID = 5; // act - Card testcard = new Card(ID, Card.Color.BLACK, Card.evalue.FIVE); + Card testcard = new Card().setId(ID).setColor(Card.Color.BLACK).setValue(Card.evalue.FIVE); int answer = testcard.getId(); // assert assertEquals(expected, answer); @@ -31,7 +31,7 @@ public class CardTest { int expected = 112; int ID = 112; // act - Card testcard = new Card(ID, Card.Color.BLUE, Card.evalue.CHOOSEDRAW); + Card testcard = new Card().setId(ID).setColor(Card.Color.BLUE).setValue(Card.evalue.CHOOSEDRAW); int answer = testcard.getId(); // assert assertEquals(expected, answer); @@ -46,7 +46,7 @@ public class CardTest { Card.Color expected = Card.Color.BLUE; Card.Color color = Card.Color.BLUE; // act - Card testcard = new Card(9, color, Card.evalue.FIVE); + Card testcard = new Card().setId(9).setColor(color).setValue(Card.evalue.FIVE); Card.Color answer = testcard.getColor(); // assert assertEquals(expected, answer); @@ -59,7 +59,7 @@ public class CardTest { Card.Color expected = Card.Color.BLACK; Card.Color color = Card.Color.BLACK; // act - Card testcard = new Card(15, color, Card.evalue.CHOOSE); + Card testcard = new Card().setId(15).setColor(color).setValue(Card.evalue.CHOOSE); Card.Color answer = testcard.getColor(); // assert assertEquals(expected, answer); @@ -74,7 +74,7 @@ public class CardTest { Card.evalue expected = Card.evalue.THREE; Card.evalue value = Card.evalue.THREE; // act - Card testcard = new Card(2, Card.Color.BLUE, value); + Card testcard = new Card().setId(2).setColor(Card.Color.BLUE).setValue(value); Card.evalue answer = testcard.getValue(); // assert assertEquals(expected, answer); @@ -87,7 +87,7 @@ public class CardTest { Card.evalue expected = Card.evalue.SKIP; Card.evalue value = Card.evalue.SKIP; // act - Card testcard = new Card(19, Card.Color.BLACK, value); + Card testcard = new Card().setId(19).setColor(Card.Color.BLACK).setValue(value); Card.evalue answer = testcard.getValue(); // assert assertEquals(expected, answer);