From 5fade671682ab612ce20f3a11758441d3f2ee67e Mon Sep 17 00:00:00 2001 From: elizabethmauricio-hannula Date: Thu, 20 Sep 2018 16:25:44 +0300 Subject: [PATCH] Assignment half finished --- bin/TennisGame.class | Bin 1823 -> 1950 bytes bin/TennisGameException.class | Bin 285 -> 285 bytes bin/TennisGameTest.class | Bin 1393 -> 1364 bytes src/TennisGame.java | 11 ++++++----- tests/TennisGameTest.java | 21 ++++++++++++++------- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 2da4e7a578a8ea5a5a076c2766b0eebecc4efc75..657207eed6eeb60cf0f13b7e70de9522d158973a 100644 GIT binary patch delta 966 zcmb7C$x;(h6g{sqCk<`F5QK+4}>o{Qy5f%li_0-qid+UKnZFi58?d1rIGpvGi7 zya2b_(2IT%*AQi}7Psr4 zFf{x8e;2Z&3n2zmO;=B_i)>ieSX(KEMmrd8iZ~AkLqk5NJW~siCEi||BV!^u;IZNk zgIEXqmH$jOqj#G z1qp_8e;OcS0ZIL#(BEXm5`#hRu35Ii4O!K{2)%DThAgw~!vul$W?X+^47F9!m8!y< za``I=b{wPU7?BDFPV|q)%Ox4DL~O0o;YJ&+=tB&`Ow+bgY=KD@=%D2g97McMNh7Ud z5Ghh%pcv>39HD6+jw)iQ3T~VPQb&-C58govR4{T#3z7` z)W4cKH*Wo>fRhV2|0U2v0$~z}Q2lI(TPaVMQx?OgSmwCechQv;R*96?vlV*2miepa80h;)m<7p#DXUg35(0jzmch}-E zmV{Nzk{H1vMzM?)I@fRyTlCChy|!m^eF6;C mH_e6;5!Prx7xs{%NT_X}1k-nTEtsQAXmPuVuuhr+Hhuy@QoEc0 delta 847 zcmb7BOK%cU6#niE46kV^v_P%3PJ+rX0=o zXXVC6(jP!$EygCgH!l1+ZZw{e%0k^ZxpVJ1-#OE@UvMbGPo?li7P}W|6O&sXvZ=G zFGYzjgB200Sfi1sx~|pAMvi}}8 z2j!De+JoD&`3`QShv{AN;Nhd&4=de4qCEjO93k48jAKxYO=0S8^gk1L%mki)C5Tdj z7$ry$f0Fo9#4oX!@k9uu<2i+j_4E+W_lq8*$8AD85WI=5ceZN+wl_q5Xn0MA)5cdJ z&^cq;JhmN-ny+auTTJWO?g28T$a^gGaLK#0kE_%4?<3b8v_6L+l9%AXGQ3!!%2sIz zYc$Y26s%(bH?W8TZeas=P{ae=hK|y&4M{XU;5pL$6*}?g RvLQ={^92IraFbvTg`Zw%oJ#-z diff --git a/bin/TennisGameException.class b/bin/TennisGameException.class index d3bcf94f181696416666f8c5713c89dbe0555f1b..ed803cfaf34ba77e2095fdcac7a78543587fe292 100644 GIT binary patch delta 17 ZcmbQsG?$6v)W2Q(7#J8#H*$zF0suO>1&aUx delta 17 ZcmbQsG?$6v)W2Q(7#J8#HgbqE0suO+1&ROw diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class index b202db2907805d8b5bb4b6f773ec5588f796fb7a..08e51b7a685fcb47b9ba9afde7163709a24697ef 100644 GIT binary patch literal 1364 zcmZ{jYflqF6o%hv3oWGuth9h~DT-QdEfl#~#2_Fcsh3bfqF;1rCw0iOi@RHb|Hi-I z7crXn1N>3OceYope%QI3Idjf)-Z}g8*S8-4R3Ffna9# zL?E)27v^3=IJQLbW`9m}#k!&A29N3or1?yN?zoUXSJ#)v?)9VChr2J~<% zhT9kyh*YIlD%%e6hBLFpwlpQrQC77O!KA>*Ap6Ua)*2)YK-M=c!3tz)9vH~~Tg0)VxXiG6H>!)qDi!WS7pRC02u;V0OKZ#&X z2UD_JxDAq4>e;9MdgmkQ)=bZBW#%Kvs|(7lJ1^N$ZOemYM@x3iDa&U{H(Ce3?t-jV z0@Glt^4AC=fFAU66+pN#N6^Q8h#qWRjxp|XoCW8exogBf`|g7rdwpXFLtMw|4!D5? zcg)Mn0Sq_1lD-G^u6BCK4g|C=yM@|p`m_P(mh!Z!-X3|;G z_1lds5e(n~GRzhy^epC>QDB~#gIJ)qE@H8Z;ZuWQt%D&)j^>x=y7_6FUXyV(vHmAx z-j^mr#yPI$$+y5c`{|R6LkCI3TT-i~^=IWtFu*`GrS{SMz zN+XL=fwYWg>mSR~qnPEf%a9E#l{(}uuf)|Tv3ktd;3^$$i81MbW+p+gdl?%+CT0bqQPGa?70t1*N>nT2r8Sc7V zo#l<0$0C1I)~SkyrJ9DBs)p$X4U7NK&`vcI{FVxM5LZQ0Zh{Gi|05(8RQGfwKD11} iIbyGn?_=^^CEqpjeG+r)t0b&(>#cGVcu1fGmj3{BjV}}c diff --git a/src/TennisGame.java b/src/TennisGame.java index 327f284..d197eee 100644 --- a/src/TennisGame.java +++ b/src/TennisGame.java @@ -21,14 +21,15 @@ else if (player2Points>=4 && player2Points-player1Points>=2) gameEnded = true; } - private String getScore(int points) { - switch (points) { + private String getScore(int score) { + switch (score) { case 0: return "love"; case 1: return "15" ; case 2: return "30" ; case 3: return "40"; - default: return "40" ; - } +// default: return "40" ; + } + throw new IllegalArgumentException("Illegal score: " + score); } public void player1Scored() throws TennisGameException { @@ -77,7 +78,7 @@ public String getScore() { return "player2 wins"; } - if (player1Points >= 4 && player1Points == player2Points) + if (player1Points >= 3 && player1Points == player2Points) return "deuce"; if (player1Points >= 4 && player1Points - player2Points == 1) diff --git a/tests/TennisGameTest.java b/tests/TennisGameTest.java index 8674eba..9c5c83e 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -1,11 +1,13 @@ import static org.junit.Assert.*; - import org.junit.Test; -import jdk.nashorn.internal.ir.annotations.Ignore; - public class TennisGameTest { + private int player1Points; + private int player2Points; + + private boolean gameEnded; + // Here is the format of the scores: "player1Score - player2Score" // "love - love" // "15 - 15" @@ -20,7 +22,8 @@ public class TennisGameTest { // "player2 has advantage" // "player1 wins" // "player2 wins" - @Ignore +// @Ignore + @Test public void testTennisGame_Start() { //Arrange TennisGame game = new TennisGame(); @@ -31,7 +34,8 @@ public void testTennisGame_Start() { } @Test - public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameException { +// public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameException { + public void testTennisGame_Deuce() throws TennisGameException { //Arrange TennisGame game = new TennisGame(); @@ -52,7 +56,9 @@ public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameE } @Test (expected = TennisGameException.class) - public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() throws TennisGameException { +// @Test +// public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() throws TennisGameException { + public void testTennisGame_ResultsException() throws TennisGameException { //Arrange TennisGame game = new TennisGame(); //Act @@ -62,6 +68,7 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr game.player1Scored(); //Act // This statement should cause an exception - game.player1Scored(); + game.player1Scored(); + } }