1.1 --- a/webidor/src/test/java/cz/xelfi/quoridor/webidor/QuoridorTest.java	Sat Sep 19 14:38:29 2009 +0200
     1.2 +++ b/webidor/src/test/java/cz/xelfi/quoridor/webidor/QuoridorTest.java	Mon Sep 28 14:42:19 2009 +0200
     1.3 @@ -162,10 +162,13 @@
     1.4              fail("The game is newly modified");
     1.5          }
     1.6          Game snapshot = webResource.path("games/" + s.getId()).queryParam("move", "0").accept(MediaType.TEXT_XML).get(Game.class);
     1.7 -        assertEquals("All moves listed", 2, snapshot.getMoves().size());
     1.8 +        String ssnapshot = webResource.path("games/" + s.getId()).queryParam("move", "0").accept(MediaType.TEXT_XML).get(String.class);
     1.9 +        assertEquals("All moves listed:\n" + ssnapshot, 2, snapshot.getMoves().size());
    1.10          assertEquals("Current move", 0, snapshot.getCurrentMove());
    1.11          assertEquals("Position 0", 0, snapshot.getBoard().getPlayers().get(0).getRow());
    1.12          assertEquals("Position 8", 8, snapshot.getBoard().getPlayers().get(1).getRow());
    1.13 +        assertEquals("Moves numbered from 1", 1, snapshot.getMoves().get(0).getIndex());
    1.14 +        assertEquals("Moves numbered from 1, 2", 2, snapshot.getMoves().get(1).getIndex());
    1.15  
    1.16          File game = new File(new File(dir, "games"), s2.getId());
    1.17          assertTrue("File for game exists", game.exists());
    1.18 @@ -191,8 +194,8 @@
    1.19          Board board = readGames.get(0).getBoard();
    1.20          assertEquals(1, board.getPlayers().get(0).getRow());
    1.21          assertEquals(7, board.getPlayers().get(1).getRow());
    1.22 -        assertEquals(Move.NORTH, readGames.get(0).getMoves().get(0));
    1.23 -        assertEquals(Move.SOUTH, readGames.get(0).getMoves().get(1));
    1.24 +        assertEquals(Move.NORTH, readGames.get(0).getMoves().get(0).getMove());
    1.25 +        assertEquals(Move.SOUTH, readGames.get(0).getMoves().get(1).getMove());
    1.26  
    1.27          class GMap extends GenericType<Map<String,Object>>{}
    1.28          String text = webResource.path("games").path(s.getId()).accept(MediaType.TEXT_PLAIN).get(String.class);
    1.29 @@ -200,12 +203,13 @@
    1.30              fail("Expecting board:\n" + text);
    1.31          }
    1.32          Game readGame = webResource.path("games").path(s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
    1.33 +        String sGame = webResource.path("games").path(s.getId()).accept(MediaType.TEXT_XML).get(String.class);
    1.34          assertNotNull("Game really returned", readGame);
    1.35          assertEquals("Same game as in text representation", readGame.getBoard(), Board.valueOf(text));
    1.36          assertEquals("It is same as text of our game", readGame.getBoard().toString(), text);
    1.37  
    1.38 -        assertEquals(Move.NORTH, readGame.getMoves().get(0));
    1.39 -        assertEquals(Move.SOUTH, readGame.getMoves().get(1));
    1.40 +        assertEquals(Move.NORTH, readGame.getMoves().get(0).getMove());
    1.41 +        assertEquals(Move.SOUTH, readGame.getMoves().get(1).getMove());
    1.42      }
    1.43  
    1.44  }