From ca0f6539db5e513b30f0071cbd202fc881d2c697 Mon Sep 17 00:00:00 2001 From: pohmelo Date: Thu, 20 Sep 2018 16:34:11 +0300 Subject: [PATCH] Assignment Finished --- bin/TennisGame.class | Bin 1823 -> 1823 bytes bin/TennisGameTest.class | Bin 1393 -> 2783 bytes src/TennisGame.java | 4 +- tests/TennisGameTest.java | 116 +++++++++++++++++++++++++++++++++++++- 4 files changed, 116 insertions(+), 4 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..8a950b8ddfd8d1de29f25e1cebe8e8a386db3ea8 100644 GIT binary patch literal 2783 zcmbW2>r)$57{;IFQkD=bO@S6#N{U*!2hxC0AR5|$wA3;MsdXIVl5E3b*wE|-snbI!i+?|I($oc#UI?|%Y_;8GLn z6x_F_o2FqcYTNpnZrM#}P|&ue?P{TnW~M_|Hn#Mnt>DnCVH$Q+L4E(gx`KxD*_7@> zJ(~S!#32QTmkm>YJioo6=hn21jIJQCoK0$(buDLzcXzPC-ZU&GST4^xqoCbp_R?r# z)z)&%+jTW>+QzoNZdeAx#7r}5YqpU!Wt40#9oothEF{=xnh;RnD+Tf42%5#E!;elJ zQ=q1Gdo`KO5wE>}V7Vl7)y^4adPYT;f@4bzXlR+BB~}IvleZjAP;o**OD4Ok2Sc)GtjrDw$PdZv0rI-X{Q7}4V#U2Bw# z!t5$73PKf@#2uwv~`}BrfRrB%}M{dr5sq+S`Ny1xHI>7H5Q? zLw*d4s<-aQaN{yaO3aM<5%SE0of#G5BAB69dwP~4Qcm`01+T+8PFPFA#%|bpPBd!V zOzEk_Ro%*GY^w;y^6Gm#ER>#7(Bbi^xPpdtRpuB^M8*;;;l!AVX$4A91y?mk#@re! zI8pt@^CWV=;g0aTCIrQB&GlMpS1gY(M~rBN^_!X%@T*w3C`SmS0J6%B{e;EBM~ z1n}{RCjqZbd<*fe@ZLCh59%*`sN(|2X>dUcpZ(4P-dp*`gNUkT4KhFjCF}bm(hhQY{eCiTYW{MZkMRbi zfG2pp#{5r`?>hOOqGM0t$N`LZT*hz>#>#Fi@;+M5 zJ1S{XB)CDAGV~=&}!Z*yj&m|Jh}a)?hE} zpjsN-oi$atv(9l}1H06*N3L7c@d9@|$xb?&Y=*w1fz zG)0S=CS6Sv9!=*D&{V4)UJV6Zg}dyZ3$^O;7InN$mUpP*UFvv`I^L&_52)iq>iCHD z_?Y#$<6-~rdMq5k{+C;ih5u2Hf<~!lv0TqQ6#$=5&!^OLmv5g@&*#+h1@(MMJzr7J r*R0Dotjo8o%Xd8UzQ+`PU~PUx96xz9E)?q%b?YPt429 zFG(!P%+D*<_e{^rFG}5bD~&OkkwL&GzbIWlt28gOL_Z|8xWt-^L6AX*he4Ntjgf)3 zASbahwa73y8K@xzB%{y6V1OiJ1d-ujFk)m74#`YaC=p7PgMW_ 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..d481b05 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -20,7 +20,7 @@ public class TennisGameTest { // "player2 has advantage" // "player1 wins" // "player2 wins" - @Ignore + @Test public void testTennisGame_Start() { //Arrange TennisGame game = new TennisGame(); @@ -63,5 +63,117 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr //Act // This statement should cause an exception game.player1Scored(); - } + } + + @Test + public void testTennisGame_P1_40_P2_0() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals(" ", "40 - love", score); + } + + @Test + public void testTennisGame_P1_wins_P2_0() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals(" ", "player1 wins", score); + } + + @Test + public void testTennisGame_P1_adv_P2_40() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals(" ", "player1 has advantage", score); + } + + @Test + public void testTennisGame_deuceAfterAdvantage() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + //Act + String score = game.getScore(); + // Assert + assertEquals(" ", "deuce", score); + } + + @Test + public void testTennisGame_P1_40_P2_adv() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + //Act + String score = game.getScore(); + // Assert + assertEquals(" ", "player2 has advantage", score); + } + + @Test + public void testTennisGame_P2WinsAfterDeuce() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore(); + // Assert + assertEquals(" ", "player2 wins", score); + } + + + }