UserDbTester.insertUser does not add default organization membership

server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDbTester.java

@@ -68,9 +68,6 @@ public class UserDbTester {
 
   public UserDto insertUser(UserDto userDto) {
     UserDto updatedUser = dbClient.userDao().insert(db.getSession(), userDto);
-    if (db.hasDefaultOrganization() && userDto.isActive()) {
-      db.organizations().addMember(db.getDefaultOrganization(), updatedUser);
-    }
     db.commit();
     return updatedUser;
   }

server/sonar-server/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java

@@ -85,15 +85,14 @@ public class AssignActionTest {
   private AssignAction underTest = new AssignAction(system2, userSession, db.getDbClient(), new IssueFinder(db.getDbClient(), userSession), new IssueFieldsSetter(),
     new IssueUpdater(db.getDbClient(),
       new ServerIssueStorage(system2, new DefaultRuleFinder(db.getDbClient(), defaultOrganizationProvider), db.getDbClient(), issueIndexer),
-      mock(NotificationManager.class)
-    ),
+      mock(NotificationManager.class)),
     responseWriter);
   private WsActionTester ws = new WsActionTester(underTest);
 
   @Test
   public void assign_to_someone() throws Exception {
     IssueDto issue = newIssueWithBrowsePermission();
-    UserDto userDto = db.users().insertUser("arthur");
+    insertUser("arthur");
 
     ws.newRequest()
       .setParam("issue", issue.getKey())
@@ -158,7 +157,7 @@ public class AssignActionTest {
   @Test
   public void nothing_to_do_when_new_assignee_is_same_as_old_one() throws Exception {
     IssueDto issue = newIssueWithBrowsePermission();
-    UserDto userDto = db.users().insertUser(PREVIOUS_ASSIGNEE);
+    insertUser(PREVIOUS_ASSIGNEE);
 
     ws.newRequest()
       .setParam("issue", issue.getKey())
@@ -240,6 +239,12 @@ public class AssignActionTest {
       .execute();
   }
 
+  private UserDto insertUser(String login) {
+    UserDto user = db.users().insertUser(login);
+    db.organizations().addMember(db.getDefaultOrganization(), user);
+    return user;
+  }
+
   private IssueDto newIssue() {
     return db.issues().insertIssue(
       issueDto -> issueDto
@@ -255,7 +260,7 @@ public class AssignActionTest {
   }
 
   private void setUserWithBrowsePermission(IssueDto issue) {
-    UserDto currentUser = db.users().insertUser(CURRENT_USER_LOGIN);
+    insertUser(CURRENT_USER_LOGIN);
     userSession.logIn(CURRENT_USER_LOGIN).addProjectUuidPermissions(USER, issue.getProjectUuid());
   }
 

server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java

@@ -78,6 +78,7 @@ public class AddMemberActionTest {
   public void setUp() {
     organization = db.organizations().insert();
     user = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user);
   }
 
   @Test

server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java

@@ -89,7 +89,9 @@ public class SearchMembersActionTest {
   @Test
   public void search_members_of_default_organization() {
     UserDto user = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     UserDto anotherUser = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), anotherUser);
     indexAllUsers();
 
     SearchMembersWsResponse result = call();
@@ -126,6 +128,7 @@ public class SearchMembersActionTest {
   @Test
   public void return_avatar() {
     UserDto user = db.users().insertUser(u -> u.setEmail("email@domain.com"));
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     indexer.index(user.getLogin());
 
     SearchMembersWsResponse result = call();
@@ -136,6 +139,7 @@ public class SearchMembersActionTest {
   @Test
   public void do_not_return_group_count_if_no_admin_permission() {
     UserDto user = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     GroupDto group = db.users().insertGroup();
     db.users().insertMember(group, user);
     indexAllUsers();
@@ -149,14 +153,15 @@ public class SearchMembersActionTest {
   public void return_group_counts_if_org_admin() {
     userSession.addPermission(OrganizationPermission.ADMINISTER, db.getDefaultOrganization());
     UserDto user = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     UserDto anotherUser = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), anotherUser);
     IntStream.range(0, 10)
       .mapToObj(i -> db.users().insertGroup())
       .forEach(g -> db.users().insertMembers(g, user));
     OrganizationDto anotherOrganization = db.organizations().insert();
     GroupDto anotherGroup = db.users().insertGroup(anotherOrganization);
     db.users().insertMember(anotherGroup, user);
-    db.organizations().addMember(anotherOrganization, user);
     indexAllUsers();
 
     SearchMembersWsResponse result = call();
@@ -191,6 +196,7 @@ public class SearchMembersActionTest {
   public void search_members_pagination() {
     IntStream.range(0, 10).forEach(i -> {
       UserDto userDto = db.users().insertUser(user -> user.setName("USER_" + i));
+      db.organizations().addMember(db.getDefaultOrganization(), userDto);
       indexer.index(userDto.getLogin());
     });
     indexAllUsers();
@@ -209,6 +215,7 @@ public class SearchMembersActionTest {
   public void search_members_by_name() {
     IntStream.range(0, 10).forEach(i -> {
       UserDto userDto = db.users().insertUser(user -> user.setName("USER_" + i));
+      db.organizations().addMember(db.getDefaultOrganization(), userDto);
       indexer.index(userDto.getLogin());
     });
     indexAllUsers();
@@ -223,6 +230,7 @@ public class SearchMembersActionTest {
   public void search_members_by_login() {
     IntStream.range(0, 10).forEach(i -> {
       UserDto userDto = db.users().insertUser(user -> user.setLogin("USER_" + i));
+      db.organizations().addMember(db.getDefaultOrganization(), userDto);
       indexer.index(userDto.getLogin());
     });
     indexAllUsers();
@@ -239,6 +247,7 @@ public class SearchMembersActionTest {
       UserDto userDto = db.users().insertUser(user -> user
         .setLogin("L" + i)
         .setEmail("USER_" + i + "@email.com"));
+      db.organizations().addMember(db.getDefaultOrganization(), userDto);
       indexer.index(userDto.getLogin());
     });
     indexAllUsers();
@@ -251,8 +260,10 @@ public class SearchMembersActionTest {
 
   @Test
   public void json_example() {
-    db.users().insertUser(u -> u.setLogin("ada.lovelace").setName("Ada Lovelace").setEmail("ada@lovelace.com"));
-    db.users().insertUser(u -> u.setLogin("grace.hopper").setName("Grace Hopper").setEmail("grace@hopper.com"));
+    UserDto user1 = db.users().insertUser(u -> u.setLogin("ada.lovelace").setName("Ada Lovelace").setEmail("ada@lovelace.com"));
+    db.organizations().addMember(db.getDefaultOrganization(), user1);
+    UserDto user2 = db.users().insertUser(u -> u.setLogin("grace.hopper").setName("Grace Hopper").setEmail("grace@hopper.com"));
+    db.organizations().addMember(db.getDefaultOrganization(), user2);
     indexAllUsers();
 
     String result = ws.newRequest().execute().getInput();

server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java

@@ -50,6 +50,7 @@ public class AddUserActionTest extends BasePermissionWsTest<AddUserAction> {
   @Before
   public void setUp() {
     user = db.users().insertUser("ray.bradbury");
+    db.organizations().addMember(db.getDefaultOrganization(), user);
   }
 
   @Override

server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java

@@ -96,6 +96,7 @@ public class SearchGlobalPermissionsActionTest extends BasePermissionWsTest<Sear
 
     UserDto user = db.users().insertUser();
     db.users().insertPermissionOnUser(db.getDefaultOrganization(), user, SCAN);
+    db.organizations().addMember(db.getDefaultOrganization(), user);
 
     // to be ignored, by default organization is used when searching for permissions
     db.users().insertPermissionOnUser(org, user, ADMINISTER_QUALITY_GATES);

server/sonar-server/src/test/java/org/sonar/server/permission/ws/UsersActionTest.java

@@ -54,7 +54,9 @@ public class UsersActionTest extends BasePermissionWsTest<UsersAction> {
   @Test
   public void search_for_users_with_response_example() throws Exception {
     UserDto user1 = db.users().insertUser(newUserDto().setLogin("admin").setName("Administrator").setEmail("admin@admin.com"));
+    db.organizations().addMember(db.getDefaultOrganization(), user1);
     UserDto user2 = db.users().insertUser(newUserDto().setLogin("george.orwell").setName("George Orwell").setEmail("george.orwell@1984.net"));
+    db.organizations().addMember(db.getDefaultOrganization(), user2);
     db.users().insertPermissionOnUser(user1, ADMINISTER);
     db.users().insertPermissionOnUser(user1, ADMINISTER_QUALITY_GATES);
     db.users().insertPermissionOnUser(user1, ADMINISTER_QUALITY_PROFILES);
@@ -81,15 +83,18 @@ public class UsersActionTest extends BasePermissionWsTest<UsersAction> {
     // User has permission on project
     ComponentDto project = db.components().insertComponent(newProjectDto(db.getDefaultOrganization()));
     UserDto user = db.users().insertUser(newUserDto());
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project);
 
     // User has permission on another project
     ComponentDto anotherProject = db.components().insertComponent(newProjectDto(db.getDefaultOrganization()));
     UserDto userHavePermissionOnAnotherProject = db.users().insertUser(newUserDto());
+    db.organizations().addMember(db.getDefaultOrganization(), userHavePermissionOnAnotherProject);
     db.users().insertProjectPermissionOnUser(userHavePermissionOnAnotherProject, ISSUE_ADMIN, anotherProject);
 
     // User has no permission
     UserDto withoutPermission = db.users().insertUser(newUserDto());
+    db.organizations().addMember(db.getDefaultOrganization(), withoutPermission);
 
     userSession.logIn().addProjectUuidPermissions(SYSTEM_ADMIN, project.uuid());
     String result = newRequest()
@@ -108,10 +113,12 @@ public class UsersActionTest extends BasePermissionWsTest<UsersAction> {
     // User have permission on project
     ComponentDto project = db.components().insertProject();
     UserDto user = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project);
 
     // User has no permission
     UserDto withoutPermission = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), withoutPermission);
 
     loginAsAdmin(db.getDefaultOrganization());
     String result = newRequest()
@@ -129,11 +136,14 @@ public class UsersActionTest extends BasePermissionWsTest<UsersAction> {
     // User with permission on project
     ComponentDto project = db.components().insertComponent(newProjectDto(db.organizations().insert()));
     UserDto user = db.users().insertUser(newUserDto("with-permission-login", "with-permission-name", "with-permission-email"));
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project);
 
     // User without permission
     UserDto withoutPermission = db.users().insertUser(newUserDto("without-permission-login", "without-permission-name", "without-permission-email"));
+    db.organizations().addMember(db.getDefaultOrganization(), withoutPermission);
     UserDto anotherUser = db.users().insertUser(newUserDto("another-user", "another-user", "another-user"));
+    db.organizations().addMember(db.getDefaultOrganization(), anotherUser);
 
     loginAsAdmin(db.getDefaultOrganization());
     String result = newRequest()
@@ -150,11 +160,14 @@ public class UsersActionTest extends BasePermissionWsTest<UsersAction> {
     // User with permission on project
     ComponentDto project = db.components().insertComponent(newProjectDto(db.organizations().insert()));
     UserDto user = db.users().insertUser(newUserDto("with-permission-login", "with-permission-name", "with-permission-email"));
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project);
 
     // User without permission
     UserDto withoutPermission = db.users().insertUser(newUserDto("without-permission-login", "without-permission-name", "without-permission-email"));
+    db.organizations().addMember(db.getDefaultOrganization(), withoutPermission);
     UserDto anotherUser = db.users().insertUser(newUserDto("another-user", "another-user", "another-user"));
+    db.organizations().addMember(db.getDefaultOrganization(), anotherUser);
 
     loginAsAdmin(db.getDefaultOrganization());
     String result = newRequest().setParam(PARAM_PROJECT_ID, project.uuid()).setParam(TEXT_QUERY, "email").execute().getInput();
@@ -167,11 +180,14 @@ public class UsersActionTest extends BasePermissionWsTest<UsersAction> {
     // User with permission on project
     ComponentDto project = db.components().insertComponent(newProjectDto(db.organizations().insert()));
     UserDto user = db.users().insertUser(newUserDto("with-permission-login", "with-permission-name", "with-permission-email"));
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project);
 
     // User without permission
     UserDto withoutPermission = db.users().insertUser(newUserDto("without-permission-login", "without-permission-name", "without-permission-email"));
+    db.organizations().addMember(db.getDefaultOrganization(), withoutPermission);
     UserDto anotherUser = db.users().insertUser(newUserDto("another-user", "another-user", "another-user"));
+    db.organizations().addMember(db.getDefaultOrganization(), anotherUser);
 
     loginAsAdmin(db.getDefaultOrganization());
     String result = newRequest().setParam(PARAM_PROJECT_ID, project.uuid()).setParam(TEXT_QUERY, "login").execute().getInput();
@@ -268,8 +284,11 @@ public class UsersActionTest extends BasePermissionWsTest<UsersAction> {
 
   private void insertUsersHavingGlobalPermissions() {
     UserDto user1 = db.users().insertUser(newUserDto("login-1", "name-1", "email-1"));
+    db.organizations().addMember(db.getDefaultOrganization(), user1);
     UserDto user2 = db.users().insertUser(newUserDto("login-2", "name-2", "email-2"));
+    db.organizations().addMember(db.getDefaultOrganization(), user2);
     UserDto user3 = db.users().insertUser(newUserDto("login-3", "name-3", "email-3"));
+    db.organizations().addMember(db.getDefaultOrganization(), user3);
     db.users().insertPermissionOnUser(user1, SCAN);
     db.users().insertPermissionOnUser(user2, SCAN);
     db.users().insertPermissionOnUser(user3, ADMINISTER);

server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddUserToTemplateActionTest.java

@@ -56,6 +56,7 @@ public class AddUserToTemplateActionTest extends BasePermissionWsTest<AddUserToT
   @Before
   public void setUp() {
     user = db.users().insertUser("user-login");
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     permissionTemplate = db.permissionTemplates().insertTemplate(db.getDefaultOrganization());
   }
 

server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/ApplyTemplateActionTest.java

@@ -70,7 +70,9 @@ public class ApplyTemplateActionTest extends BasePermissionWsTest<ApplyTemplateA
   @Before
   public void setUp() {
     user1 = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user1);
     user2 = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user2);
     group1 = db.users().insertGroup();
     group2 = db.users().insertGroup();
 

server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/RemoveUserFromTemplateActionTest.java

@@ -56,6 +56,7 @@ public class RemoveUserFromTemplateActionTest extends BasePermissionWsTest<Remov
   @Before
   public void setUp() {
     user = db.users().insertUser("user-login");
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     template = db.permissionTemplates().insertTemplate(db.getDefaultOrganization());
     addUserToTemplate(user, template, DEFAULT_PERMISSION);
   }
@@ -103,6 +104,7 @@ public class RemoveUserFromTemplateActionTest extends BasePermissionWsTest<Remov
   @Test
   public void keep_other_users_when_one_user_removed() throws Exception {
     UserDto newUser = db.users().insertUser("new-login");
+    db.organizations().addMember(db.getDefaultOrganization(), newUser);
     addUserToTemplate(newUser, template, DEFAULT_PERMISSION);
 
     loginAsAdmin(db.getDefaultOrganization());

server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/TemplateUsersActionTest.java

@@ -40,9 +40,9 @@ import static org.sonar.api.web.UserRole.ADMIN;
 import static org.sonar.api.web.UserRole.CODEVIEWER;
 import static org.sonar.api.web.UserRole.ISSUE_ADMIN;
 import static org.sonar.api.web.UserRole.USER;
+import static org.sonar.db.permission.OrganizationPermission.SCAN;
 import static org.sonar.db.permission.template.PermissionTemplateTesting.newPermissionTemplateUserDto;
 import static org.sonar.db.user.UserTesting.newUserDto;
-import static org.sonar.db.permission.OrganizationPermission.SCAN;
 import static org.sonar.test.JsonAssert.assertJson;
 import static org.sonarqube.ws.MediaTypes.PROTOBUF;
 import static org.sonarqube.ws.client.permission.PermissionsWsParameters.PARAM_PERMISSION;
@@ -283,7 +283,9 @@ public class TemplateUsersActionTest extends BasePermissionWsTest<TemplateUsersA
   }
 
   private UserDto insertUser(UserDto userDto) {
-    return db.users().insertUser(userDto);
+    db.users().insertUser(userDto);
+    db.organizations().addMember(db.getDefaultOrganization(), userDto);
+    return userDto;
   }
 
   private void addUserToTemplate(PermissionTemplateUserDto dto) {

server/sonar-server/src/test/java/org/sonar/server/user/index/UserResultSetIteratorTest.java

@@ -78,7 +78,7 @@ public class UserResultSetIteratorTest {
     assertThat(user1.scmAccounts()).containsOnly("user_1", "u1");
     assertThat(user1.createdAt()).isEqualTo(1_500_000_000_000L);
     assertThat(user1.updatedAt()).isEqualTo(1_500_000_000_000L);
-    assertThat(user1.organizationUuids()).containsOnly("ORG_1", "ORG_2", db.getDefaultOrganization().getUuid());
+    assertThat(user1.organizationUuids()).containsOnly("ORG_1", "ORG_2");
 
     UserDoc user2 = usersByLogin.get("user2");
     assertThat(user2.name()).isEqualTo("User2");
@@ -87,7 +87,7 @@ public class UserResultSetIteratorTest {
     assertThat(user2.scmAccounts()).containsOnly("user,2", "user_2");
     assertThat(user2.createdAt()).isEqualTo(1_500_000_000_000L);
     assertThat(user2.updatedAt()).isEqualTo(1_500_000_000_000L);
-    assertThat(user2.organizationUuids()).containsOnly("ORG_1", db.getDefaultOrganization().getUuid());
+    assertThat(user2.organizationUuids()).containsOnly("ORG_1");
 
     UserDoc user3 = usersByLogin.get("user3");
     assertThat(user3.name()).isEqualTo("User3");

server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java

@@ -60,6 +60,7 @@ public class AddUserActionTest {
   public void add_user_to_group_referenced_by_its_id() throws Exception {
     GroupDto group = db.users().insertGroup();
     UserDto user = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     loginAsAdminOnDefaultOrganization();
 
     newRequest()
@@ -74,6 +75,7 @@ public class AddUserActionTest {
   public void add_user_to_group_referenced_by_its_name() throws Exception {
     GroupDto group = db.users().insertGroup();
     UserDto user = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     loginAsAdminOnDefaultOrganization();
 
     newRequest()
@@ -89,7 +91,7 @@ public class AddUserActionTest {
     OrganizationDto org = db.organizations().insert();
     GroupDto group = db.users().insertGroup(org, "a-group");
     UserDto user = db.users().insertUser("user_login");
-    addUserAsMemberOfOrganization(org, user);
+    db.organizations().addMember(org, user);
     loginAsAdmin(org);
 
     newRequest()
@@ -107,6 +109,7 @@ public class AddUserActionTest {
     GroupDto admins = db.users().insertGroup(defaultOrg, "admins");
     GroupDto users = db.users().insertGroup(defaultOrg, "users");
     UserDto user = db.users().insertUser("my-admin");
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     db.users().insertMember(users, user);
     loginAsAdminOnDefaultOrganization();
 
@@ -122,6 +125,7 @@ public class AddUserActionTest {
   public void do_not_fail_if_user_is_already_member_of_group() throws Exception {
     GroupDto users = db.users().insertGroup();
     UserDto user = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     db.users().insertMember(users, user);
     loginAsAdminOnDefaultOrganization();
 
@@ -138,7 +142,9 @@ public class AddUserActionTest {
   public void group_has_multiple_members() throws Exception {
     GroupDto users = db.users().insertGroup();
     UserDto user1 = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user1);
     UserDto user2 = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user2);
     db.users().insertMember(users, user1);
     loginAsAdminOnDefaultOrganization();
 
@@ -155,6 +161,7 @@ public class AddUserActionTest {
   public void response_status_is_no_content() throws Exception {
     GroupDto group = db.users().insertGroup();
     UserDto user = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     loginAsAdminOnDefaultOrganization();
 
     TestResponse response = newRequest()
@@ -168,6 +175,7 @@ public class AddUserActionTest {
   @Test
   public void fail_if_group_does_not_exist() throws Exception {
     UserDto user = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     loginAsAdminOnDefaultOrganization();
 
     expectedException.expect(NotFoundException.class);
@@ -197,6 +205,7 @@ public class AddUserActionTest {
   public void fail_if_not_administrator() throws Exception {
     GroupDto group = db.users().insertGroup();
     UserDto user = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user);
 
     expectedException.expect(UnauthorizedException.class);
 
@@ -208,6 +217,7 @@ public class AddUserActionTest {
     OrganizationDto org1 = db.organizations().insert();
     GroupDto group = db.users().insertGroup(org1, "a-group");
     UserDto user = db.users().insertUser("user_login");
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     OrganizationDto org2 = db.organizations().insert();
     loginAsAdmin(org2);
 
@@ -226,7 +236,7 @@ public class AddUserActionTest {
     GroupDto group = db.users().insertGroup(org, "a-group");
     UserDto user = db.users().insertUser("user_login");
     OrganizationDto otherOrganization = db.organizations().insert();
-    addUserAsMemberOfOrganization(otherOrganization, user);
+    db.organizations().addMember(otherOrganization, user);
     loginAsAdmin(org);
 
     expectedException.expect(IllegalArgumentException.class);
@@ -243,7 +253,7 @@ public class AddUserActionTest {
   public void fail_to_add_user_to_anyone() throws Exception {
     OrganizationDto organization = db.organizations().insert(org -> org.setKey("org"));
     UserDto user = db.users().insertUser();
-    addUserAsMemberOfOrganization(organization, user);
+    db.organizations().addMember(organization, user);
     loginAsAdmin(organization);
 
     expectedException.expect(NotFoundException.class);
@@ -258,11 +268,10 @@ public class AddUserActionTest {
 
   @Test
   public void fail_to_add_user_to_default_group() throws Exception {
-    OrganizationDto organization = db.organizations().insert();
     UserDto user = db.users().insertUser();
-    addUserAsMemberOfOrganization(organization, user);
-    GroupDto group = db.users().insertGroup(organization, "sonar-users");
-    loginAsAdmin(organization);
+    db.organizations().addMember(db.getDefaultOrganization(), user);
+    GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "sonar-users");
+    loginAsAdmin(db.getDefaultOrganization());
 
     expectedException.expect(IllegalArgumentException.class);
     expectedException.expectMessage("Default group 'sonar-users' cannot be used to perform this action");
@@ -296,8 +305,4 @@ public class AddUserActionTest {
     return new GroupWsSupport(db.getDbClient(), defaultOrganizationProvider);
   }
 
-  private void addUserAsMemberOfOrganization(OrganizationDto organization, UserDto user) {
-    db.organizations().addMember(organization, user);
-  }
-
 }

server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java

@@ -57,6 +57,7 @@ public class UpdateActionTest {
   public void update_both_name_and_description() throws Exception {
     GroupDto group = db.users().insertGroup();
     UserDto user = db.users().insertUser();
+    db.organizations().addMember(db.getDefaultOrganization(), user);
     db.users().insertMember(group, user);
     loginAsAdminOnDefaultOrganization();
 

server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java

@@ -113,7 +113,9 @@ public class UsersActionTest {
   public void return_members_by_group_id() throws Exception {
     GroupDto group = db.users().insertGroup();
     UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada.login").setName("Ada Lovelace"));
+    db.organizations().addMember(db.getDefaultOrganization(), lovelace);
     UserDto hopper = db.users().insertUser(newUserDto().setLogin("grace").setName("Grace Hopper"));
+    db.organizations().addMember(db.getDefaultOrganization(), hopper);
     db.users().insertMember(group, lovelace);
     loginAsAdminOnDefaultOrganization();
 
@@ -161,7 +163,9 @@ public class UsersActionTest {
   public void references_group_in_default_organization_by_its_name() throws Exception {
     GroupDto group = db.users().insertGroup();
     UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada.login").setName("Ada Lovelace"));
+    db.organizations().addMember(db.getDefaultOrganization(), lovelace);
     UserDto hopper = db.users().insertUser(newUserDto().setLogin("grace").setName("Grace Hopper"));
+    db.organizations().addMember(db.getDefaultOrganization(), hopper);
     db.users().insertMember(group, lovelace);
     loginAsAdminOnDefaultOrganization();
 
@@ -183,7 +187,9 @@ public class UsersActionTest {
   public void filter_members_by_name() throws Exception {
     GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "a group");
     UserDto adaLovelace = db.users().insertUser(newUserDto().setLogin("ada").setName("Ada Lovelace"));
+    db.organizations().addMember(db.getDefaultOrganization(), adaLovelace);
     UserDto graceHopper = db.users().insertUser(newUserDto().setLogin("grace").setName("Grace Hopper"));
+    db.organizations().addMember(db.getDefaultOrganization(), graceHopper);
     db.users().insertMember(group, adaLovelace);
     db.users().insertMember(group, graceHopper);
     loginAsAdminOnDefaultOrganization();
@@ -197,7 +203,9 @@ public class UsersActionTest {
   public void selected_users() throws Exception {
     GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "a group");
     UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada").setName("Ada Lovelace"));
+    db.organizations().addMember(db.getDefaultOrganization(), lovelace);
     UserDto hopper = db.users().insertUser(newUserDto().setLogin("grace").setName("Grace Hopper"));
+    db.organizations().addMember(db.getDefaultOrganization(), hopper);
     db.users().insertMember(group, lovelace);
     loginAsAdminOnDefaultOrganization();
 
@@ -225,7 +233,9 @@ public class UsersActionTest {
   public void deselected_users() throws Exception {
     GroupDto group = db.users().insertGroup();
     UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada").setName("Ada Lovelace"));
+    db.organizations().addMember(db.getDefaultOrganization(), lovelace);
     UserDto hopper = db.users().insertUser(newUserDto().setLogin("grace").setName("Grace Hopper"));
+    db.organizations().addMember(db.getDefaultOrganization(), hopper);
     db.users().insertMember(group, lovelace);
     loginAsAdminOnDefaultOrganization();
 
@@ -246,7 +256,9 @@ public class UsersActionTest {
   public void paging() throws Exception {
     GroupDto group = db.users().insertGroup();
     UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada").setName("Ada Lovelace"));
+    db.organizations().addMember(db.getDefaultOrganization(), lovelace);
     UserDto hopper = db.users().insertUser(newUserDto().setLogin("grace").setName("Grace Hopper"));
+    db.organizations().addMember(db.getDefaultOrganization(), hopper);
     db.users().insertMember(group, lovelace);
     loginAsAdminOnDefaultOrganization();
 
@@ -284,7 +296,9 @@ public class UsersActionTest {
   public void filtering_by_name_email_and_login() throws Exception {
     GroupDto group = db.users().insertGroup();
     UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada.login").setName("Ada Lovelace").setEmail("ada@email.com"));
+    db.organizations().addMember(db.getDefaultOrganization(), lovelace);
     UserDto hopper = db.users().insertUser(newUserDto().setLogin("grace").setName("Grace Hopper").setEmail("grace@hopper.com"));
+    db.organizations().addMember(db.getDefaultOrganization(), hopper);
     db.users().insertMember(group, lovelace);
     loginAsAdminOnDefaultOrganization();