Merge: Don't display comments when there are none, test to find who wins, talk header without any link
1.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt Tue Nov 03 23:51:36 2009 +0100
1.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt Wed Nov 04 10:07:01 2009 +0100
1.3 @@ -237,7 +237,7 @@
1.4 </tbody>
1.5 </table>
1.6
1.7 - <h3><a href="/games/${doc.game.id.@id}?move=0">${bundle.TALK}</a></h3>
1.8 + <h3>${bundle.TALK}</h3>
1.9
1.10 <ul>
1.11 <#list doc.game.moves.item.comment as item>
2.1 --- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt Tue Nov 03 23:51:36 2009 +0100
2.2 +++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/index.fmt Wed Nov 04 10:07:01 2009 +0100
2.3 @@ -55,7 +55,9 @@
2.4 <#macro game game>
2.5 ${bundle("gameWhiteBlack", game.@white?string, game.@black?string)}
2.6 <a href="/games/${game.@id}/"><@before (now - game.@modified?number)?int/></a>
2.7 - ${bundle("comments", game.@comments?number)}
2.8 + <#if game.@comments?number != 0>
2.9 + ${bundle("comments", game.@comments?number)}
2.10 + </#if>
2.11 <#assign printed = printed + 1/>
2.12 </#macro>
2.13
3.1 --- a/webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java Tue Nov 03 23:51:36 2009 +0100
3.2 +++ b/webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java Wed Nov 04 10:07:01 2009 +0100
3.3 @@ -135,6 +135,8 @@
3.4 Game end = webResource.path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
3.5 assertEquals("BlackWins", GameStatus.blackWon, end.getId().getStatus());
3.6
3.7 + assertEquals("Jirka wins", "Jirka", end.getCurrentPlayer());
3.8 +
3.9 List<GameId> something = webResource.path("games/").queryParam("status", "blackWon").accept(MediaType.TEXT_XML).get(gType);
3.10
3.11 assertEquals("One game finished: " + something, 1, something.size());
3.12 @@ -157,6 +159,7 @@
3.13 queryParam("move", "RESIGN").put(GameId.class);
3.14 Game end = webResource.path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
3.15 assertEquals("BlackWins", GameStatus.blackWon, end.getId().getStatus());
3.16 + assertEquals("Jirka wins", "Jirka", end.getCurrentPlayer());
3.17 }
3.18
3.19 }