From 462b2e0a5f912868170a9b19781aba1d9247cb3c Mon Sep 17 00:00:00 2001 From: Alexander Hartung Date: Tue, 15 Feb 2022 20:38:16 +0100 Subject: [PATCH] Refactor --- src/main/java/solitaer/Card.java | 12 ++++++------ src/test/java/solitaer/AblageStackTest.java | 4 ++-- src/test/java/solitaer/CardDeckTest.java | 4 ++-- src/test/java/solitaer/StartStackTest.java | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/solitaer/Card.java b/src/main/java/solitaer/Card.java index 5cad36d..e905f90 100644 --- a/src/main/java/solitaer/Card.java +++ b/src/main/java/solitaer/Card.java @@ -21,19 +21,19 @@ public class Card extends JPanel { private final int IMAGE_WIDTH = 72; private final int IMAGE_HIGHT = 96; - public Card(int nr, Symbol symbol, boolean faceUp) { + public Card(int _nr, Symbol _symbol, boolean _faceUp) { this.setSize(IMAGE_WIDTH,IMAGE_HIGHT); - this.nr = nr; - this.symbol = symbol; - this.faceUp = faceUp; + this.nr = _nr; + this.symbol = _symbol; + this.faceUp = _faceUp; } public boolean isFaceUp() { return faceUp; } - public void setFaceUp(boolean faceUp) { - this.faceUp = faceUp; + public void setFaceUp(boolean _faceUp) { + this.faceUp = _faceUp; } public int getNr() { diff --git a/src/test/java/solitaer/AblageStackTest.java b/src/test/java/solitaer/AblageStackTest.java index 6059ac1..94ebe9d 100644 --- a/src/test/java/solitaer/AblageStackTest.java +++ b/src/test/java/solitaer/AblageStackTest.java @@ -12,9 +12,9 @@ class AblageStackTest { @ParameterizedTest @MethodSource("testAblageStackTestDaten") - void testRulesetAblageStack(String msg, Card _stapel, Card _spieler, boolean _expectedResult) { + void testRulesetAblageStack(String _msg, Card _stapel, Card _spieler, boolean _expectedResult) { AblageStack stack = new AblageStack(0, 0, Symbol.Kreuz); - assertEquals(_expectedResult, stack.cardCheck(_stapel, _spieler), msg); + assertEquals(_expectedResult, stack.cardCheck(_stapel, _spieler), _msg); } private static Stream testAblageStackTestDaten(){ diff --git a/src/test/java/solitaer/CardDeckTest.java b/src/test/java/solitaer/CardDeckTest.java index 48776f9..0576f3c 100644 --- a/src/test/java/solitaer/CardDeckTest.java +++ b/src/test/java/solitaer/CardDeckTest.java @@ -25,7 +25,7 @@ class CardDeckTest { @ParameterizedTest @MethodSource("testSymbole") //Jedes Symbol muss einmal vorhand sein - void testCardDeckSymbole(String msg, Symbol _sym) { + void testCardDeckSymbole(String _msg, Symbol _sym) { boolean result = false; @@ -36,7 +36,7 @@ class CardDeckTest { } } - assertTrue(result, msg); + assertTrue(result, _msg); } diff --git a/src/test/java/solitaer/StartStackTest.java b/src/test/java/solitaer/StartStackTest.java index d033e45..a618a19 100644 --- a/src/test/java/solitaer/StartStackTest.java +++ b/src/test/java/solitaer/StartStackTest.java @@ -13,9 +13,9 @@ class StartStackTest { @ParameterizedTest @MethodSource("testStartStackTestDaten") //Jedes Symbol muss einmal vorhand sein - void testRulesetStartStack(String msg, Card _stapel, Card _spieler, boolean _expectedResult) { + void testRulesetStartStack(String _msg, Card _stapel, Card _spieler, boolean _expectedResult) { StartStack stack = new StartStack(10, 10); - assertEquals(_expectedResult, stack.cardCheck(_stapel, _spieler), msg); + assertEquals(_expectedResult, stack.cardCheck(_stapel, _spieler), _msg); }