mirror of
https://github.com/emilybache/GildedRose-Refactoring-Kata.git
synced 2025-12-12 04:12:13 +00:00
converted tabs to spaces
This commit is contained in:
emilybache
parent
afc37306a8
commit
8e3bd6076f
@ -2,79 +2,79 @@ package defactored1;
|
||||
|
||||
public class TennisGame {
|
||||
|
||||
private int m_score1 = 0;
|
||||
private int m_score2 = 0;
|
||||
private String player1Name;
|
||||
private String player2Name;
|
||||
private int m_score1 = 0;
|
||||
private int m_score2 = 0;
|
||||
private String player1Name;
|
||||
private String player2Name;
|
||||
|
||||
public TennisGame(String player1Name, String player2Name) {
|
||||
this.player1Name = player1Name;
|
||||
this.player2Name = player2Name;
|
||||
}
|
||||
public TennisGame(String player1Name, String player2Name) {
|
||||
this.player1Name = player1Name;
|
||||
this.player2Name = player2Name;
|
||||
}
|
||||
|
||||
public void wonPoint(String playerName) {
|
||||
if (playerName == "player1")
|
||||
m_score1 += 1;
|
||||
else
|
||||
m_score2 += 1;
|
||||
}
|
||||
public void wonPoint(String playerName) {
|
||||
if (playerName == "player1")
|
||||
m_score1 += 1;
|
||||
else
|
||||
m_score2 += 1;
|
||||
}
|
||||
|
||||
public String getScore() {
|
||||
String score = "";
|
||||
int tempScore=0;
|
||||
if (m_score1==m_score2)
|
||||
{
|
||||
switch (m_score1)
|
||||
{
|
||||
case 0:
|
||||
score = "Love-All";
|
||||
break;
|
||||
case 1:
|
||||
score = "Fifteen-All";
|
||||
break;
|
||||
case 2:
|
||||
score = "Thirty-All";
|
||||
break;
|
||||
case 3:
|
||||
score = "Forty-All";
|
||||
break;
|
||||
default:
|
||||
score = "Deuce";
|
||||
break;
|
||||
public String getScore() {
|
||||
String score = "";
|
||||
int tempScore=0;
|
||||
if (m_score1==m_score2)
|
||||
{
|
||||
switch (m_score1)
|
||||
{
|
||||
case 0:
|
||||
score = "Love-All";
|
||||
break;
|
||||
case 1:
|
||||
score = "Fifteen-All";
|
||||
break;
|
||||
case 2:
|
||||
score = "Thirty-All";
|
||||
break;
|
||||
case 3:
|
||||
score = "Forty-All";
|
||||
break;
|
||||
default:
|
||||
score = "Deuce";
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
else if (m_score1>=4 || m_score2>=4)
|
||||
{
|
||||
int minusResult = m_score1-m_score2;
|
||||
if (minusResult==1) score ="Advantage player1";
|
||||
else if (minusResult ==-1) score ="Advantage player2";
|
||||
else if (minusResult>=2) score = "Win for player1";
|
||||
else score ="Win for player2";
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i=1; i<3; i++)
|
||||
{
|
||||
if (i==1) tempScore = m_score1;
|
||||
else { score+="-"; tempScore = m_score2;}
|
||||
switch(tempScore)
|
||||
{
|
||||
case 0:
|
||||
score+="Love";
|
||||
break;
|
||||
case 1:
|
||||
score+="Fifteen";
|
||||
break;
|
||||
case 2:
|
||||
score+="Thirty";
|
||||
break;
|
||||
case 3:
|
||||
score+="Forty";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return score;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (m_score1>=4 || m_score2>=4)
|
||||
{
|
||||
int minusResult = m_score1-m_score2;
|
||||
if (minusResult==1) score ="Advantage player1";
|
||||
else if (minusResult ==-1) score ="Advantage player2";
|
||||
else if (minusResult>=2) score = "Win for player1";
|
||||
else score ="Win for player2";
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i=1; i<3; i++)
|
||||
{
|
||||
if (i==1) tempScore = m_score1;
|
||||
else { score+="-"; tempScore = m_score2;}
|
||||
switch(tempScore)
|
||||
{
|
||||
case 0:
|
||||
score+="Love";
|
||||
break;
|
||||
case 1:
|
||||
score+="Fifteen";
|
||||
break;
|
||||
case 2:
|
||||
score+="Thirty";
|
||||
break;
|
||||
case 3:
|
||||
score+="Forty";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return score;
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,84 +14,84 @@ import org.junit.runners.Parameterized.Parameters;
|
||||
@RunWith(Parameterized.class)
|
||||
public class TennisTest {
|
||||
|
||||
private int player1Score;
|
||||
private int player2Score;
|
||||
private String expectedScore;
|
||||
private int player1Score;
|
||||
private int player2Score;
|
||||
private String expectedScore;
|
||||
|
||||
public TennisTest(int player1Score, int player2Score, String expectedScore) {
|
||||
this.player1Score = player1Score;
|
||||
this.player2Score = player2Score;
|
||||
this.expectedScore = expectedScore;
|
||||
}
|
||||
public TennisTest(int player1Score, int player2Score, String expectedScore) {
|
||||
this.player1Score = player1Score;
|
||||
this.player2Score = player2Score;
|
||||
this.expectedScore = expectedScore;
|
||||
}
|
||||
|
||||
@Parameters
|
||||
public static Collection<Object[]> getAllScores() {
|
||||
return Arrays.asList(new Object[][] {
|
||||
{ 0, 0, "Love-All" },
|
||||
{ 1, 1, "Fifteen-All" },
|
||||
{ 2, 2, "Thirty-All"},
|
||||
{ 3, 3, "Forty-All"},
|
||||
{ 4, 4, "Deuce"},
|
||||
@Parameters
|
||||
public static Collection<Object[]> getAllScores() {
|
||||
return Arrays.asList(new Object[][] {
|
||||
{ 0, 0, "Love-All" },
|
||||
{ 1, 1, "Fifteen-All" },
|
||||
{ 2, 2, "Thirty-All"},
|
||||
{ 3, 3, "Forty-All"},
|
||||
{ 4, 4, "Deuce"},
|
||||
|
||||
{ 1, 0, "Fifteen-Love"},
|
||||
{ 0, 1, "Love-Fifteen"},
|
||||
{ 2, 0, "Thirty-Love"},
|
||||
{ 0, 2, "Love-Thirty"},
|
||||
{ 3, 0, "Forty-Love"},
|
||||
{ 0, 3, "Love-Forty"},
|
||||
{ 4, 0, "Win for player1"},
|
||||
{ 0, 4, "Win for player2"},
|
||||
{ 1, 0, "Fifteen-Love"},
|
||||
{ 0, 1, "Love-Fifteen"},
|
||||
{ 2, 0, "Thirty-Love"},
|
||||
{ 0, 2, "Love-Thirty"},
|
||||
{ 3, 0, "Forty-Love"},
|
||||
{ 0, 3, "Love-Forty"},
|
||||
{ 4, 0, "Win for player1"},
|
||||
{ 0, 4, "Win for player2"},
|
||||
|
||||
{ 2, 1, "Thirty-Fifteen"},
|
||||
{ 1, 2, "Fifteen-Thirty"},
|
||||
{ 3, 1, "Forty-Fifteen"},
|
||||
{ 1, 3, "Fifteen-Forty"},
|
||||
{ 4, 1, "Win for player1"},
|
||||
{ 1, 4, "Win for player2"},
|
||||
{ 2, 1, "Thirty-Fifteen"},
|
||||
{ 1, 2, "Fifteen-Thirty"},
|
||||
{ 3, 1, "Forty-Fifteen"},
|
||||
{ 1, 3, "Fifteen-Forty"},
|
||||
{ 4, 1, "Win for player1"},
|
||||
{ 1, 4, "Win for player2"},
|
||||
|
||||
{ 3, 2, "Forty-Thirty"},
|
||||
{ 2, 3, "Thirty-Forty"},
|
||||
{ 4, 2, "Win for player1"},
|
||||
{ 2, 4, "Win for player2"},
|
||||
{ 3, 2, "Forty-Thirty"},
|
||||
{ 2, 3, "Thirty-Forty"},
|
||||
{ 4, 2, "Win for player1"},
|
||||
{ 2, 4, "Win for player2"},
|
||||
|
||||
{ 4, 3, "Advantage player1"},
|
||||
{ 3, 4, "Advantage player2"},
|
||||
{ 5, 4, "Advantage player1"},
|
||||
{ 4, 5, "Advantage player2"},
|
||||
{ 15, 14, "Advantage player1"},
|
||||
{ 14, 15, "Advantage player2"},
|
||||
{ 4, 3, "Advantage player1"},
|
||||
{ 3, 4, "Advantage player2"},
|
||||
{ 5, 4, "Advantage player1"},
|
||||
{ 4, 5, "Advantage player2"},
|
||||
{ 15, 14, "Advantage player1"},
|
||||
{ 14, 15, "Advantage player2"},
|
||||
|
||||
{ 6, 4, "Win for player1"},
|
||||
{ 4, 6, "Win for player2"},
|
||||
{ 16, 14, "Win for player1"},
|
||||
{ 14, 16, "Win for player2"},
|
||||
});
|
||||
}
|
||||
{ 6, 4, "Win for player1"},
|
||||
{ 4, 6, "Win for player2"},
|
||||
{ 16, 14, "Win for player1"},
|
||||
{ 14, 16, "Win for player2"},
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
public void checkAllScores() {
|
||||
TennisGame game = new TennisGame("player1", "player2");
|
||||
int highestScore = Math.max(this.player1Score, this.player2Score);
|
||||
for (int i = 0; i < highestScore; i++) {
|
||||
if (i < this.player1Score)
|
||||
game.wonPoint("player1");
|
||||
if (i < this.player2Score)
|
||||
game.wonPoint("player2");
|
||||
}
|
||||
assertEquals(this.expectedScore, game.getScore());
|
||||
}
|
||||
@Test
|
||||
public void checkAllScores() {
|
||||
TennisGame game = new TennisGame("player1", "player2");
|
||||
int highestScore = Math.max(this.player1Score, this.player2Score);
|
||||
for (int i = 0; i < highestScore; i++) {
|
||||
if (i < this.player1Score)
|
||||
game.wonPoint("player1");
|
||||
if (i < this.player2Score)
|
||||
game.wonPoint("player2");
|
||||
}
|
||||
assertEquals(this.expectedScore, game.getScore());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void realisticGame() {
|
||||
TennisGame game = new TennisGame("player1", "player2");
|
||||
String[] points = {"player1", "player1", "player2", "player2", "player1", "player1"};
|
||||
String[] expected_scores = {"Fifteen-Love", "Thirty-Love", "Thirty-Fifteen", "Thirty-All", "Forty-Thirty", "Win for player1"};
|
||||
for (int i = 0; i < 6; i++) {
|
||||
game.wonPoint(points[i]);
|
||||
assertEquals(expected_scores[i], game.getScore());
|
||||
}
|
||||
@Test
|
||||
public void realisticGame() {
|
||||
TennisGame game = new TennisGame("player1", "player2");
|
||||
String[] points = {"player1", "player1", "player2", "player2", "player1", "player1"};
|
||||
String[] expected_scores = {"Fifteen-Love", "Thirty-Love", "Thirty-Fifteen", "Thirty-All", "Forty-Thirty", "Win for player1"};
|
||||
for (int i = 0; i < 6; i++) {
|
||||
game.wonPoint(points[i]);
|
||||
assertEquals(expected_scores[i], game.getScore());
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -2,137 +2,137 @@ package defactored2;
|
||||
|
||||
public class TennisGame
|
||||
{
|
||||
public int P1point = 0;
|
||||
public int P2point = 0;
|
||||
public int P1point = 0;
|
||||
public int P2point = 0;
|
||||
|
||||
public String P1res = "";
|
||||
public String P2res = "";
|
||||
private String player1Name;
|
||||
private String player2Name;
|
||||
public String P1res = "";
|
||||
public String P2res = "";
|
||||
private String player1Name;
|
||||
private String player2Name;
|
||||
|
||||
public TennisGame(String player1Name, String player2Name) {
|
||||
this.player1Name = player1Name;
|
||||
this.player2Name = player2Name;
|
||||
}
|
||||
public TennisGame(String player1Name, String player2Name) {
|
||||
this.player1Name = player1Name;
|
||||
this.player2Name = player2Name;
|
||||
}
|
||||
|
||||
public String getScore(){
|
||||
String score = "";
|
||||
if (P1point == P2point && P1point < 4)
|
||||
{
|
||||
if (P1point==0)
|
||||
score = "Love";
|
||||
if (P1point==1)
|
||||
score = "Fifteen";
|
||||
if (P1point==2)
|
||||
score = "Thirty";
|
||||
if (P1point==3)
|
||||
score = "Forty";
|
||||
score += "-All";
|
||||
}
|
||||
if (P1point==P2point && P1point>3)
|
||||
score = "Deuce";
|
||||
String score = "";
|
||||
if (P1point == P2point && P1point < 4)
|
||||
{
|
||||
if (P1point==0)
|
||||
score = "Love";
|
||||
if (P1point==1)
|
||||
score = "Fifteen";
|
||||
if (P1point==2)
|
||||
score = "Thirty";
|
||||
if (P1point==3)
|
||||
score = "Forty";
|
||||
score += "-All";
|
||||
}
|
||||
if (P1point==P2point && P1point>3)
|
||||
score = "Deuce";
|
||||
|
||||
if (P1point > 0 && P2point==0)
|
||||
{
|
||||
if (P1point==1)
|
||||
P1res = "Fifteen";
|
||||
if (P1point==2)
|
||||
P1res = "Thirty";
|
||||
if (P1point==3)
|
||||
P1res = "Forty";
|
||||
if (P1point > 0 && P2point==0)
|
||||
{
|
||||
if (P1point==1)
|
||||
P1res = "Fifteen";
|
||||
if (P1point==2)
|
||||
P1res = "Thirty";
|
||||
if (P1point==3)
|
||||
P1res = "Forty";
|
||||
|
||||
P2res = "Love";
|
||||
score = P1res + "-" + P2res;
|
||||
}
|
||||
if (P2point > 0 && P1point==0)
|
||||
{
|
||||
if (P2point==1)
|
||||
P2res = "Fifteen";
|
||||
if (P2point==2)
|
||||
P2res = "Thirty";
|
||||
if (P2point==3)
|
||||
P2res = "Forty";
|
||||
P2res = "Love";
|
||||
score = P1res + "-" + P2res;
|
||||
}
|
||||
if (P2point > 0 && P1point==0)
|
||||
{
|
||||
if (P2point==1)
|
||||
P2res = "Fifteen";
|
||||
if (P2point==2)
|
||||
P2res = "Thirty";
|
||||
if (P2point==3)
|
||||
P2res = "Forty";
|
||||
|
||||
P1res = "Love";
|
||||
score = P1res + "-" + P2res;
|
||||
}
|
||||
P1res = "Love";
|
||||
score = P1res + "-" + P2res;
|
||||
}
|
||||
|
||||
if (P1point>P2point && P1point < 4)
|
||||
{
|
||||
if (P1point==2)
|
||||
P1res="Thirty";
|
||||
if (P1point==3)
|
||||
P1res="Forty";
|
||||
if (P2point==1)
|
||||
P2res="Fifteen";
|
||||
if (P2point==2)
|
||||
P2res="Thirty";
|
||||
score = P1res + "-" + P2res;
|
||||
}
|
||||
if (P2point>P1point && P2point < 4)
|
||||
{
|
||||
if (P2point==2)
|
||||
P2res="Thirty";
|
||||
if (P2point==3)
|
||||
P2res="Forty";
|
||||
if (P1point==1)
|
||||
P1res="Fifteen";
|
||||
if (P1point==2)
|
||||
P1res="Thirty";
|
||||
score = P1res + "-" + P2res;
|
||||
}
|
||||
if (P1point>P2point && P1point < 4)
|
||||
{
|
||||
if (P1point==2)
|
||||
P1res="Thirty";
|
||||
if (P1point==3)
|
||||
P1res="Forty";
|
||||
if (P2point==1)
|
||||
P2res="Fifteen";
|
||||
if (P2point==2)
|
||||
P2res="Thirty";
|
||||
score = P1res + "-" + P2res;
|
||||
}
|
||||
if (P2point>P1point && P2point < 4)
|
||||
{
|
||||
if (P2point==2)
|
||||
P2res="Thirty";
|
||||
if (P2point==3)
|
||||
P2res="Forty";
|
||||
if (P1point==1)
|
||||
P1res="Fifteen";
|
||||
if (P1point==2)
|
||||
P1res="Thirty";
|
||||
score = P1res + "-" + P2res;
|
||||
}
|
||||
|
||||
if (P1point > P2point && P2point >= 3)
|
||||
{
|
||||
score = "Advantage player1";
|
||||
}
|
||||
if (P1point > P2point && P2point >= 3)
|
||||
{
|
||||
score = "Advantage player1";
|
||||
}
|
||||
|
||||
if (P2point > P1point && P1point >= 3)
|
||||
{
|
||||
score = "Advantage player2";
|
||||
}
|
||||
if (P2point > P1point && P1point >= 3)
|
||||
{
|
||||
score = "Advantage player2";
|
||||
}
|
||||
|
||||
if (P1point>=4 && P2point>=0 && (P1point-P2point)>=2)
|
||||
{
|
||||
score = "Win for player1";
|
||||
}
|
||||
if (P2point>=4 && P1point>=0 && (P2point-P1point)>=2)
|
||||
{
|
||||
score = "Win for player2";
|
||||
}
|
||||
return score;
|
||||
if (P1point>=4 && P2point>=0 && (P1point-P2point)>=2)
|
||||
{
|
||||
score = "Win for player1";
|
||||
}
|
||||
if (P2point>=4 && P1point>=0 && (P2point-P1point)>=2)
|
||||
{
|
||||
score = "Win for player2";
|
||||
}
|
||||
return score;
|
||||
}
|
||||
|
||||
public void SetP1Score(int number){
|
||||
public void SetP1Score(int number){
|
||||
|
||||
for (int i = 0; i < number; i++)
|
||||
{
|
||||
P1Score();
|
||||
}
|
||||
for (int i = 0; i < number; i++)
|
||||
{
|
||||
P1Score();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void SetP2Score(int number){
|
||||
public void SetP2Score(int number){
|
||||
|
||||
for (int i = 0; i < number; i++)
|
||||
{
|
||||
P2Score();
|
||||
}
|
||||
for (int i = 0; i < number; i++)
|
||||
{
|
||||
P2Score();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void P1Score(){
|
||||
public void P1Score(){
|
||||
P1point++;
|
||||
}
|
||||
|
||||
public void P2Score(){
|
||||
public void P2Score(){
|
||||
P2point++;
|
||||
}
|
||||
|
||||
public void wonPoint(String player) {
|
||||
if (player == "player1")
|
||||
P1Score();
|
||||
else
|
||||
P2Score();
|
||||
}
|
||||
public void wonPoint(String player) {
|
||||
if (player == "player1")
|
||||
P1Score();
|
||||
else
|
||||
P2Score();
|
||||
}
|
||||
}
|
||||
@ -2,36 +2,36 @@ package defactored3;
|
||||
|
||||
public class TennisGame {
|
||||
|
||||
private int p2;
|
||||
private int p1;
|
||||
private String p1N;
|
||||
private String p2N;
|
||||
private int p2;
|
||||
private int p1;
|
||||
private String p1N;
|
||||
private String p2N;
|
||||
|
||||
public TennisGame(String p1N, String p2N) {
|
||||
this.p1N = p1N;
|
||||
this.p2N = p2N;
|
||||
}
|
||||
public TennisGame(String p1N, String p2N) {
|
||||
this.p1N = p1N;
|
||||
this.p2N = p2N;
|
||||
}
|
||||
|
||||
public String getScore() {
|
||||
String s;
|
||||
if (p1 < 4 && p2 < 4) {
|
||||
String[] p = new String[]{"Love", "Fifteen", "Thirty", "Forty"};
|
||||
s = p[p1];
|
||||
return (p1 == p2) ? s + "-All" : s + "-" + p[p2];
|
||||
} else {
|
||||
if (p1 == p2)
|
||||
return "Deuce";
|
||||
s = p1 > p2 ? p1N : p2N;
|
||||
return ((p1-p2)*(p1-p2) == 1) ? "Advantage " + s : "Win for " + s;
|
||||
}
|
||||
}
|
||||
public String getScore() {
|
||||
String s;
|
||||
if (p1 < 4 && p2 < 4) {
|
||||
String[] p = new String[]{"Love", "Fifteen", "Thirty", "Forty"};
|
||||
s = p[p1];
|
||||
return (p1 == p2) ? s + "-All" : s + "-" + p[p2];
|
||||
} else {
|
||||
if (p1 == p2)
|
||||
return "Deuce";
|
||||
s = p1 > p2 ? p1N : p2N;
|
||||
return ((p1-p2)*(p1-p2) == 1) ? "Advantage " + s : "Win for " + s;
|
||||
}
|
||||
}
|
||||
|
||||
public void wonPoint(String playerName) {
|
||||
if (playerName == "player1")
|
||||
this.p1 += 1;
|
||||
else
|
||||
this.p2 += 1;
|
||||
public void wonPoint(String playerName) {
|
||||
if (playerName == "player1")
|
||||
this.p1 += 1;
|
||||
else
|
||||
this.p2 += 1;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user