SONAR-10566 Allow organization name with one character

2 files changed, 27 insertions, 17 deletions

diff --git a/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java
index 85492174721..9951ebe9e27 100644
--- a/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java
@@ -30,6 +30,7 @@ import org.junit.Test;
 import org.sonarqube.qa.util.OrganizationTester;
 import org.sonarqube.qa.util.Tester;
 import org.sonarqube.ws.Components;
+import org.sonarqube.ws.Organizations;
 import org.sonarqube.ws.Organizations.Organization;
 import org.sonarqube.ws.Qualityprofiles;
 import org.sonarqube.ws.Rules;
@@ -43,7 +44,6 @@ import org.sonarqube.ws.client.organizations.OrganizationsService;
 import org.sonarqube.ws.client.organizations.SearchRequest;
 import org.sonarqube.ws.client.organizations.UpdateRequest;
 import org.sonarqube.ws.client.permissions.AddUserRequest;
-import org.sonarqube.ws.client.permissions.PermissionsService;
 import org.sonarqube.ws.client.roots.SetRootRequest;
 import org.sonarqube.ws.client.roots.UnsetRootRequest;
 
@@ -192,11 +192,9 @@ public class OrganizationTest {
   @Test
   public void an_organization_member_can_analyze_project() {
     Organization organization = tester.organizations().generate();
-    User user = tester.users().generate();
-    Group group = tester.groups().generate(organization);
-    // users.removeGroups("sonar-users");
-    tester.organizations().service().addMember(new AddMemberRequest().setOrganization(organization.getKey()).setLogin(user.getLogin()));
-    addPermissionsToUser(organization.getKey(), user.getLogin(), "provisioning", "scan");
+    User user = tester.users().generateMember(organization);
+    tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(user.getLogin()).setOrganization(organization.getKey()).setPermission("provisioning"));
+    tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(user.getLogin()).setOrganization(organization.getKey()).setPermission("scan"));
 
     runProjectAnalysis(orchestrator, "shared/xoo-sample",
       "sonar.organization", organization.getKey(),
@@ -229,14 +227,6 @@ public class OrganizationTest {
     assertThat(searchSampleProject(organization.getKey()).getComponentsList()).hasSize(1);
   }
 
-  private void addPermissionsToUser(String orgKeyAndName, String login, String permission, String... otherPermissions) {
-    PermissionsService permissionsService = tester.wsClient().permissions();
-    permissionsService.addUser(new AddUserRequest().setLogin(login).setOrganization(orgKeyAndName).setPermission(permission));
-    for (String otherPermission : otherPermissions) {
-      permissionsService.addUser(new AddUserRequest().setLogin(login).setOrganization(orgKeyAndName).setPermission(otherPermission));
-    }
-  }
-
   @Test
   public void deleting_an_organization_deletes_its_projects() {
     Organization organization = tester.organizations().generate();
@@ -292,6 +282,16 @@ public class OrganizationTest {
       .hasSize(1);
   }
 
+  @Test
+  public void create_organization_having_name_of_one_character() {
+    tester.organizations().generate(o -> o.setName("A"));
+
+    Organizations.SearchWsResponse search = tester.organizations().service().search(new SearchRequest());
+
+    assertThat(search.getOrganizationsList())
+      .extracting(Organization::getName).contains("A");
+  }
+
   private Components.SearchWsResponse searchSampleProject(String organizationKey) {
     return tester.wsClient().components()
       .search(new org.sonarqube.ws.client.components.SearchRequest()
diff --git a/tests/src/test/java/org/sonarqube/tests/organization/PersonalOrganizationTest.java b/tests/src/test/java/org/sonarqube/tests/organization/PersonalOrganizationTest.java
index d6c9f11fabf..c854fe22f66 100644
--- a/tests/src/test/java/org/sonarqube/tests/organization/PersonalOrganizationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/organization/PersonalOrganizationTest.java
@@ -21,6 +21,7 @@ package org.sonarqube.tests.organization;
 
 import com.sonar.orchestrator.Orchestrator;
 import java.util.List;
+import org.assertj.core.api.Java6Assertions;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -31,11 +32,10 @@ import org.sonarqube.ws.Users;
 import org.sonarqube.ws.client.organizations.SearchRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.tuple;
 
 public class PersonalOrganizationTest {
 
-  private static final String SETTING_CREATE_PERSONAL_ORG = "sonar.organizations.createPersonalOrg";
-
   @ClassRule
   public static Orchestrator orchestrator = OrganizationSuite.ORCHESTRATOR;
 
@@ -44,7 +44,7 @@ public class PersonalOrganizationTest {
 
   @Before
   public void setUp() {
-    tester.settings().setGlobalSettings(SETTING_CREATE_PERSONAL_ORG, "true");
+    tester.settings().setGlobalSettings("sonar.organizations.createPersonalOrg", "true");
   }
 
   @Test
@@ -60,4 +60,14 @@ public class PersonalOrganizationTest {
 
     tester.organizations().assertThatMemberOf(existing.get(0), user);
   }
+
+  @Test
+  public void create_personal_for_user_having_one_character_size_name() {
+    tester.users().generate(u -> u.setName("A"));
+
+    List<Organizations.Organization> organizations = tester.organizations().service().search(new SearchRequest()).getOrganizationsList();
+    Java6Assertions.assertThat(organizations)
+      .extracting(Organizations.Organization::getName, Organizations.Organization::getGuarded)
+      .contains(tuple("A", true));
+  }
 }