From 240c7eebf75a765fcaed07a4aae60aa16ac50b2d Mon Sep 17 00:00:00 2001 From: DelErr Date: Thu, 20 Sep 2018 15:20:29 +0300 Subject: [PATCH 1/2] Testing --- bin/.gitignore | 4 ++++ bin/TennisGame.class | Bin 1823 -> 1823 bytes bin/TennisGameException.class | Bin 285 -> 285 bytes bin/TennisGameTest.class | Bin 1393 -> 1138 bytes tests/TennisGameTest2.java | 12 ++++++++++++ 5 files changed, 16 insertions(+) create mode 100644 bin/.gitignore create mode 100644 tests/TennisGameTest2.java diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..972093e --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,4 @@ +/TennisGame.class +/TennisGameException.class +/TennisGameTest.class +/TennisGameTest2.class diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 2da4e7a578a8ea5a5a076c2766b0eebecc4efc75..6552da77ba0356d7692c116cc12a70ad0a389b7e 100644 GIT binary patch delta 17 ZcmbQwH=mE=)W2Q(7#JALHgbrw0{}d51+V}B delta 17 ZcmbQwH=mE=)W2Q(7#J8#Hgbrw0{}c`1+D-9 diff --git a/bin/TennisGameException.class b/bin/TennisGameException.class index d3bcf94f181696416666f8c5713c89dbe0555f1b..094639d0f18ad137359201b37e732175da207fb5 100644 GIT binary patch delta 17 ZcmbQsG?$6v)W2Q(7#JALHgbqE0suO`1&jay delta 17 ZcmbQsG?$6v)W2Q(7#J8#HgbqE0suO+1&ROw diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class index b202db2907805d8b5bb4b6f773ec5588f796fb7a..46515c4dbe7c3d548c31e7a45dac24f12170c6c7 100644 GIT binary patch literal 1138 zcma)5QEw7K5T2#999Jxet+m$bQ8lSA5R*m|F-;n!rpZN{f*7C3ayP=_u}gOMNc$)J zJ0_awyFbb}2L!NQ)Q8)>*`535`@Wg`@$<_!0C)lqbC6-M(LyPOdBum=LSu7~Wl$RM zF|S2j_G)js0}L#KwdX<#d&FSn;8B}F_Js;D2YCj?MQ%fDr5#vj@ae78XjC-D&_Ygx(W@6eYQcAwkz1kqAF{ve!M3U|?sQgnBgQF{Kr%WFcRWqS_{DFod z8PJ9dG3=b9i6d*4XgPQ>qAA6Y+Pl=4c?NaIZK_xYcp{R{E{RK+R+E8%3ea%Vj{%US zw^dl9HAm4Qoif_pui(5dyPu)(ouUjBX-#r~a!a%prdec`{|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/tests/TennisGameTest2.java b/tests/TennisGameTest2.java new file mode 100644 index 0000000..0a9fd3f --- /dev/null +++ b/tests/TennisGameTest2.java @@ -0,0 +1,12 @@ +import static org.junit.Assert.*; + +import org.junit.Test; + +public class TennisGameTest2 { + + @Test + public void test() { + fail("Not yet implemented"); + } + +} From 0b99a5115448191ebb754c7b9e0f5c20ea7d26f2 Mon Sep 17 00:00:00 2001 From: DelErr Date: Thu, 20 Sep 2018 16:28:24 +0300 Subject: [PATCH 2/2] Assignment Finished --- bin/.gitignore | 1 + bin/TennisGame.class | Bin 1823 -> 1823 bytes bin/TennisGameTest.class | Bin 1138 -> 2045 bytes src/TennisGame.java | 4 +- tests/TennisGameTest.java | 74 ++++++++++++++++++++++++++++++++++--- tests/TennisGameTest2.java | 12 ------ 6 files changed, 72 insertions(+), 19 deletions(-) delete mode 100644 tests/TennisGameTest2.java diff --git a/bin/.gitignore b/bin/.gitignore index 972093e..0574187 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -2,3 +2,4 @@ /TennisGameException.class /TennisGameTest.class /TennisGameTest2.class +/TennisGameActualTest.class diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 6552da77ba0356d7692c116cc12a70ad0a389b7e..2318359d87619b9115ff06ff34407fefcaa43ef1 100644 GIT binary patch delta 19 bcmbQwH=l2V0~;gTWJfkV#)Xp$*wzC8H?jq~ delta 19 bcmbQwH=l2V0~;gzWJfkV#wC*r*wzC8H_QdT diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class index 46515c4dbe7c3d548c31e7a45dac24f12170c6c7..3b92bc23d8a534c6591654eb39861f1881964423 100644 GIT binary patch literal 2045 zcma)*?{eEj6vfXvPOUf&O`Jb%Y167eT03cMY}!EUG}N?i>5NN5Y*H8of?{vo4UTLi zIfQ>R@CJP3Bd^delz|x@fQMo@D=D^u&jN%hQL@RyDbpE+iA)q#xRk>I8F(i zt}0u8(A(dYPTksVOM!H?)3DmxmZS7M{2BM2DVGVV$Fr6M7CmMk{N1T}mgDVII|ouf z0_V1Rwx{;xwsIBYm2JD@S)S_Hez=a)%J20^nAb&=5=aXq2hoz4!GwOzr?7xC0!B-E zwMNHb;JHk;I;gkiIm&L844e}<^N<0R)izzd(^NJGhiVu&FEH6Ambq%`A&Es?O5h?3 z8-SEuS2|t_CN2x4EPqz{s%Nzcd^0ngGV&)7y)^vCm%c@-7%?It=m#nE*aw+5^D}`XiK!F-C zhe>zLXI8f>ZP_&N7I}jZ1@mj4z(=~T9M`)idySx7`W`-P*%X{6ysgoc95&!4D{ck{ zXLNB}vMVi5Hp5`EgM!P=1IzZTmNal%V4*)Xl^b>RU4i+qNOHTTb#zQ%LkAlOv=azf z&`NH0lxpMy01obFa1vqzl1duU!sPPe?7f% zT>G3)(;&Yj%Tw~V$gjx1NB%F#zfb-yvT#s<8)4U#>)T|o!-77~M%eG1z&^>2pXO6; z&{W+xidQ1WadAWez9EBqchNs|$c*1I_jio-Jz0Ms>yKpp$!A*#0`}SFLpFiCOccYt Fe*pv0im(6x literal 1138 zcma)5QEw7K5T2#999Jxet+m$bQ8lSA5R*m|F-;n!rpZN{f*7C3ayP=_u}gOMNc$)J zJ0_awyFbb}2L!NQ)Q8)>*`535`@Wg`@$<_!0C)lqbC6-M(LyPOdBum=LSu7~Wl$RM zF|S2j_G)js0}L#KwdX<#d&FSn;8B}F_Js;D2YCj?MQ%fDr5#vj@ae78XjC-D&_Ygx(W@6eYQcAwkz1kqAF{ve!M3U|?sQgnBgQF{Kr%WFcRWqS_{DFod z8PJ9dG3=b9i6d*4XgPQ>qAA6Y+Pl=4c?NaIZK_xYcp{R{E{RK+R+E8%3ea%Vj{%US zw^dl9HAm4Qoif_pui(5dyPu)(ouUjBX-#r~a!a%prde= 4 && player1Points == player2Points) + if (player1Points >= 3 && player1Points == player2Points) return "deuce"; 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 ; diff --git a/tests/TennisGameTest.java b/tests/TennisGameTest.java index 8674eba..42ff3cf 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -2,7 +2,7 @@ import org.junit.Test; -import jdk.nashorn.internal.ir.annotations.Ignore; +import org.junit.Ignore; public class TennisGameTest { @@ -20,8 +20,9 @@ public class TennisGameTest { // "player2 has advantage" // "player1 wins" // "player2 wins" - @Ignore - public void testTennisGame_Start() { + + @Test + public void testTennisGame_Start_LoveLove() { //Arrange TennisGame game = new TennisGame(); //Act @@ -31,7 +32,47 @@ public void testTennisGame_Start() { } @Test - public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameException { + public void testPlayerWins() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player2Scored(); + game.player2Scored(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + //win + game.player1Scored(); + + //Act + String score = game.getScore() ; + // Assert + assertEquals("Win not happened", "player1 wins", score); + } + + @Ignore + public void testFirstDeuce() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + //Act + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "deuce", score); + } + + @Test + public void testRepeatedDeuce() throws TennisGameException { //Arrange TennisGame game = new TennisGame(); @@ -45,12 +86,34 @@ public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameE game.player1Scored(); game.player2Scored(); + //Act String score = game.getScore() ; // Assert assertEquals("Tie score incorrect", "deuce", score); } + @Test + public void testPlayerAdvantage() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + game.player2Scored(); + + //Act + String score = game.getScore() ; + // Assert + assertEquals("Advantage is incorrect", "player2 has advantage", score); + } + @Test (expected = TennisGameException.class) public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() throws TennisGameException { //Arrange @@ -63,5 +126,6 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr //Act // This statement should cause an exception game.player1Scored(); - } + } + } diff --git a/tests/TennisGameTest2.java b/tests/TennisGameTest2.java deleted file mode 100644 index 0a9fd3f..0000000 --- a/tests/TennisGameTest2.java +++ /dev/null @@ -1,12 +0,0 @@ -import static org.junit.Assert.*; - -import org.junit.Test; - -public class TennisGameTest2 { - - @Test - public void test() { - fail("Not yet implemented"); - } - -}