From b8714087e3a988f0ea78554258d6d1a8a4670c74 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 11 Feb 2019 23:16:05 +0100 Subject: [PATCH] SONAR-11721 Fix example of web API api/user_groups/users --- .../server/usergroups/ws/users-example.json | 10 +++------- .../server/usergroups/ws/UsersActionTest.java | 20 +++++++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/users-example.json b/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/users-example.json index fac841d6677..d90046c4686 100644 --- a/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/users-example.json +++ b/server/sonar-server/src/main/resources/org/sonar/server/usergroups/ws/users-example.json @@ -3,19 +3,15 @@ { "login": "admin", "name": "Administrator", - "email": "admin@admin.com", "selected": true }, { "login": "george.orwell", "name": "George Orwell", - "email": "george.orwell@1984.net", "selected": true } ], - "paging": { - "pageSize": 100, - "total": 2, - "pageIndex": 1 - } + "p":1, + "ps":25, + "total":2 } diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java index 7cb153579a0..b9ab336ac6f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java @@ -356,6 +356,26 @@ public class UsersActionTest { "}\n"); } + @Test + public void test_example() { + GroupDto group = db.users().insertGroup(); + UserDto admin = db.users().insertUser(newUserDto().setLogin("admin").setName("Administrator")); + db.users().insertMember(group, admin); + db.organizations().addMember(db.getDefaultOrganization(), admin); + UserDto george = db.users().insertUser(newUserDto().setLogin("george.orwell").setName("George Orwell")); + db.users().insertMember(group, george); + db.organizations().addMember(db.getDefaultOrganization(), george); + loginAsAdminOnDefaultOrganization(); + + String result = newUsersRequest() + .setParam("id", group.getId().toString()) + .setParam(Param.SELECTED, SelectionMode.ALL.value()) + .execute() + .getInput(); + + assertJson(result).isSimilarTo(ws.getDef().responseExampleAsString()); + } + private TestRequest newUsersRequest() { return ws.newRequest(); } -- 2.39.5