From af77df413e4661bd534adbcdc0e383cb3c2fd702 Mon Sep 17 00:00:00 2001 From: janneannunen Date: Thu, 20 Sep 2018 15:35:24 +0300 Subject: [PATCH 1/2] checking --- bin/TennisGame.class | Bin 1823 -> 1823 bytes bin/TennisGameException.class | Bin 285 -> 285 bytes bin/TennisGameTest.class | Bin 1393 -> 1367 bytes tests/TennisGameTest.java | 135 +++++++++++++++++----------------- 4 files changed, 68 insertions(+), 67 deletions(-) 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..7965217ed9bea081551663dfba171fad03582f96 100644 GIT binary patch delta 136 zcmey!b)Adj)W2Q(7#JALCUP9&7V^n2O4rXS&C4v=_#71p)ERgfG#CUJG#Nw~v>7BAbQok9bQu&F^chqb41h95K%NPMDTC?c f^(@VjRzMv#KpnO~9d%2KmVsnWyWj07cXoco@_f1Q;|JL>ROf zBp9@TYIGPB81xua81#Xnh77t4#tfzmCX=VKG)r0nbyx#+*Z_6d0(IB{bvOcbI88QW GRRaK_{UehA diff --git a/tests/TennisGameTest.java b/tests/TennisGameTest.java index 8674eba..d0c5e57 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -1,67 +1,68 @@ -import static org.junit.Assert.*; - -import org.junit.Test; - -import jdk.nashorn.internal.ir.annotations.Ignore; - -public class TennisGameTest { - -// Here is the format of the scores: "player1Score - player2Score" -// "love - love" -// "15 - 15" -// "30 - 30" -// "deuce" -// "15 - love", "love - 15" -// "30 - love", "love - 30" -// "40 - love", "love - 40" -// "30 - 15", "15 - 30" -// "40 - 15", "15 - 40" -// "player1 has advantage" -// "player2 has advantage" -// "player1 wins" -// "player2 wins" - @Ignore - public void testTennisGame_Start() { - //Arrange - TennisGame game = new TennisGame(); - //Act - String score = game.getScore() ; - // Assert - assertEquals("Initial score incorrect", "love - love", score); - } - - @Test - public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameException { - //Arrange - TennisGame game = new TennisGame(); - - game.player1Scored(); - game.player1Scored(); - game.player1Scored(); - - game.player2Scored(); - game.player2Scored(); - game.player2Scored(); - - game.player1Scored(); - game.player2Scored(); - //Act - String score = game.getScore() ; - // Assert - assertEquals("Tie score incorrect", "deuce", score); - } - - @Test (expected = TennisGameException.class) - public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() throws TennisGameException { - //Arrange - TennisGame game = new TennisGame(); - //Act - game.player1Scored(); - game.player1Scored(); - game.player1Scored(); - game.player1Scored(); - //Act - // This statement should cause an exception - game.player1Scored(); - } -} +import static org.junit.Assert.*; + + +import org.junit.Test; + +//import jdk.nashorn.internal.ir.annotations.Ignore; + +public class TennisGameTest { + +// Here is the format of the scores: "player1Score - player2Score" +// "love - love" +// "15 - 15" +// "30 - 30" +// "deuce" +// "15 - love", "love - 15" +// "30 - love", "love - 30" +// "40 - love", "love - 40" +// "30 - 15", "15 - 30" +// "40 - 15", "15 - 40" +// "player1 has advantage" +// "player2 has advantage" +// "player1 wins" +// "player2 wins" + @org.junit.Ignore + public void testTennisGame_Start() { + //Arrange + TennisGame game = new TennisGame(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Initial score incorrect", "love - love", score); + } + + @Test + public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + game.player1Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "deuce", score); + } + + @Test (expected = TennisGameException.class) + public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + //Act + // This statement should cause an exception + game.player1Scored(); + } +} From bdc842cde3ae07583419c131b591b23d8376a588 Mon Sep 17 00:00:00 2001 From: janneannunen Date: Thu, 20 Sep 2018 16:32:47 +0300 Subject: [PATCH 2/2] Assignemnt 2 task 1 complete --- bin/.gitignore | 3 + bin/TennisGameTest.class | Bin 1367 -> 3106 bytes tests/TennisGameTest.java | 125 +++++++++++++++++++++++++++++++++++++- 3 files changed, 125 insertions(+), 3 deletions(-) create mode 100644 bin/.gitignore diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..b02130c --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,3 @@ +/TennisGame.class +/TennisGameException.class +/TennisGameTest.class diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class index 7965217ed9bea081551663dfba171fad03582f96..0d83f0ae870cd029b595f157e15686551ff0747a 100644 GIT binary patch literal 3106 zcmb`I>r)$57{;IF(gYeTq|lqRrWGwvAS9*O3Z=your#!t25~xG=#m`6V%X5#4Q;*D z+Xu({ZAQmit@^?7ZoL%L8UFx3_$N6&XD`Wypv^c8lRdlV^1i?4Iqy0A`S)*s02stn z05uA3n-;pRnG@=wm=>lLK%Ii-1$9}C=2Sf!Ju|l;(w2fv!VOu&87o3LvbYu@s~cEohLBwh*>q zyMka=SgCa0AYN-{SF$8CWf_{D9SUNng6$_6P*ZaeQ_hTNIvax~1aZ59&AI%ti1bEe z(}>-;BY-{BQvw+^O<`CeM6g#uNVUHb7Yk~Rz(+bOQ~G)wuZJpoY{#?QAx88$N7w3Y zMrn4176s8YmL}Bs^x2$xMHmli`oP(|rd#H$ZO81GD5M#^F>yI9mTY?i=u)t?Hq|cE;YrcoDP_ zO=gKWtKBR?X4!{3nXL&8=)hgfsNim9uEl=NuH#o{1;cfhVbI6WO%CtZ%XjZ5`{X+r z`@`{a#yBa!Y(eG-p$pCEMk~+c4)l_|kF5PIvVoiX$a!_YoL8Y(X3)!U#hiBldA(kMSHPXy>>O zv!jUF?qcp{?xU{NBmWoE^Ve%7=CO4!CyALP!W1!26Y~r)Q^cGm<^xq@j;@0#YuBsF zcU>d>Dckmdd`PvhS(v2P(V4d;dq?_dj6(KjScd!7y&} iQeEMNx{6cy)u&kAXYzk!kQc7=-z(ue@uxUagXBNuR7`gO delta 465 zcmZ{g%}&BV6opT*U{h&?f`%w)<4^dff`E#DQCB9ol8sAKE2$x1pe|go@c}e_0i#dA zMvW%MwJ%`elejXTLX2$8!Z+{kaLT5YxK`q@R(vi1FX zv(+|xpQnN$ATVUq%#OV-BZ!P2S@;Af=Z)h_vza znVQw)(l!lSLeaVQG#p#Z38Hf^UMbU%5QBnQOh9vr-kolWl%tGWjBt?n1;L|7gsSNW zq=zC${TuGNtHTFsUR};SA=+c52QudZ{G1orCr*_>07->9g;PvWxRv-bbC_pS0ju15u=WF!yHdOW diff --git a/tests/TennisGameTest.java b/tests/TennisGameTest.java index d0c5e57..9d21ed1 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -21,7 +21,8 @@ public class TennisGameTest { // "player2 has advantage" // "player1 wins" // "player2 wins" - @org.junit.Ignore + //@org.junit.Ignore + @Test public void testTennisGame_Start() { //Arrange TennisGame game = new TennisGame(); @@ -63,6 +64,124 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr game.player1Scored(); //Act // This statement should cause an exception - game.player1Scored(); - } + //game.player1Scored(); + String i = game.getScore(); + assertSame(i,"player1 wins"); + } + @Test (expected = TennisGameException.class) + public void testTennisGame_Player2WinsPointAfterGameEnded_ResultsException() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + // This statement should cause an exception + //game.player1Scored(); + String i = game.getScore(); + assertSame(i,"player2 wins"); + } + @Test + public void testPlayer2CanGetAdvantage()throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + String i = game.getScore(); + assertSame(i,"player2 has advantage"); + } + @Test + public void testPlayer1CanGetAdvantage()throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + String i = game.getScore(); + assertSame(i,"player1 has advantage"); + } + @Test + public void testPlayer1CanWin()throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + String i = game.getScore(); + assertSame(i,"player1 wins"); + } + @Test + public void testPlayer2CanWin()throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + String i = game.getScore(); + assertSame(i,"player2 wins"); + } + @Test + public void testPlayerPlaysDeuce()throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + String i = game.getScore(); + assertSame(i,"deuce"); + } + @Test + public void testPlayerPlaysLongGame1Wins()throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + String i = game.getScore(); + assertSame(i,"player1 wins"); + } } +