From e5c0795ad79e73cc6c99013bef772b5684c37479 Mon Sep 17 00:00:00 2001
From: Pepetti <pirkkapekka@gmail.com>
Date: Thu, 20 Sep 2018 16:34:12 +0300
Subject: [PATCH] Assignment Finished

---
 bin/TennisGame.class      | Bin 1823 -> 1823 bytes
 bin/TennisGameTest.class  | Bin 1393 -> 2152 bytes
 src/TennisGame.java       |   4 +--
 tests/TennisGameTest.java |  50 +++++++++++++++++++++++++++++++++++++-
 4 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/bin/TennisGame.class b/bin/TennisGame.class
index 2da4e7a578a8ea5a5a076c2766b0eebecc4efc75..72450977ece520910a5bc96d3befd388de29f454 100644
GIT binary patch
delta 31
ncmbQwH=l1qJ{#l0$pvg;yxKb$Y_~Hw3%PA$@X(n&nXLx^oInYp

delta 31
ncmbQwH=l1qJ{#kb$pvg;ygEA=Y_~Hw3%PA$@X($-nXLx^oRJBo

diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class
index b202db2907805d8b5bb4b6f773ec5588f796fb7a..cf29c7e5e4827e2440363918cef61494acf5e111 100644
GIT binary patch
delta 750
zcmb8r>q-Ja6bJDCs@1v`>84T<wOz!_5|o7Q7b}ghkg_Y0EIR3yt>tb(pL__v^coRV
z6!ZW+Nnd+`=%i*U6~r<#%sFSy`LS=pt3`Nue|!cohVYFrV9Yyprs*-Js)`ntPgy*g
zk*`?J7h!Tz3tssG(X68C8jnd1j#5t264@M+6qSw~OXxhNIhcI`X;jK&FBymapIffT
z+CuVDR&_bWc+7F=qJDWACdpsn>ZS`E>}Ms6l$N#cqTdGiYX>Y<-uvs{3!B-CT!Mv^
z3@eNq`?#jteWPe7I7~hHG>r5CT~Dy?-J?C?xr2w6ZB3jIr$!#oeM4CT1lk>Fpgja0
zD`>$gtcai!>u9E^RO&+UR=V*J(T@ReRAa^<oYaBC3>vA*MR^n5hR_BST&C9ib=lyr
zGkD9E`jc$4;(V>mTU2b&<QN&YV8J$Q*g*$&(TzRw?UUmGZXCjgc$L}TQ$Y`x(e5gA
zuwXa!{)_m@EfN=hA|{D=L=#g)OcPNd;xQ3Vh?pUwO2jiFo>vnG|0FKcA2lHK0i;rw
Ag8%>k

delta 36
scmaDM@R5t_)W2Q(7#J8#7_2sODKk%2V9{Y@+3d?A#Kg+Lz{Fq)0Nery%>V!Z

diff --git a/src/TennisGame.java b/src/TennisGame.java
index 327f284..bb112d9 100644
--- a/src/TennisGame.java
+++ b/src/TennisGame.java
@@ -83,9 +83,9 @@ public String getScore() {
 			if (player1Points >= 4 && player1Points - player2Points == 1)
 				return "player1 has advantage";
 			
-			if (player2Points > 4 && player2Points - player1Points == 1)
+			if (player2Points >= 4 && player2Points - player1Points == 1)
 				return "player2 has advantage";							
 			
-			return  player2Score + " - " + player1Score ;
+			return  player1Score + " - " + player2Score ;
 	}
 }
\ No newline at end of file
diff --git a/tests/TennisGameTest.java b/tests/TennisGameTest.java
index 8674eba..855e57f 100644
--- a/tests/TennisGameTest.java
+++ b/tests/TennisGameTest.java
@@ -63,5 +63,53 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr
 		//Act
 		// This statement should cause an exception
 		game.player1Scored();			
-	}		
+	}
+	@Test 
+	public void testTennisGame_Player1LeadsBy15Points() throws TennisGameException {
+		//Arrange
+		TennisGame game = new TennisGame();
+		//Act
+		game.player1Scored();
+		//Act
+		String score = game.getScore();
+		// Assert
+		assertEquals("Player score incorrect", "15 - love", score);
+		
+	}
+	@Test 
+	public void testTennisGame_Player1HasAdvantage() throws TennisGameException {
+		//Arrange
+		TennisGame game = new TennisGame();
+		//Act
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		//Act
+		String score = game.getScore();
+		// Assert
+		assertEquals("Player advantage incorrect", "player1 has advantage", score);
+	}
+	
+	@Test 
+	public void testTennisGame_Player2HasAdvantage() throws TennisGameException {
+		//Arrange
+		TennisGame game = new TennisGame();
+		//Act
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player1Scored();
+		game.player2Scored();
+		game.player2Scored();
+		//Act
+		String score = game.getScore();
+		// Assert
+		assertEquals("Player advantage incorrect", "player2 has advantage", score);
+	}
+	
 }