public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2025-12-16 11:15:07 +00:00
Code Issues Releases Wiki Activity

#18: GET /group + fix JUnit

Browse Source
This commit is contained in:
jendib
2016-03-19 23:42:36 +01:00
parent 3b9a66d1d8
commit c1c2228937
8 changed files with 78 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs-web/src/test/java/com/sismics/docs/rest/TestCommentResource.java
View File

@@ -108,7 +108,8 @@ public class TestCommentResource extends BaseJerseyTest {
.put(Entity.form(new Form()
.param("source", document1Id)
.param("perm", "READ")
.param("username", "comment2")), JsonObject.class);
.param("target", "comment2")
.param("type", "USER")), JsonObject.class);
// Create a comment with comment2
json = target().path("/comment").request()

17
docs-web/src/test/java/com/sismics/docs/rest/TestGroupResource.java
View File

@@ -41,11 +41,24 @@ public class TestGroupResource extends BaseJerseyTest {
clientUtil.createUser("group1", "g112", "g12");
String group1Token = clientUtil.login("group1");
// Check admin groups (all computed groups)
JsonObject json = target().path("/user").request()
// Get all groups
JsonObject json = target().path("/group")
.queryParam("sort_column", "1")
.queryParam("asc", "true")
.request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.get(JsonObject.class);
JsonArray groups = json.getJsonArray("groups");
Assert.assertEquals(6, groups.size());
JsonObject groupG11 = groups.getJsonObject(2);
Assert.assertEquals("g11", groupG11.getString("name"));
Assert.assertEquals("g1", groupG11.getString("parent"));
// Check admin groups (all computed groups)
json = target().path("/user").request()
.cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
.get(JsonObject.class);
groups = json.getJsonArray("groups");
Assert.assertEquals(1, groups.size());
Assert.assertEquals("administrators", groups.getString(0));