1.1 --- a/webidor/src/test/java/cz/xelfi/quoridor/webidor/AllGamesTest.java	Wed Dec 23 07:59:16 2009 +0100
     1.2 +++ b/webidor/src/test/java/cz/xelfi/quoridor/webidor/AllGamesTest.java	Sun Sep 12 00:06:44 2010 +0200
     1.3 @@ -26,9 +26,10 @@
     1.4  
     1.5  package cz.xelfi.quoridor.webidor;
     1.6  
     1.7 +import com.sun.jersey.test.framework.WebAppDescriptor;
     1.8 +import com.sun.jersey.test.framework.AppDescriptor;
     1.9  import com.sun.jersey.api.client.GenericType;
    1.10  import java.util.List;
    1.11 -import com.sun.jersey.api.client.UniformInterfaceException;
    1.12  import com.sun.jersey.test.framework.JerseyTest;
    1.13  import java.io.File;
    1.14  import java.io.FileOutputStream;
    1.15 @@ -49,21 +50,21 @@
    1.16  
    1.17      private File dir;
    1.18  
    1.19 -    public AllGamesTest() throws Exception {
    1.20 -        super("cz.xelfi.quoridor.webidor.resources");
    1.21 -    }
    1.22 -
    1.23      @Override
    1.24 -    public void setUp() throws Exception {
    1.25 -        dir = File.createTempFile("quoridor", ".dir");
    1.26 -        dir.delete();
    1.27 -        System.setProperty("quoridor.dir", dir.getPath());
    1.28 -        dir.mkdirs();
    1.29 -        File passwd = new File(dir, "passwd");
    1.30 -        FileOutputStream os = new FileOutputStream(passwd);
    1.31 -        os.write("Jarda=heslo\nJirka=pesko\nJan=pan\n".getBytes("UTF-8"));
    1.32 -        os.close();
    1.33 -        super.setUp();
    1.34 +    protected AppDescriptor configure() {
    1.35 +        try {
    1.36 +            dir = File.createTempFile("quoridor", ".dir");
    1.37 +            dir.delete();
    1.38 +            System.setProperty("quoridor.dir", dir.getPath());
    1.39 +            dir.mkdirs();
    1.40 +            File passwd = new File(dir, "passwd");
    1.41 +            FileOutputStream os = new FileOutputStream(passwd);
    1.42 +            os.write("Jarda=heslo\nJirka=pesko\nJan=pan\n".getBytes("UTF-8"));
    1.43 +            os.close();
    1.44 +        } catch (Exception ex) {
    1.45 +            throw new IllegalStateException(ex);
    1.46 +        }
    1.47 +        return new WebAppDescriptor.Builder("cz.xelfi.quoridor.webidor.resources").build();
    1.48      }
    1.49  
    1.50      @Override
    1.51 @@ -106,31 +107,31 @@
    1.52              p.store(new FileOutputStream(fJan), "");
    1.53          }
    1.54  
    1.55 -        String logRoot = webResource.path("login").
    1.56 +        String logRoot = resource().path("login").
    1.57              queryParam("name", "Jarda").
    1.58              queryParam("password", "heslo").
    1.59              accept(MediaType.TEXT_PLAIN).
    1.60              put(String.class);
    1.61 -        String logJirka = webResource.path("login").
    1.62 +        String logJirka = resource().path("login").
    1.63              queryParam("name", "Jirka").
    1.64              queryParam("password", "pesko").
    1.65              accept(MediaType.TEXT_PLAIN).
    1.66              put(String.class);
    1.67 -        String logJan = webResource.path("login").
    1.68 +        String logJan = resource().path("login").
    1.69              queryParam("name", "Jan").
    1.70              queryParam("password", "pan").
    1.71              accept(MediaType.TEXT_PLAIN).
    1.72              put(String.class);
    1.73  
    1.74 -        GameId s = webResource.path("games").queryParam("white", "Jan")
    1.75 +        GameId s = resource().path("games").queryParam("white", "Jan")
    1.76                  .queryParam("loginID", logJan)
    1.77                  .queryParam("black", "Jirka").post(GameId.class);
    1.78 -            webResource.path("games/" + s.getId())
    1.79 +            resource().path("games/" + s.getId())
    1.80                  .queryParam("loginID", logJan)
    1.81                  .queryParam("player", "Jan").queryParam("move", "RESIGN").put(GameId.class);
    1.82  
    1.83          GenericType<List<GameId>> gType = new GenericType<List<GameId>>() {};
    1.84 -        List<GameId> all = webResource.path("games/").queryParam("loginID", logRoot).accept(MediaType.TEXT_XML).get(gType);
    1.85 +        List<GameId> all = resource().path("games/").queryParam("loginID", logRoot).accept(MediaType.TEXT_XML).get(gType);
    1.86          boolean found = false;
    1.87          for (GameId id : all) {
    1.88              if (id.getId().equals(s.getId())) {
    1.89 @@ -140,7 +141,7 @@
    1.90          }
    1.91          assertTrue("List of games shall contai all games: " + all, found);
    1.92  
    1.93 -        Game end = webResource.path("games/" + s.getId()).queryParam("loginID", logRoot).accept(MediaType.TEXT_XML).get(Game.class);
    1.94 +        Game end = resource().path("games/" + s.getId()).queryParam("loginID", logRoot).accept(MediaType.TEXT_XML).get(Game.class);
    1.95          assertEquals("One can see status of games with priviledges", GameStatus.blackWon, end.getId().getStatus());
    1.96      }
    1.97  }