1.1 --- a/webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java	Fri Sep 11 20:32:15 2009 +0200
     1.2 +++ b/webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java	Sun Sep 13 16:48:54 2009 +0200
     1.3 @@ -28,6 +28,7 @@
     1.4  
     1.5  import com.sun.jersey.test.framework.JerseyTest;
     1.6  import java.io.File;
     1.7 +import java.io.FileOutputStream;
     1.8  import java.io.IOException;
     1.9  import javax.ws.rs.core.MediaType;
    1.10  import org.junit.Test;
    1.11 @@ -49,6 +50,11 @@
    1.12          dir = File.createTempFile("quoridor", ".dir");
    1.13          dir.delete();
    1.14          System.setProperty("quoridor.dir", dir.getPath());
    1.15 +        dir.mkdirs();
    1.16 +        File passwd = new File(dir, "passwd");
    1.17 +        FileOutputStream os = new FileOutputStream(passwd);
    1.18 +        os.write("Jarda=heslo\nJirka=pesko\n".getBytes("UTF-8"));
    1.19 +        os.close();
    1.20          super.setUp();
    1.21      }
    1.22  
    1.23 @@ -73,20 +79,44 @@
    1.24  
    1.25      @Test public void testCreateAGame() throws Exception {
    1.26          webResource = webResource.path("api");
    1.27 +        String logJarda = webResource.path("login").
    1.28 +            queryParam("name", "Jarda").
    1.29 +            queryParam("password", "heslo").
    1.30 +            accept(MediaType.TEXT_PLAIN).
    1.31 +            put(String.class);
    1.32 +        String logJirka = webResource.path("login").
    1.33 +            queryParam("name", "Jirka").
    1.34 +            queryParam("password", "pesko").
    1.35 +            accept(MediaType.TEXT_PLAIN).
    1.36 +            put(String.class);
    1.37 +        assertNotNull("Logged in ok", logJarda);
    1.38          GameId s = webResource.path("games").queryParam("white", "Jarda")
    1.39 +                .queryParam("loginID", logJarda)
    1.40                  .queryParam("black", "Jirka").post(GameId.class);
    1.41  
    1.42          for (int i = 0; i < 3; i++) {
    1.43 -            webResource.path("games/" + s.getId()).queryParam("player", "Jarda").queryParam("move", "N").put(GameId.class);
    1.44 -            webResource.path("games/" + s.getId()).queryParam("player", "Jirka").queryParam("move", "S").put(GameId.class);
    1.45 +            webResource.path("games/" + s.getId())
    1.46 +                .queryParam("loginID", logJarda)
    1.47 +                .queryParam("player", "Jarda").queryParam("move", "N").put(GameId.class);
    1.48 +            webResource.path("games/" + s.getId())
    1.49 +                .queryParam("loginID", logJirka)
    1.50 +                .queryParam("player", "Jirka").queryParam("move", "S").put(GameId.class);
    1.51          }
    1.52  
    1.53 -        webResource.path("games/" + s.getId()).queryParam("player", "Jarda").queryParam("move", "N").put(GameId.class);
    1.54 -        webResource.path("games/" + s.getId()).queryParam("player", "Jirka").queryParam("move", "SS").put(GameId.class);
    1.55 +        webResource.path("games/" + s.getId())
    1.56 +            .queryParam("loginID", logJarda)
    1.57 +            .queryParam("player", "Jarda").queryParam("move", "N").put(GameId.class);
    1.58 +        webResource.path("games/" + s.getId())
    1.59 +            .queryParam("loginID", logJirka)
    1.60 +            .queryParam("player", "Jirka").queryParam("move", "SS").put(GameId.class);
    1.61  
    1.62          for (int i = 0; i < 3; i++) {
    1.63 -            webResource.path("games/" + s.getId()).queryParam("player", "Jarda").queryParam("move", "N").put(GameId.class);
    1.64 -            webResource.path("games/" + s.getId()).queryParam("player", "Jirka").queryParam("move", "S").put(GameId.class);
    1.65 +            webResource.path("games/" + s.getId())
    1.66 +                .queryParam("loginID", logJarda)
    1.67 +                .queryParam("player", "Jarda").queryParam("move", "N").put(GameId.class);
    1.68 +            webResource.path("games/" + s.getId())
    1.69 +                .queryParam("loginID", logJirka)
    1.70 +                .queryParam("player", "Jirka").queryParam("move", "S").put(GameId.class);
    1.71          }
    1.72  
    1.73          Game end = webResource.path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
    1.74 @@ -95,10 +125,19 @@
    1.75  
    1.76      @Test public void testResignAGame() throws Exception {
    1.77          webResource = webResource.path("api");
    1.78 +        String logJarda = webResource.path("login").
    1.79 +            queryParam("name", "Jarda").
    1.80 +            queryParam("password", "heslo").
    1.81 +            accept(MediaType.TEXT_PLAIN).
    1.82 +            put(String.class);
    1.83          GameId s = webResource.path("games").queryParam("white", "Jarda")
    1.84 +                .queryParam("loginID", logJarda)
    1.85                  .queryParam("black", "Jirka").post(GameId.class);
    1.86  
    1.87 -        webResource.path("games/" + s.getId()).queryParam("player", "Jarda").queryParam("move", "RESIGN").put(GameId.class);
    1.88 +        webResource.path("games/" + s.getId()).
    1.89 +            queryParam("loginID", logJarda).
    1.90 +            queryParam("player", "Jarda").
    1.91 +            queryParam("move", "RESIGN").put(GameId.class);
    1.92          Game end = webResource.path("games/" + s.getId()).accept(MediaType.TEXT_XML).get(Game.class);
    1.93          assertEquals("BlackWins", GameStatus.blackWon, end.getId().getStatus());
    1.94      }