first commit

Tennis/java/defactored2/TennisGame.java

@@ -0,0 +1,138 @@
+package defactored2;
+
+public class TennisGame
+{
+	public int P1point = 0;
+	public int P2point = 0;
+	
+	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 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";
+		
+		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";
+			
+			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 && P2point >= 3)
+		{
+			score = "Advantage player1";
+		}
+		
+		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;
+    }
+	
+	public void SetP1Score(int number){
+        
+		for (int i = 0; i < number; i++)
+		{
+			P1Score();
+		}
+			
+    }
+	
+	public void SetP2Score(int number){
+        
+		for (int i = 0; i < number; i++)
+		{
+			P2Score();
+		}
+			
+    }
+	
+	public void P1Score(){
+        P1point++;
+    }
+	
+	public void P2Score(){
+        P2point++;
+    }
+
+	public void wonPoint(String player) {
+		if (player == "player1")
+			P1Score();
+		else
+			P2Score();
+	}
+}

Tennis/java/defactored2/TennisTest.java

@@ -0,0 +1,94 @@
+package defactored2;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class TennisTest {
+
+	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;
+	}
+	
+	@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"},
+				
+				{ 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"},
+				
+				{ 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"},
+		});
+	}
+
+	@Test
+	public void checkAllScores() {
+		TennisGame game = new TennisGame("player1", "player2");
+		for (int i = 0; i < this.player1Score; i++) 
+			game.wonPoint("player1");
+		for (int i = 0; i < this.player2Score; i++) 
+			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());
+		}
+		
+		
+	}
+
+}