# HG changeset patch # User Jaroslav Tulach # Date 1248886084 -7200 # Node ID 6b889f2717e9ca5fdce429d062117f13d6d1f025 # Parent 373f537e01533f8c1eb3ca9ef40f14e9ba506599 Ability to read stored games diff -r 373f537e0153 -r 6b889f2717e9 webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Games.java --- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Games.java Wed Jul 29 17:24:20 2009 +0200 +++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Games.java Wed Jul 29 18:48:04 2009 +0200 @@ -37,6 +37,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -148,6 +149,10 @@ if (line == null) { break; } + line = line.trim(); + if (line.length() == 0) { + continue; + } if (line.startsWith("# white: ")) { white = line.substring(9); continue; diff -r 373f537e0153 -r 6b889f2717e9 webidor/src/test/java/cz/xelfi/quoridor/webidor/QuoridorTest.java --- a/webidor/src/test/java/cz/xelfi/quoridor/webidor/QuoridorTest.java Wed Jul 29 17:24:20 2009 +0200 +++ b/webidor/src/test/java/cz/xelfi/quoridor/webidor/QuoridorTest.java Wed Jul 29 18:48:04 2009 +0200 @@ -30,10 +30,13 @@ import com.sun.jersey.api.client.UniformInterfaceException; import com.sun.jersey.core.header.MediaTypes; import com.sun.jersey.test.framework.JerseyTest; +import cz.xelfi.quoridor.Board; +import cz.xelfi.quoridor.Move; +import cz.xelfi.quoridor.webidor.resources.Games; +import cz.xelfi.quoridor.webidor.resources.Quoridor; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.util.Arrays; import java.util.List; import org.junit.Test; import static org.junit.Assert.*; @@ -133,6 +136,15 @@ if (!content.contains("N S")) { fail(content); } + + Games read = new Games(new File(dir, "games")); + List readGames = read.getGames(); + assertEquals("One game read", 1, readGames.size()); + Board board = read.getGames().get(0).getBoard(); + assertEquals(1, board.getPlayers().get(0).getRow()); + assertEquals(7, board.getPlayers().get(1).getRow()); + assertEquals(Move.NORTH, read.getGames().get(0).getMoves().get(0)); + assertEquals(Move.SOUTH, read.getGames().get(0).getMoves().get(1)); } }