SONAR-10134 Remove creation of built-in QG in DbTester

server/sonar-db-dao/src/test/java/org/sonar/db/DbTester.java

@@ -21,7 +21,6 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
@@ -30,7 +29,6 @@
 import org.picocontainer.containers.TransientPicoContainer;
 import org.sonar.api.utils.System2;
 import org.sonar.core.util.SequenceUuidFactory;
-import org.sonar.core.util.Uuids;
 import org.sonar.db.component.ComponentDbTester;
 import org.sonar.db.event.EventDbTester;
 import org.sonar.db.favorite.FavoriteDbTester;
@@ -157,29 +155,12 @@ protected void before() {
     db.start();
     db.truncateTables();
     initDbClient();
-    insertBuiltInQualityGateIfTableExists();
-
     if (!disableDefaultOrganization) {
       insertDefaultOrganization();
     }
     started = true;
   }
 
-  private void insertBuiltInQualityGateIfTableExists() {
-    try (DbSession dbSession = db.getMyBatis().openSession(false)) {
-      if (DatabaseUtils.tableExists("quality_gates", dbSession.getConnection())) {
-        builtInQualityGate = new QualityGateDto()
-          .setUuid(Uuids.createFast())
-          .setName("Sonar way")
-          .setBuiltIn(true)
-          .setCreatedAt(new Date(system2.now()))
-          .setCreatedAt(new Date(system2.now()));
-        client.qualityGateDao().insert(dbSession, builtInQualityGate);
-        dbSession.commit();
-      }
-    }
-  }
-
   private void insertDefaultOrganization() {
     defaultOrganization = OrganizationTesting.newOrganizationDto().setUuid(defaultOrganizationUuid);
     try (DbSession dbSession = db.getMyBatis().openSession(false)) {

server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDbTester.java

@@ -115,6 +115,11 @@ public ComponentDto insertPublicProject(OrganizationDto organizationDto, String
     return insertComponentImpl(newPublicProjectDto(organizationDto, uuid), false, noExtraConfiguration());
   }
 
+  @SafeVarargs
+  public final ComponentDto insertPrivateProject(OrganizationDto organizationDto, String uuid, Consumer<ComponentDto>... dtoPopulators) {
+    return insertComponentImpl(newPrivateProjectDto(organizationDto, uuid), true, dtoPopulators);
+  }
+
   /**
    * @deprecated since 6.6
    * @see #insertPublicPortfolio(OrganizationDto, Consumer[])

server/sonar-db-dao/src/test/java/org/sonar/db/organization/OrganizationTesting.java

@@ -37,6 +37,7 @@ public static OrganizationDto newOrganizationDto() {
       .setName(randomAlphanumeric(64))
       .setDescription(randomAlphanumeric(256))
       .setAvatarUrl(randomAlphanumeric(256))
+      // Default quality gate should be set explicitly when needed in tests
       .setDefaultQualityGateUuid("_NOT_SET_")
       .setUrl(randomAlphanumeric(256));
   }

server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateDbTester.java

@@ -60,7 +60,8 @@ public void setBuiltInAsDefaultOn(OrganizationDto organizationDto) {
     QualityGateDto builtinQG = dbClient.qualityGateDao().selectBuiltIn(dbSession);
     dbClient.organizationDao().update(dbSession, organizationDto.setDefaultQualityGateUuid(builtinQG.getUuid()));
     if (dbClient.qualityGateDao().selectByOrganizationAndUuid(dbSession, organizationDto, builtinQG.getUuid()) == null) {
-      associateQualityGateToOrganization(builtinQG, organizationDto);
+      dbClient.qualityGateDao().associate(dbSession, Uuids.createFast(), organizationDto, builtinQG);
+      dbSession.commit();
     }
     dbSession.commit();
   }
@@ -86,11 +87,6 @@ public void associateProjectToQualityGate(ComponentDto component, QualityGateDto
     db.commit();
   }
 
-  public void associateQualityGateToOrganization(QualityGateDto qualityGate, OrganizationDto organization) {
-    dbClient.qualityGateDao().associate(dbSession, Uuids.createFast(), organization, qualityGate);
-    dbSession.commit();
-  }
-
   @SafeVarargs
   public final QualityGateDto createDefaultQualityGate(OrganizationDto organization, Consumer<QualityGateDto>... dtoPopulators) {
     QualityGateDto defaultQGate = insertQualityGate(organization, dtoPopulators);

server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java

@@ -169,6 +169,7 @@ private void createThrowsExceptionThrownByOrganizationValidation(UserDto user) t
   @Test
   public void create_fails_with_ISE_if_BuiltInQProfileRepository_has_not_been_initialized() throws OrganizationCreation.KeyConflictException {
     UserDto user = db.users().insertUser();
+    db.qualityGates().insertBuiltInQualityGate();
 
     expectedException.expect(IllegalStateException.class);
     expectedException.expectMessage("initialize must be called first");
@@ -191,6 +192,7 @@ public void create_fails_with_KeyConflictException_if_org_with_key_in_NewOrganiz
   public void create_creates_unguarded_organization_with_properties_from_NewOrganization_arg() throws OrganizationCreation.KeyConflictException {
     builtInQProfileRepositoryRule.initialize();
     UserDto user = db.users().insertUser();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.create(dbSession, user, FULL_POPULATED_NEW_ORGANIZATION);
 
@@ -211,6 +213,7 @@ public void create_creates_unguarded_organization_with_properties_from_NewOrgani
   public void create_creates_owners_group_with_all_permissions_for_new_organization_and_add_current_user_to_it() throws OrganizationCreation.KeyConflictException {
     UserDto user = db.users().insertUser();
     builtInQProfileRepositoryRule.initialize();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.create(dbSession, user, FULL_POPULATED_NEW_ORGANIZATION);
 
@@ -221,6 +224,7 @@ public void create_creates_owners_group_with_all_permissions_for_new_organizatio
   public void create_creates_members_group_and_add_current_user_to_it() throws OrganizationCreation.KeyConflictException {
     UserDto user = db.users().insertUser();
     builtInQProfileRepositoryRule.initialize();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.create(dbSession, user, FULL_POPULATED_NEW_ORGANIZATION);
 
@@ -231,6 +235,7 @@ public void create_creates_members_group_and_add_current_user_to_it() throws Org
   public void create_does_not_require_description_url_and_avatar_to_be_non_null() throws OrganizationCreation.KeyConflictException {
     builtInQProfileRepositoryRule.initialize();
     UserDto user = db.users().insertUser();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.create(dbSession, user, newOrganizationBuilder()
       .setKey("key")
@@ -251,6 +256,7 @@ public void create_does_not_require_description_url_and_avatar_to_be_non_null()
   public void create_creates_default_template_for_new_organization() throws OrganizationCreation.KeyConflictException {
     builtInQProfileRepositoryRule.initialize();
     UserDto user = db.users().insertUser();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.create(dbSession, user, FULL_POPULATED_NEW_ORGANIZATION);
 
@@ -274,6 +280,7 @@ public void create_creates_default_template_for_new_organization() throws Organi
   public void create_add_current_user_as_member_of_organization() throws OrganizationCreation.KeyConflictException {
     UserDto user = db.users().insertUser();
     builtInQProfileRepositoryRule.initialize();
+    db.qualityGates().insertBuiltInQualityGate();
 
     OrganizationDto result = underTest.create(dbSession, user, FULL_POPULATED_NEW_ORGANIZATION);
 
@@ -289,6 +296,7 @@ public void create_associates_to_built_in_quality_profiles() throws Organization
     insertRulesProfile(builtIn1);
     insertRulesProfile(builtIn2);
     UserDto user = db.users().insertUser();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.create(dbSession, user, FULL_POPULATED_NEW_ORGANIZATION);
 
@@ -312,7 +320,7 @@ private void insertRulesProfile(BuiltInQProfile builtIn) {
 
   @Test
   public void create_associates_to_built_in_quality_gate() throws OrganizationCreation.KeyConflictException {
-    QualityGateDto builtInQualityGate = qualityGateFinder.getBuiltInQualityGate(dbSession);
+    QualityGateDto builtInQualityGate = db.qualityGates().insertBuiltInQualityGate();
     builtInQProfileRepositoryRule.initialize();
     UserDto user = db.users().insertUser();
 
@@ -357,6 +365,7 @@ public void createForUser_creates_guarded_organization_with_key_name_and_descrip
     when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
     enableCreatePersonalOrg(true);
     builtInQProfileRepositoryRule.initialize();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.createForUser(dbSession, user);
 
@@ -393,6 +402,7 @@ public void createForUser_gives_all_permissions_for_new_organization_to_current_
     when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
     enableCreatePersonalOrg(true);
     builtInQProfileRepositoryRule.initialize();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.createForUser(dbSession, user);
 
@@ -407,6 +417,7 @@ public void createForUser_creates_members_group_and_add_current_user_to_it() {
     when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
     enableCreatePersonalOrg(true);
     builtInQProfileRepositoryRule.initialize();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.createForUser(dbSession, user);
 
@@ -419,6 +430,7 @@ public void createForUser_creates_default_template_for_new_organization() {
     when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
     enableCreatePersonalOrg(true);
     builtInQProfileRepositoryRule.initialize();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.createForUser(dbSession, user);
 
@@ -446,6 +458,7 @@ public void createForUser_add_current_user_as_member_of_organization() {
     when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
     enableCreatePersonalOrg(true);
     builtInQProfileRepositoryRule.initialize();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.createForUser(dbSession, user);
 
@@ -460,6 +473,7 @@ public void createForUser_does_not_fail_if_name_is_too_long_for_an_organization_
     when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
     enableCreatePersonalOrg(true);
     builtInQProfileRepositoryRule.initialize();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.createForUser(dbSession, user);
 
@@ -475,6 +489,7 @@ public void createForUser_does_not_fail_if_name_is_empty_and_login_is_too_long_f
     when(organizationValidation.generateKeyFrom(login)).thenReturn(SLUG_OF_A_LOGIN);
     enableCreatePersonalOrg(true);
     builtInQProfileRepositoryRule.initialize();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.createForUser(dbSession, user);
 
@@ -490,6 +505,7 @@ public void createForUser_does_not_fail_if_name_is_null_and_login_is_too_long_fo
     when(organizationValidation.generateKeyFrom(login)).thenReturn(SLUG_OF_A_LOGIN);
     enableCreatePersonalOrg(true);
     builtInQProfileRepositoryRule.initialize();
+    db.qualityGates().insertBuiltInQualityGate();
 
     underTest.createForUser(dbSession, user);
 
@@ -503,7 +519,7 @@ public void createForUser_associates_to_built_in_quality_profiles() {
     UserDto user = db.users().insertUser(A_LOGIN);
     when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
     enableCreatePersonalOrg(true);
-
+    db.qualityGates().insertBuiltInQualityGate();
     BuiltInQProfile builtIn1 = builtInQProfileRepositoryRule.add(newLanguage("foo"), "qp1");
     BuiltInQProfile builtIn2 = builtInQProfileRepositoryRule.add(newLanguage("foo"), "qp2");
     builtInQProfileRepositoryRule.initialize();
@@ -520,7 +536,7 @@ public void createForUser_associates_to_built_in_quality_profiles() {
 
   @Test
   public void createForUser_associates_to_built_in_quality_gate() {
-    QualityGateDto builtInQualityGate = qualityGateFinder.getBuiltInQualityGate(dbSession);
+    QualityGateDto builtInQualityGate = db.qualityGates().insertBuiltInQualityGate();
     UserDto user = db.users().insertUser(A_LOGIN);
     when(organizationValidation.generateKeyFrom(A_LOGIN)).thenReturn(SLUG_OF_A_LOGIN);
     enableCreatePersonalOrg(true);

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

@@ -155,6 +155,7 @@ public void verify_define() {
   public void verify_response_example() throws URISyntaxException, IOException {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(Uuids.UUID_EXAMPLE_01, SOME_DATE);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     String response = executeJsonRequest("Foo Company", "foo-company", "The Foo company produces quality software for Bar.", "https://www.foo.com", "https://www.foo.com/foo.png");
 
@@ -196,6 +197,7 @@ public void request_fails_if_user_is_not_system_administrator_and_logged_in_user
   public void request_succeeds_if_user_is_system_administrator_and_logged_in_users_cannot_create_organizations() {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     verifyResponseAndDb(executeRequest("foo"), SOME_UUID, "foo", "foo", SOME_DATE);
   }
@@ -205,6 +207,7 @@ public void request_succeeds_if_user_is_system_administrator_and_logged_in_users
     logInAsSystemAdministrator();
     settings.setProperty(ORGANIZATIONS_ANYONE_CAN_CREATE, true);
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     verifyResponseAndDb(executeRequest("foo"), SOME_UUID, "foo", "foo", SOME_DATE);
   }
@@ -214,6 +217,7 @@ public void request_succeeds_if_user_is_not_system_administrator_and_logged_in_u
     userSession.logIn(user);
     settings.setProperty(ORGANIZATIONS_ANYONE_CAN_CREATE, true);
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     verifyResponseAndDb(executeRequest("foo"), SOME_UUID, "foo", "foo", SOME_DATE);
   }
@@ -242,6 +246,7 @@ public void request_fails_if_name_is_one_char_long() {
   public void request_succeeds_if_name_is_two_chars_long() {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     verifyResponseAndDb(executeRequest("ab"), SOME_UUID, "ab", "ab", SOME_DATE);
   }
@@ -260,6 +265,7 @@ public void request_fails_if_name_is_65_chars_long() {
   public void request_succeeds_if_name_is_64_char_long() {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     String name = STRING_65_CHARS_LONG.substring(0, 64);
 
@@ -292,6 +298,7 @@ public void request_fails_if_key_is_33_chars_long() {
   public void request_succeeds_if_key_is_2_chars_long() {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     verifyResponseAndDb(executeRequest("foo", "ab"), SOME_UUID, "foo", "ab", SOME_DATE);
   }
@@ -300,6 +307,7 @@ public void request_succeeds_if_key_is_2_chars_long() {
   public void requests_succeeds_if_key_is_32_chars_long() {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     String key = STRING_65_CHARS_LONG.substring(0, 32);
 
@@ -370,6 +378,7 @@ public void request_fails_if_key_computed_from_name_already_exists_in_DB() {
   public void request_succeeds_if_description_url_and_avatar_are_not_specified() {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     CreateWsResponse response = executeRequest("foo", "bar", null, null, null);
     verifyResponseAndDb(response, SOME_UUID, "foo", "bar", null, null, null, SOME_DATE);
@@ -379,6 +388,7 @@ public void request_succeeds_if_description_url_and_avatar_are_not_specified() {
   public void request_succeeds_if_description_url_and_avatar_are_specified() {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     CreateWsResponse response = executeRequest("foo", "bar", "moo", "doo", "boo");
     verifyResponseAndDb(response, SOME_UUID, "foo", "bar", "moo", "doo", "boo", SOME_DATE);
@@ -388,6 +398,7 @@ public void request_succeeds_if_description_url_and_avatar_are_specified() {
   public void request_succeeds_to_generate_key_from_name_more_then_32_chars_long() {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     String name = STRING_65_CHARS_LONG.substring(0, 33);
 
@@ -399,6 +410,7 @@ public void request_succeeds_to_generate_key_from_name_more_then_32_chars_long()
   public void request_generates_key_ignoring_multiple_following_spaces() {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     String name = "ab   cd";
 
@@ -421,6 +433,7 @@ public void request_succeeds_if_description_is_256_chars_long() {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
     String description = STRING_257_CHARS_LONG.substring(0, 256);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     CreateWsResponse response = executeRequest("foo", "bar", description, null, null);
     verifyResponseAndDb(response, SOME_UUID, "foo", "bar", description, null, null, SOME_DATE);
@@ -441,6 +454,7 @@ public void request_succeeds_if_url_is_256_chars_long() {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
     String url = STRING_257_CHARS_LONG.substring(0, 256);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     CreateWsResponse response = executeRequest("foo", "bar", null, url, null);
     verifyResponseAndDb(response, SOME_UUID, "foo", "bar", null, url, null, SOME_DATE);
@@ -461,6 +475,7 @@ public void request_succeeds_if_avatar_is_256_chars_long() {
     logInAsSystemAdministrator();
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
     String avatar = STRING_257_CHARS_LONG.substring(0, 256);
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     CreateWsResponse response = executeRequest("foo", "bar", null, null, avatar);
     verifyResponseAndDb(response, SOME_UUID, "foo", "bar", null, null, avatar, SOME_DATE);
@@ -471,6 +486,7 @@ public void request_creates_owners_group_with_all_permissions_for_new_organizati
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
     UserDto user = dbTester.users().insertUser();
     userSession.logIn(user).setSystemAdministrator();
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     executeRequest("orgFoo");
 
@@ -499,6 +515,7 @@ public void request_creates_members_group_and_add_current_user_to_it() {
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
     UserDto user = dbTester.users().insertUser();
     userSession.logIn(user).setSystemAdministrator();
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     executeRequest("orgFoo");
 
@@ -526,6 +543,7 @@ public void request_creates_default_template_for_owner_group() {
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
     UserDto user = dbTester.users().insertUser();
     userSession.logIn(user).setSystemAdministrator();
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     executeRequest("orgFoo");
 
@@ -550,6 +568,7 @@ public void request_set_user_as_member_of_organization() {
     mockForSuccessfulInsert(SOME_UUID, SOME_DATE);
     UserDto user = dbTester.users().insertUser();
     userSession.logIn(user).setSystemAdministrator();
+    dbTester.qualityGates().insertBuiltInQualityGate();
 
     executeRequest("orgFoo");